|
Lines 1-6
Link Here
|
| 1 |
--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2018-05-03 07:34:47.000000000 -0700 |
1 |
--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2018-11-01 23:51:07 UTC |
| 2 |
+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c 2018-06-12 18:38:30.978823000 -0700 |
2 |
+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c |
| 3 |
@@ -188,7 +188,8 @@ |
3 |
@@ -188,7 +188,8 @@ pkinit_pkcs11_code_to_text(int err); |
| 4 |
(*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) |
4 |
(*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) |
| 5 |
#endif |
5 |
#endif |
| 6 |
|
6 |
|
|
Lines 10-22
Link Here
|
| 10 |
|
10 |
|
| 11 |
/* 1.1 standardizes constructor and destructor names, renaming |
11 |
/* 1.1 standardizes constructor and destructor names, renaming |
| 12 |
* EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */ |
12 |
* EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */ |
| 13 |
@@ -3040,7 +3041,8 @@ |
13 |
@@ -3040,7 +3041,9 @@ cleanup: |
| 14 |
return retval; |
14 |
return retval; |
| 15 |
} |
15 |
} |
| 16 |
|
16 |
|
| 17 |
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L |
17 |
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L |
| 18 |
+#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ |
18 |
+#if ((defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \ |
| 19 |
+ !defined(LIBRESSL_VERSION_NUMBER) |
19 |
+ !defined(LIBRESSL_VERSION_NUMBER)) || \ |
|
|
20 |
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20900000L) |
| 20 |
|
21 |
|
| 21 |
/* |
22 |
/* |
| 22 |
* We need to decode DomainParameters from RFC 3279 section 2.3.3. We would |
23 |
* We need to decode DomainParameters from RFC 3279 section 2.3.3. We would |