From owner-svn-ports-head@freebsd.org Sat Oct 20 12:14:04 2018 Return-Path: Delivered-To: svn-ports-head@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 53215FD9531; Sat, 20 Oct 2018 12:14:04 +0000 (UTC) (envelope-from danilo@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 F14888DD14; Sat, 20 Oct 2018 12:14:03 +0000 (UTC) (envelope-from danilo@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 D200F1DEB3; Sat, 20 Oct 2018 12:14:03 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9KCE3OD035385; Sat, 20 Oct 2018 12:14:03 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9KCE3Gr035379; Sat, 20 Oct 2018 12:14:03 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201810201214.w9KCE3Gr035379@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Sat, 20 Oct 2018 12:14:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482494 - in head/security/pev: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danilo X-SVN-Commit-Paths: in head/security/pev: . files X-SVN-Commit-Revision: 482494 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Oct 2018 12:14:04 -0000 Author: danilo Date: Sat Oct 20 12:14:02 2018 New Revision: 482494 URL: https://svnweb.freebsd.org/changeset/ports/482494 Log: - Fix build after OpenSSL update on FreeBSD 12 PR: 232211 Submitted by: Nathan Added: head/security/pev/files/patch-src_pehash.c (contents, props changed) head/security/pev/files/patch-src_pesec.c (contents, props changed) Modified: head/security/pev/Makefile Modified: head/security/pev/Makefile ============================================================================== --- head/security/pev/Makefile Sat Oct 20 11:52:10 2018 (r482493) +++ head/security/pev/Makefile Sat Oct 20 12:14:02 2018 (r482494) @@ -3,6 +3,7 @@ PORTNAME= pev PORTVERSION= 0.80 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ Added: head/security/pev/files/patch-src_pehash.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/pev/files/patch-src_pehash.c Sat Oct 20 12:14:02 2018 (r482494) @@ -0,0 +1,34 @@ +--- src/pehash.c.orig 2018-10-20 11:44:18 UTC ++++ src/pehash.c +@@ -215,13 +215,25 @@ static void calc_hash(const char *alg_name, const unsi + unsigned char md_value[EVP_MAX_MD_SIZE]; + unsigned int md_len; + +- EVP_MD_CTX md_ctx; ++ // See https://wiki.openssl.org/index.php/1.1_API_Changes ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ EVP_MD_CTX md_ctx_auto; ++ EVP_MD_CTX *md_ctx = &md_ctx_auto; ++#else ++ EVP_MD_CTX *md_ctx = EVP_MD_CTX_new(); ++#endif ++ + // FIXME: Handle errors - Check return values. +- EVP_MD_CTX_init(&md_ctx); +- EVP_DigestInit_ex(&md_ctx, md, NULL); +- EVP_DigestUpdate(&md_ctx, data, size); +- EVP_DigestFinal_ex(&md_ctx, md_value, &md_len); +- EVP_MD_CTX_cleanup(&md_ctx); ++ EVP_MD_CTX_init(md_ctx); ++ EVP_DigestInit_ex(md_ctx, md, NULL); ++ EVP_DigestUpdate(md_ctx, data, size); ++ EVP_DigestFinal_ex(md_ctx, md_value, &md_len); ++ ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ EVP_MD_CTX_cleanup(md_ctx); ++#else ++ EVP_MD_CTX_free(md_ctx); ++#endif + + for (unsigned int i=0; i < md_len; i++) + sprintf(&output[i * 2], "%02x", md_value[i]); Added: head/security/pev/files/patch-src_pesec.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/pev/files/patch-src_pesec.c Sat Oct 20 12:14:02 2018 (r482494) @@ -0,0 +1,12 @@ +--- src/pesec.c.orig 2018-10-20 11:48:33 UTC ++++ src/pesec.c +@@ -225,7 +225,9 @@ static int parse_pkcs7_data(const options_t *options, + PKCS7 *p7 = NULL; + BIO *in = NULL; + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + CRYPTO_malloc_init(); ++#endif + ERR_load_crypto_strings(); + OpenSSL_add_all_algorithms(); +