View | Details | Raw Unified | Return to bug 217027
Collapse All | Expand All

(-)security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c (+20 lines)
Line 0 Link Here
1
--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig	2016-12-01 22:31:25 UTC
2
+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c
3
@@ -191,7 +191,7 @@ pkinit_pkcs11_code_to_text(int err);
4
     (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
5
 #endif
6
 
7
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
8
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
9
 
10
 /* 1.1 standardizes constructor and destructor names, renaming
11
  * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
12
@@ -3059,7 +3059,7 @@ cleanup:
13
     return retval;
14
 }
15
 
16
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
17
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
18
 
19
 /*
20
  * We need to decode DomainParameters from RFC 3279 section 2.3.3.  We would
(-)security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h (+11 lines)
Line 0 Link Here
1
--- plugins/preauth/pkinit/pkinit_crypto_openssl.h.orig	2016-12-01 22:31:25 UTC
2
+++ plugins/preauth/pkinit/pkinit_crypto_openssl.h
3
@@ -46,7 +46,7 @@
4
 #include <openssl/asn1.h>
5
 #include <openssl/pem.h>
6
 
7
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
8
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(OPENSSL_VERSION_NUMBER)
9
 #include <openssl/asn1t.h>
10
 #else
11
 #include <openssl/asn1_mac.h>

Return to bug 217027