diff options
author | Francesco Colista <fcolista@alpinelinux.org> | 2017-09-14 06:48:06 +0000 |
---|---|---|
committer | Francesco Colista <fcolista@alpinelinux.org> | 2017-09-14 06:48:12 +0000 |
commit | d2eed4baceac38398815d5d4305938de33d5862a (patch) | |
tree | 784915dfa6dcfdb412e45362dfda562b8ab5915b /main/krb5/libressl.patch | |
parent | f1886418247c53fb5362d000f1c8e6919569e3bc (diff) | |
download | aports-d2eed4baceac38398815d5d4305938de33d5862a.tar.bz2 aports-d2eed4baceac38398815d5d4305938de33d5862a.tar.xz |
main/krb5: upgrade to 1.15.1
Diffstat (limited to 'main/krb5/libressl.patch')
-rw-r--r-- | main/krb5/libressl.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/main/krb5/libressl.patch b/main/krb5/libressl.patch new file mode 100644 index 0000000000..ec274cc6ae --- /dev/null +++ b/main/krb5/libressl.patch @@ -0,0 +1,28 @@ +--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig ++++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c +@@ -191,7 +191,7 @@ + (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) + #endif + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + /* 1.1 standardizes constructor and destructor names, renaming + * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */ +@@ -3059,7 +3059,7 @@ + return retval; + } + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + + /* + * We need to decode DomainParameters from RFC 3279 section 2.3.3. We would +@@ -3122,6 +3122,7 @@ + + #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */ + ++#include <openssl/asn1_mac.h> + /* + * Do the same decoding (except without decoding j and vparams or checking the + * sequence length) using the pre-OpenSSL-1.1 asn1_mac.h. Define an internal |