From owner-svn-ports-all@freebsd.org Sun Dec 9 13:24:30 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BDEE71321BCB; Sun, 9 Dec 2018 13:24:30 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 605066B983; Sun, 9 Dec 2018 13:24:30 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 20D5A11DE7; Sun, 9 Dec 2018 13:24:30 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wB9DOTds071778; Sun, 9 Dec 2018 13:24:29 GMT (envelope-from novel@FreeBSD.org) Received: (from novel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB9DOTJv071777; Sun, 9 Dec 2018 13:24:29 GMT (envelope-from novel@FreeBSD.org) Message-Id: <201812091324.wB9DOTJv071777@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: novel set sender to novel@FreeBSD.org using -f From: Roman Bogorodskiy Date: Sun, 9 Dec 2018 13:24:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r487046 - branches/2018Q4/net/vde2/files X-SVN-Group: ports-branches X-SVN-Commit-Author: novel X-SVN-Commit-Paths: branches/2018Q4/net/vde2/files X-SVN-Commit-Revision: 487046 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 605066B983 X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_LONG(-0.99)[-0.991,0]; NEURAL_HAM_SHORT(-0.97)[-0.970,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Dec 2018 13:24:31 -0000 Author: novel Date: Sun Dec 9 13:24:29 2018 New Revision: 487046 URL: https://svnweb.freebsd.org/changeset/ports/487046 Log: MFH: r483811 Fix the build with OpenSSL 1.1.1 Approved by: ports-secteam (miwi) Added: branches/2018Q4/net/vde2/files/patch-src_vde__cryptcab_cryptcab.c - copied unchanged from r483811, head/net/vde2/files/patch-src_vde__cryptcab_cryptcab.c Modified: Directory Properties: branches/2018Q4/ (props changed) Copied: branches/2018Q4/net/vde2/files/patch-src_vde__cryptcab_cryptcab.c (from r483811, head/net/vde2/files/patch-src_vde__cryptcab_cryptcab.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/net/vde2/files/patch-src_vde__cryptcab_cryptcab.c Sun Dec 9 13:24:29 2018 (r487046, copy of r483811, head/net/vde2/files/patch-src_vde__cryptcab_cryptcab.c) @@ -0,0 +1,110 @@ +--- src/vde_cryptcab/cryptcab.c.orig 2011-11-23 16:41:17 UTC ++++ src/vde_cryptcab/cryptcab.c +@@ -22,7 +22,11 @@ static void Usage(char *programname) + exit(1); + } + ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL ++static EVP_CIPHER_CTX *ctx; ++#else + static EVP_CIPHER_CTX ctx; ++#endif + static int ctx_initialized = 0; + static int encryption_disabled = 0; + static int nfd; +@@ -103,19 +107,33 @@ int data_encrypt(unsigned char *src, unsigned char *ds + } + + if (!ctx_initialized) { ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL ++ ctx = EVP_CIPHER_CTX_new(); ++ EVP_CIPHER_CTX_init (ctx); ++#else + EVP_CIPHER_CTX_init (&ctx); ++#endif + ctx_initialized = 1; + } + ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL ++ EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv); ++ if (EVP_EncryptUpdate (ctx, dst, &olen, src, len) != 1) ++#else + EVP_EncryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv); + if (EVP_EncryptUpdate (&ctx, dst, &olen, src, len) != 1) ++#endif + { + fprintf (stderr,"error in encrypt update\n"); + olen = -1; + goto cleanup; + } + ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL ++ if (EVP_EncryptFinal (ctx, dst + olen, &tlen) != 1) ++#else + if (EVP_EncryptFinal (&ctx, dst + olen, &tlen) != 1) ++#endif + { + fprintf (stderr,"error in encrypt final\n"); + olen = -1; +@@ -124,7 +142,12 @@ int data_encrypt(unsigned char *src, unsigned char *ds + olen += tlen; + + cleanup: +- EVP_CIPHER_CTX_cleanup(&ctx); ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL ++ EVP_CIPHER_CTX_cleanup(ctx); ++ EVP_CIPHER_CTX_free(ctx); ++#else ++ EVP_CIPHER_CTX_cleanup(&ctx); ++#endif + return olen; + } + +@@ -138,19 +161,33 @@ int data_decrypt(unsigned char *src, unsigned char *ds + } + + if (!ctx_initialized) { ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL ++ ctx = EVP_CIPHER_CTX_new(); ++ EVP_CIPHER_CTX_init(ctx); ++#else + EVP_CIPHER_CTX_init (&ctx); ++#endif + ctx_initialized = 1; + } + ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL ++ EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv); ++ if (EVP_DecryptUpdate (ctx, dst, &olen, src, len) != 1) ++#else + EVP_DecryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv); + if (EVP_DecryptUpdate (&ctx, dst, &olen, src, len) != 1) ++#endif + { + fprintf (stderr,"error in decrypt update\n"); + olen = -1; + goto cleanup; + } + ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL ++ if (EVP_DecryptFinal (ctx, dst + olen, &tlen) != 1) ++#else + if (EVP_DecryptFinal (&ctx, dst + olen, &tlen) != 1) ++#endif + { + fprintf (stderr,"error in decrypt final\n"); + olen = -1; +@@ -159,7 +196,12 @@ int data_decrypt(unsigned char *src, unsigned char *ds + olen += tlen; + + cleanup: +- EVP_CIPHER_CTX_cleanup(&ctx); ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fL ++ EVP_CIPHER_CTX_cleanup(ctx); ++ EVP_CIPHER_CTX_free(ctx); ++#else ++ EVP_CIPHER_CTX_cleanup(&ctx); ++#endif + return olen; + } +