net-vpn/vtun: fix openssl 1.1 compatibility

Fixes: https://bugs.gentoo.org/674280
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

diff --git a/net-vpn/vtun/files/vtun-libssl-1.1.patch b/net-vpn/vtun/files/vtun-libssl-1.1.patch
new file mode 100644 (file)
index 0000000..76a3c02
--- /dev/null
+++ b/net-vpn/vtun/files/vtun-libssl-1.1.patch
@@ -0,0 +1,229 @@
+--- vtun-3.0.3/lfd_encrypt.c.orig       2019-02-25 18:43:39.310480427 -0500\r
++++ vtun-3.0.3/lfd_encrypt.c    2019-02-25 18:55:26.956441285 -0500\r
+@@ -96,11 +96,11 @@\r
+ char * pkey;\r
+ char * iv_buf;\r
+\r
+-EVP_CIPHER_CTX ctx_enc;        /* encrypt */\r
+-EVP_CIPHER_CTX ctx_dec;        /* decrypt */\r
++EVP_CIPHER_CTX *ctx_enc;       /* encrypt */\r
++EVP_CIPHER_CTX *ctx_dec;       /* decrypt */\r
+\r
+-EVP_CIPHER_CTX ctx_enc_ecb;    /* sideband ecb encrypt */\r
+-EVP_CIPHER_CTX ctx_dec_ecb;    /* sideband ecb decrypt */\r
++EVP_CIPHER_CTX *ctx_enc_ecb;   /* sideband ecb encrypt */\r
++EVP_CIPHER_CTX *ctx_dec_ecb;   /* sideband ecb decrypt */\r
+\r
+ int prep_key(char **key, int size, struct vtun_host *host)\r
+ {\r
+@@ -152,6 +152,11 @@\r
+    EVP_CIPHER_CTX *pctx_enc;\r
+    EVP_CIPHER_CTX *pctx_dec;\r
+\r
++   ctx_enc = EVP_CIPHER_CTX_new();\r
++   ctx_dec = EVP_CIPHER_CTX_new();\r
++   ctx_enc_ecb = EVP_CIPHER_CTX_new();\r
++   ctx_dec_ecb = EVP_CIPHER_CTX_new();\r
++\r
+    enc_init_first_time = 1;\r
+    dec_init_first_time = 1;\r
+\r
+@@ -178,15 +183,15 @@\r
+          keysize = 32;\r
+          sb_init = 1;\r
+          cipher_type = EVP_aes_256_ecb();\r
+-         pctx_enc = &ctx_enc_ecb;\r
+-         pctx_dec = &ctx_dec_ecb;\r
++         pctx_enc = ctx_enc_ecb;\r
++         pctx_dec = ctx_dec_ecb;\r
+       break;\r
+\r
+       case VTUN_ENC_AES256ECB:\r
+          blocksize = 16;\r
+          keysize = 32;\r
+-         pctx_enc = &ctx_enc;\r
+-         pctx_dec = &ctx_dec;\r
++         pctx_enc = ctx_enc;\r
++         pctx_dec = ctx_dec;\r
+          cipher_type = EVP_aes_256_ecb();\r
+          strcpy(cipher_name,"AES-256-ECB");\r
+       break;\r
+@@ -197,14 +202,14 @@\r
+          keysize = 16;\r
+          sb_init=1;\r
+          cipher_type = EVP_aes_128_ecb();\r
+-         pctx_enc = &ctx_enc_ecb;\r
+-         pctx_dec = &ctx_dec_ecb;\r
++         pctx_enc = ctx_enc_ecb;\r
++         pctx_dec = ctx_dec_ecb;\r
+       break;\r
+       case VTUN_ENC_AES128ECB:\r
+          blocksize = 16;\r
+          keysize = 16;\r
+-         pctx_enc = &ctx_enc;\r
+-         pctx_dec = &ctx_dec;\r
++         pctx_enc = ctx_enc;\r
++         pctx_dec = ctx_dec;\r
+          cipher_type = EVP_aes_128_ecb();\r
+          strcpy(cipher_name,"AES-128-ECB");\r
+       break;\r
+@@ -217,16 +222,16 @@\r
+          var_key = 1;\r
+          sb_init = 1;\r
+          cipher_type = EVP_bf_ecb();\r
+-         pctx_enc = &ctx_enc_ecb;\r
+-         pctx_dec = &ctx_dec_ecb;\r
++         pctx_enc = ctx_enc_ecb;\r
++         pctx_dec = ctx_dec_ecb;\r
+       break;\r
+\r
+       case VTUN_ENC_BF256ECB:\r
+          blocksize = 8;\r
+          keysize = 32;\r
+          var_key = 1;\r
+-         pctx_enc = &ctx_enc;\r
+-         pctx_dec = &ctx_dec;\r
++         pctx_enc = ctx_enc;\r
++         pctx_dec = ctx_dec;\r
+          cipher_type = EVP_bf_ecb();\r
+          strcpy(cipher_name,"Blowfish-256-ECB");\r
+       break;\r
+@@ -239,16 +244,16 @@\r
+          var_key = 1;\r
+          sb_init = 1;\r
+          cipher_type = EVP_bf_ecb();\r
+-         pctx_enc = &ctx_enc_ecb;\r
+-         pctx_dec = &ctx_dec_ecb;\r
++         pctx_enc = ctx_enc_ecb;\r
++         pctx_dec = ctx_dec_ecb;\r
+       break;\r
+       case VTUN_ENC_BF128ECB: /* blowfish 128 ecb is the default */\r
+       default:\r
+          blocksize = 8;\r
+          keysize = 16;\r
+          var_key = 1;\r
+-         pctx_enc = &ctx_enc;\r
+-         pctx_dec = &ctx_dec;\r
++         pctx_enc = ctx_enc;\r
++         pctx_dec = ctx_dec;\r
+          cipher_type = EVP_bf_ecb();\r
+          strcpy(cipher_name,"Blowfish-128-ECB");\r
+       break;\r
+@@ -290,10 +295,10 @@\r
+    lfd_free(enc_buf); enc_buf = NULL;\r
+    lfd_free(dec_buf); dec_buf = NULL;\r
+\r
+-   EVP_CIPHER_CTX_cleanup(&ctx_enc);\r
+-   EVP_CIPHER_CTX_cleanup(&ctx_dec);\r
+-   EVP_CIPHER_CTX_cleanup(&ctx_enc_ecb);\r
+-   EVP_CIPHER_CTX_cleanup(&ctx_dec_ecb);\r
++   EVP_CIPHER_CTX_free(ctx_enc);\r
++   EVP_CIPHER_CTX_free(ctx_dec);\r
++   EVP_CIPHER_CTX_free(ctx_enc_ecb);\r
++   EVP_CIPHER_CTX_free(ctx_dec_ecb);\r
+\r
+    return 0;\r
+ }\r
+@@ -319,7 +324,7 @@\r
+    outlen=len+pad;\r
+    if (pad == blocksize)\r
+       RAND_bytes(in_ptr+len, blocksize-1);\r
+-   EVP_EncryptUpdate(&ctx_enc, out_ptr, &outlen, in_ptr, len+pad);\r
++   EVP_EncryptUpdate(ctx_enc, out_ptr, &outlen, in_ptr, len+pad);\r
+    *out = enc_buf;\r
+\r
+    sequence_num++;\r
+@@ -339,7 +344,7 @@\r
+\r
+    outlen=len;\r
+    if (!len) return 0;\r
+-   EVP_DecryptUpdate(&ctx_dec, out_ptr, &outlen, in_ptr, len);\r
++   EVP_DecryptUpdate(ctx_dec, out_ptr, &outlen, in_ptr, len);\r
+    recv_ib_mesg(&outlen, &out_ptr);\r
+    if (!outlen) return 0;\r
+    tmp_ptr = out_ptr + outlen; tmp_ptr--;\r
+@@ -427,13 +432,13 @@\r
+       break;\r
+    } /* switch(cipher) */\r
+\r
+-   EVP_CIPHER_CTX_init(&ctx_enc);\r
+-   EVP_EncryptInit_ex(&ctx_enc, cipher_type, NULL, NULL, NULL);\r
++   EVP_CIPHER_CTX_init(ctx_enc);\r
++   EVP_EncryptInit_ex(ctx_enc, cipher_type, NULL, NULL, NULL);\r
+    if (var_key)\r
+-      EVP_CIPHER_CTX_set_key_length(&ctx_enc, keysize);\r
+-   EVP_EncryptInit_ex(&ctx_enc, NULL, NULL, pkey, NULL);\r
+-   EVP_EncryptInit_ex(&ctx_enc, NULL, NULL, NULL, iv);\r
+-   EVP_CIPHER_CTX_set_padding(&ctx_enc, 0);\r
++      EVP_CIPHER_CTX_set_key_length(ctx_enc, keysize);\r
++   EVP_EncryptInit_ex(ctx_enc, NULL, NULL, pkey, NULL);\r
++   EVP_EncryptInit_ex(ctx_enc, NULL, NULL, NULL, iv);\r
++   EVP_CIPHER_CTX_set_padding(ctx_enc, 0);\r
+    if (enc_init_first_time)\r
+    {\r
+       sprintf(tmpstr,"%s encryption initialized", cipher_name);\r
+@@ -517,13 +522,13 @@\r
+       break;\r
+    } /* switch(cipher) */\r
+\r
+-   EVP_CIPHER_CTX_init(&ctx_dec);\r
+-   EVP_DecryptInit_ex(&ctx_dec, cipher_type, NULL, NULL, NULL);\r
++   EVP_CIPHER_CTX_init(ctx_dec);\r
++   EVP_DecryptInit_ex(ctx_dec, cipher_type, NULL, NULL, NULL);\r
+    if (var_key)\r
+-      EVP_CIPHER_CTX_set_key_length(&ctx_dec, keysize);\r
+-   EVP_DecryptInit_ex(&ctx_dec, NULL, NULL, pkey, NULL);\r
+-   EVP_DecryptInit_ex(&ctx_dec, NULL, NULL, NULL, iv);\r
+-   EVP_CIPHER_CTX_set_padding(&ctx_dec, 0);\r
++      EVP_CIPHER_CTX_set_key_length(ctx_dec, keysize);\r
++   EVP_DecryptInit_ex(ctx_dec, NULL, NULL, pkey, NULL);\r
++   EVP_DecryptInit_ex(ctx_dec, NULL, NULL, NULL, iv);\r
++   EVP_CIPHER_CTX_set_padding(ctx_dec, 0);\r
+    if (dec_init_first_time)\r
+    {\r
+       sprintf(tmpstr,"%s decryption initialized", cipher_name);\r
+@@ -555,7 +560,7 @@\r
+\r
+          in_ptr = in - blocksize*2;\r
+          outlen = blocksize*2;\r
+-         EVP_EncryptUpdate(&ctx_enc_ecb, in_ptr,\r
++         EVP_EncryptUpdate(ctx_enc_ecb, in_ptr,\r
+             &outlen, in_ptr, blocksize*2);\r
+          *out = in_ptr;\r
+          len = outlen;\r
+@@ -582,7 +587,7 @@\r
+          in_ptr = in;\r
+          iv = malloc(blocksize);\r
+          outlen = blocksize*2;\r
+-         EVP_DecryptUpdate(&ctx_dec_ecb, in_ptr, &outlen, in_ptr, blocksize*2);\r
++         EVP_DecryptUpdate(ctx_dec_ecb, in_ptr, &outlen, in_ptr, blocksize*2);\r
+\r
+          if ( !strncmp(in_ptr, "ivec", 4) )\r
+          {\r
+@@ -625,7 +630,7 @@\r
+                if (cipher_enc_state != CIPHER_INIT)\r
+                {\r
+                   cipher_enc_state = CIPHER_INIT;\r
+-                  EVP_CIPHER_CTX_cleanup(&ctx_enc);\r
++                  EVP_CIPHER_CTX_cleanup(ctx_enc);\r
+ #ifdef LFD_ENCRYPT_DEBUG\r
+                   vtun_syslog(LOG_INFO,\r
+                      "Forcing local encryptor re-init");\r
+@@ -706,7 +711,7 @@\r
+          if (cipher_enc_state != CIPHER_INIT)\r
+          {\r
+             cipher_enc_state = CIPHER_INIT;\r
+-            EVP_CIPHER_CTX_cleanup(&ctx_enc);\r
++            EVP_CIPHER_CTX_cleanup(ctx_enc);\r
+          }\r
+ #ifdef LFD_ENCRYPT_DEBUG\r
+          vtun_syslog(LOG_INFO, "Remote requests encryptor re-init");\r
+@@ -720,7 +725,7 @@\r
+              cipher_enc_state != CIPHER_REQ_INIT &&\r
+              cipher_enc_state != CIPHER_INIT)\r
+          {\r
+-            EVP_CIPHER_CTX_cleanup (&ctx_dec);\r
++            EVP_CIPHER_CTX_cleanup (ctx_dec);\r
+             cipher_dec_state = CIPHER_INIT;\r
+             cipher_enc_state = CIPHER_REQ_INIT;\r
+          }\r

diff --git a/net-vpn/vtun/vtun-3.0.3-r1.ebuild b/net-vpn/vtun/vtun-3.0.3-r1.ebuild
new file mode 100644 (file)
index 0000000..d56bcd5
--- /dev/null
+++ b/net-vpn/vtun/vtun-3.0.3-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info
+
+DESCRIPTION="Create tunnels over TCP/IP networks with shaping, encryption, and compression"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://vtun.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="lzo socks5 ssl zlib"
+
+RDEPEND="ssl? ( dev-libs/openssl:0 )
+       lzo? ( dev-libs/lzo:2 )
+       zlib? ( sys-libs/zlib )
+       socks5? ( net-proxy/dante )"
+DEPEND="${RDEPEND}
+       sys-devel/bison"
+
+DOCS="ChangeLog Credits FAQ README README.Setup README.Shaper TODO"
+
+CONFIG_CHECK="~TUN"
+
+src_prepare() {
+       sed -i Makefile.in \
+               -e '/^LDFLAGS/s|=|+=|g' \
+               || die "sed Makefile"
+       eapply "${FILESDIR}"/${P}-includes.patch
+       # remove unneeded checking for /etc/vtund.conf
+       eapply -p0 "${FILESDIR}"/${PN}-3.0.2-remove-config-presence-check.patch
+       # GCC 5 compatibility, patch from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778164
+       eapply "${FILESDIR}"/${P}-gcc5.patch
+       # openssl 1.1 compatibility, bug 674280
+       eapply -l "${FILESDIR}"/${PN}-libssl-1.1.patch
+       # portage takes care about striping binaries itself
+       sed -i 's:$(BIN_DIR)/strip $(DESTDIR)$(SBIN_DIR)/vtund::' Makefile.in || die
+
+       eapply_user
+}
+
+src_configure() {
+       econf \
+               $(use_enable ssl) \
+               $(use_enable zlib) \
+               $(use_enable lzo) \
+               $(use_enable socks5 socks) \
+               --enable-shaper
+}
+
+src_install() {
+       default
+       newinitd "${FILESDIR}"/vtun.rc vtun
+       insinto etc
+       doins "${FILESDIR}"/vtund-start.conf
+}