diff options
| author | TBK <tbk@jjtc.eu> | 2019-05-23 14:28:12 +0200 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-05-25 19:45:04 +0000 |
| commit | 0629b711344aad065a9207ce2852e38ccc351ee6 (patch) | |
| tree | 8c75bf0e17c681a133e4913cd577e7e2c037937f /community/pev/fix-openssl.patch | |
| parent | 7b5edd4e29779c93764f8c2e8893dc3bb032f902 (diff) | |
| download | aports-0629b711344aad065a9207ce2852e38ccc351ee6.tar.bz2 aports-0629b711344aad065a9207ce2852e38ccc351ee6.tar.xz | |
community/pev: move from testing
Closes PH-8017
Diffstat (limited to 'community/pev/fix-openssl.patch')
| -rw-r--r-- | community/pev/fix-openssl.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/community/pev/fix-openssl.patch b/community/pev/fix-openssl.patch new file mode 100644 index 0000000000..2d52ab9c4d --- /dev/null +++ b/community/pev/fix-openssl.patch @@ -0,0 +1,46 @@ +--- a/src/pehash.c ++++ b/src/pehash.c +@@ -215,13 +215,25 @@ + 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]); +--- a/src/pesec.c ++++ b/src/pesec.c +@@ -225,7 +225,10 @@ + PKCS7 *p7 = NULL; + BIO *in = NULL; + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + CRYPTO_malloc_init(); ++#endif ++ + ERR_load_crypto_strings(); + OpenSSL_add_all_algorithms(); |