MFH: r482494

- Fix build after OpenSSL update on FreeBSD 12

PR:		232211
Submitted by:	Nathan <ndowens AT yahoo.com>
This commit is contained in:
antoine
2018-11-02 08:18:02 +00:00
parent 7d112c1d40
commit 7da69e28fa
3 changed files with 47 additions and 0 deletions
+1
View File
@@ -3,6 +3,7 @@
PORTNAME= pev
PORTVERSION= 0.80
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
+34
View File
@@ -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]);
+12
View File
@@ -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();