Index: branches/2018Q4/security/pev/Makefile =================================================================== --- branches/2018Q4/security/pev/Makefile (revision 483779) +++ branches/2018Q4/security/pev/Makefile (revision 483780) @@ -1,27 +1,28 @@ # Created by: Danilo Egea Gondolfo # $FreeBSD$ PORTNAME= pev PORTVERSION= 0.80 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ MAINTAINER= danilo@FreeBSD.org COMMENT= PE analysis toolkit LICENSE= GPLv3 LIB_DEPENDS= libpcre.so:devel/pcre WRKSRC= ${WRKDIR}/${PORTNAME} USES= gmake ssl USE_LDCONFIG= yes INSTALL_TARGET= install-strip MAKE_ARGS= MAKE=${MAKE_CMD} CFLAGS+= -I${OPENSSLINC} -I${LOCALBASE}/include LDFLAGS+= -L${OPENSSLLIB} .include Index: branches/2018Q4/security/pev/files/patch-src_pehash.c =================================================================== --- branches/2018Q4/security/pev/files/patch-src_pehash.c (nonexistent) +++ branches/2018Q4/security/pev/files/patch-src_pehash.c (revision 483780) @@ -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]); Property changes on: branches/2018Q4/security/pev/files/patch-src_pehash.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q4/security/pev/files/patch-src_pesec.c =================================================================== --- branches/2018Q4/security/pev/files/patch-src_pesec.c (nonexistent) +++ branches/2018Q4/security/pev/files/patch-src_pesec.c (revision 483780) @@ -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(); + Property changes on: branches/2018Q4/security/pev/files/patch-src_pesec.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q4 =================================================================== --- branches/2018Q4 (revision 483779) +++ branches/2018Q4 (revision 483780) Property changes on: branches/2018Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r482494