Date: Fri, 2 Nov 2018 14:27:00 +0000 (UTC) From: Kevin Lo <kevlo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483811 - head/net/vde2/files Message-ID: <201811021427.wA2ER0Kn051832@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevlo Date: Fri Nov 2 14:27:00 2018 New Revision: 483811 URL: https://svnweb.freebsd.org/changeset/ports/483811 Log: Fix the build with OpenSSL 1.1.1 Added: head/net/vde2/files/patch-src_vde__cryptcab_cryptcab.c (contents, props changed) Added: head/net/vde2/files/patch-src_vde__cryptcab_cryptcab.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/vde2/files/patch-src_vde__cryptcab_cryptcab.c Fri Nov 2 14:27:00 2018 (r483811) @@ -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; + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811021427.wA2ER0Kn051832>