From owner-svn-ports-all@freebsd.org Tue Nov 27 15:34:26 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 196251150AF4; Tue, 27 Nov 2018 15:34:26 +0000 (UTC) (envelope-from jpaetzel@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 B0E4480C77; Tue, 27 Nov 2018 15:34:25 +0000 (UTC) (envelope-from jpaetzel@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 91A7E1D3DD; Tue, 27 Nov 2018 15:34:25 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wARFYP09002468; Tue, 27 Nov 2018 15:34:25 GMT (envelope-from jpaetzel@FreeBSD.org) Received: (from jpaetzel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wARFYPrM002466; Tue, 27 Nov 2018 15:34:25 GMT (envelope-from jpaetzel@FreeBSD.org) Message-Id: <201811271534.wARFYPrM002466@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jpaetzel set sender to jpaetzel@FreeBSD.org using -f From: Josh Paetzel Date: Tue, 27 Nov 2018 15:34:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486014 - in head/irc/epic5: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jpaetzel X-SVN-Commit-Paths: in head/irc/epic5: . files X-SVN-Commit-Revision: 486014 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B0E4480C77 X-Spamd-Result: default: False [1.13 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.07)[-0.067,0]; NEURAL_SPAM_LONG(0.51)[0.511,0]; NEURAL_SPAM_MEDIUM(0.69)[0.687,0] 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: Tue, 27 Nov 2018 15:34:26 -0000 Author: jpaetzel Date: Tue Nov 27 15:34:24 2018 New Revision: 486014 URL: https://svnweb.freebsd.org/changeset/ports/486014 Log: Fix build with OpenSSL version 1.1.1 The fix for this has been in the epic5 git repo for some time now, looks like it's time for them to roll a release. Maintainer timeout PR: 232117 Added: head/irc/epic5/files/ head/irc/epic5/files/patch-source_crypto.c (contents, props changed) Modified: head/irc/epic5/Makefile Modified: head/irc/epic5/Makefile ============================================================================== --- head/irc/epic5/Makefile Tue Nov 27 14:58:16 2018 (r486013) +++ head/irc/epic5/Makefile Tue Nov 27 15:34:24 2018 (r486014) @@ -3,6 +3,7 @@ PORTNAME= epic5 PORTVERSION= 2.0.1 +PORTREVISION= 1 CATEGORIES= irc ipv6 MASTER_SITES= http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/ Added: head/irc/epic5/files/patch-source_crypto.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/irc/epic5/files/patch-source_crypto.c Tue Nov 27 15:34:24 2018 (r486014) @@ -0,0 +1,84 @@ +--- source/crypto.c.orig 2016-08-05 20:49:07 UTC ++++ source/crypto.c +@@ -282,28 +282,33 @@ static char * decipher_evp (const unsigned char *passw + unsigned char *iv = NULL; + unsigned long errcode; + int outlen2; +- EVP_CIPHER_CTX a; +- EVP_CIPHER_CTX_init(&a); +- EVP_CIPHER_CTX_set_padding(&a, 0); ++ EVP_CIPHER_CTX *context = EVP_CIPHER_CTX_new(); + ++ if(context == NULL) { ++ yell("ERROR: Could not generate cipher context"); ++ return NULL; ++ } ++ ++ EVP_CIPHER_CTX_set_padding(context, 0); ++ + if (ivsize > 0) + iv = new_malloc(ivsize); + outbuf = new_malloc(cipherlen + 1024); + if (ivsize > 0) + memcpy(iv, ciphertext, ivsize); + +- EVP_DecryptInit_ex(&a, type, NULL, NULL, iv); +- EVP_CIPHER_CTX_set_key_length(&a, passwdlen); +- EVP_CIPHER_CTX_set_padding(&a, 0); +- EVP_DecryptInit_ex(&a, NULL, NULL, passwd, NULL); ++ EVP_DecryptInit_ex(context, type, NULL, NULL, iv); ++ EVP_CIPHER_CTX_set_key_length(context, passwdlen); ++ EVP_CIPHER_CTX_set_padding(context, 0); ++ EVP_DecryptInit_ex(context, NULL, NULL, passwd, NULL); + +- if (EVP_DecryptUpdate(&a, outbuf, outlen, ciphertext, cipherlen) != 1) ++ if (EVP_DecryptUpdate(context, outbuf, outlen, ciphertext, cipherlen) != 1) + yell("EVP_DecryptUpdate died."); +- if (EVP_DecryptFinal_ex(&a, outbuf + (*outlen), &outlen2) != 1) ++ if (EVP_DecryptFinal_ex(context, outbuf + (*outlen), &outlen2) != 1) + yell("EVP_DecryptFinal_Ex died."); + *outlen += outlen2; + +- EVP_CIPHER_CTX_cleanup(&a); ++ EVP_CIPHER_CTX_free(context); + + ERR_load_crypto_strings(); + while ((errcode = ERR_get_error())) +@@ -454,10 +459,15 @@ static char * cipher_evp (const unsigned char *passwd, + unsigned long errcode; + u_32int_t randomval; + int iv_count; +- EVP_CIPHER_CTX a; +- EVP_CIPHER_CTX_init(&a); +- EVP_CIPHER_CTX_set_padding(&a, 0); ++ EVP_CIPHER_CTX *context = EVP_CIPHER_CTX_new(); + ++ if(context == NULL) { ++ yell("ERROR: Could not generate cipher context"); ++ return NULL; ++ } ++ ++ EVP_CIPHER_CTX_set_padding(context, 0); ++ + if (ivsize < 0) + ivsize = 0; /* Shenanigans! */ + +@@ -480,12 +490,12 @@ static char * cipher_evp (const unsigned char *passwd, + if (iv) + memcpy(outbuf, iv, ivsize); + +- EVP_EncryptInit_ex(&a, type, NULL, NULL, iv); +- EVP_CIPHER_CTX_set_key_length(&a, passwdlen); +- EVP_EncryptInit_ex(&a, NULL, NULL, passwd, NULL); +- EVP_EncryptUpdate(&a, outbuf + ivsize, &outlen, plaintext, plaintextlen); +- EVP_EncryptFinal_ex(&a, outbuf + ivsize + outlen, &extralen); +- EVP_CIPHER_CTX_cleanup(&a); ++ EVP_EncryptInit_ex(context, type, NULL, NULL, iv); ++ EVP_CIPHER_CTX_set_key_length(context, passwdlen); ++ EVP_EncryptInit_ex(context, NULL, NULL, passwd, NULL); ++ EVP_EncryptUpdate(context, outbuf + ivsize, &outlen, plaintext, plaintextlen); ++ EVP_EncryptFinal_ex(context, outbuf + ivsize + outlen, &extralen); ++ EVP_CIPHER_CTX_free(context); + outlen += extralen; + + ERR_load_crypto_strings();