Remove utterly broken and already deprecated legacy VTUN encryption

jedisct1 · Oct 8, 2015 · 116ee62 · 116ee62
1 parent 4270256
commit 116ee62
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 168 deletions.
diff --git a/auth.c b/auth.c
@@ -170,11 +170,7 @@ static char *bf2cf(struct vtun_host *host)
 	*(ptr++) = 'K';
 
      if( host->flags & VTUN_ENCRYPT ) {
-        if (host->cipher == VTUN_LEGACY_ENCRYPT) { /* use old flag method */
-	   ptr += sprintf(ptr,"E");
-	} else {
-	   ptr += sprintf(ptr,"E%d", host->cipher);
-	}
+	ptr += sprintf(ptr,"E%d", host->cipher);
      }
 
      strcat(ptr,">");
@@ -242,12 +238,7 @@ static int cf2bf(char *str, struct vtun_host *host)
 		   return 0;
 		}
 		host->flags |= VTUN_ENCRYPT;
-		if (0 == s) {
-		   host->cipher = VTUN_LEGACY_ENCRYPT;
-		   vtun_syslog(LOG_INFO,"Remote server using older encryption.");
-		} else {
-		   host->cipher = s; 
-		}
+		host->cipher = s;
 		ptr = p;
 		break;
      	     case 'S':

diff --git a/cfg_kwords.h b/cfg_kwords.h
@@ -86,7 +86,6 @@ struct kword cfg_param[] = {
    { "inetd",	 VTUN_INETD },
    { "stand",	 VTUN_STAND_ALONE },
    { "keep",     VTUN_PERSIST_KEEPIF },
-   { "oldblowfish128ecb", VTUN_LEGACY_ENCRYPT },
    { "blowfish128ecb", VTUN_ENC_BF128ECB },
    { "blowfish128cbc", VTUN_ENC_BF128CBC },
    { "blowfish128cfb", VTUN_ENC_BF128CFB },

diff --git a/lfd_legacy_encrypt.c b/lfd_legacy_encrypt.c
diff --git a/linkfd.c b/linkfd.c
@@ -378,12 +378,8 @@ int linkfd(struct vtun_host *host)
 	lfd_add_mod(&lfd_lzo);
 
      if(host->flags & VTUN_ENCRYPT)
-       if(host->cipher == VTUN_LEGACY_ENCRYPT) {
-	 lfd_add_mod(&lfd_legacy_encrypt);
-       } else {
 	 lfd_add_mod(&lfd_encrypt);
-       }
-
+
      if(host->flags & VTUN_SHAPE)
 	lfd_add_mod(&lfd_shaper);
 

diff --git a/vtun.h b/vtun.h
@@ -156,8 +156,6 @@ extern llist host_list;
 #define VTUN_ENC_AES256CFB	15
 #define VTUN_ENC_AES256OFB	16
 
-#define VTUN_LEGACY_ENCRYPT	999
-
 /* Mask to drop the flags which will be supplied by the server */
 #define VTUN_CLNT_MASK  0xf000