|
Line
Link Here
|
| 0 |
-- src/plugins/preauth/pkinit/pkinit_crypto_openssl.c |
0 |
++ src/plugins/preauth/pkinit/pkinit_crypto_openssl.c |
|
Lines 191-197
pkinit_pkcs11_code_to_text(int err);
Link Here
|
| 191 |
(*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) |
191 |
(*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) |
| 192 |
#endif |
192 |
#endif |
| 193 |
|
193 |
|
| 194 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
194 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
| 195 |
|
195 |
|
| 196 |
/* 1.1 standardizes constructor and destructor names, renaming |
196 |
/* 1.1 standardizes constructor and destructor names, renaming |
| 197 |
* EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */ |
197 |
* EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */ |
|
Lines 3059-3065
cleanup:
Link Here
|
| 3059 |
return retval; |
3059 |
return retval; |
| 3060 |
} |
3060 |
} |
| 3061 |
|
3061 |
|
| 3062 |
#if OPENSSL_VERSION_NUMBER >= 0x10100000L |
3062 |
#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) |
| 3063 |
|
3063 |
|
| 3064 |
/* |
3064 |
/* |
| 3065 |
* We need to decode DomainParameters from RFC 3279 section 2.3.3. We would |
3065 |
* We need to decode DomainParameters from RFC 3279 section 2.3.3. We would |
| 3066 |
-- src/plugins/preauth/pkinit/pkinit_crypto_openssl.h |
3066 |
++ src/plugins/preauth/pkinit/pkinit_crypto_openssl.h |
|
Lines 46-52
Link Here
|
| 46 |
#include <openssl/asn1.h> |
46 |
#include <openssl/asn1.h> |
| 47 |
#include <openssl/pem.h> |
47 |
#include <openssl/pem.h> |
| 48 |
|
48 |
|
| 49 |
#if OPENSSL_VERSION_NUMBER >= 0x10100000L |
49 |
#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) |
| 50 |
#include <openssl/asn1t.h> |
50 |
#include <openssl/asn1t.h> |
| 51 |
#else |
51 |
#else |
| 52 |
#include <openssl/asn1_mac.h> |
52 |
#include <openssl/asn1_mac.h> |
