denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openssl: Fix call of X509_CRL_get0_signature() with OpenSSL 1.1.0

Browse Source 
The order of arguments in X509_CRL_get0_signature() is not the same as that
of X509_get0_signature().

Fixes: 989ba4b6cd ("openssl: Update CRL API to OpenSSL 1.1.0")
This commit is contained in:
Tobias Brunner
2017-10-10 10:09:08 +02:00
parent e1803a208a
commit 78acaba6a1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/openssl/openssl_crl.c
+3 -3
View File
@@ -50,7 +50,7 @@
#include <credentials/certificates/x509.h>
#if OPENSSL_VERSION_NUMBER < 0x10100000L
static inline void X509_CRL_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg, const X509_CRL *crl) {
static inline void X509_CRL_get0_signature(const X509_CRL *crl, ASN1_BIT_STRING **psig, X509_ALGOR **palg) {
if (psig) { *psig = crl->signature; }
if (palg) { *palg = crl->sig_alg; }
}
@@ -331,7 +331,7 @@ METHOD(certificate_t, issued_by, bool,
#else
tbs = openssl_i2chunk(X509_CRL_INFO, this->crl->crl);
#endif
X509_CRL_get0_signature(&sig, NULL, this->crl);
X509_CRL_get0_signature(this->crl, &sig, NULL);
valid = key->verify(key, this->scheme, tbs, openssl_asn1_str2chunk(sig));
free(tbs.ptr);
key->destroy(key);
@@ -575,7 +575,7 @@ static bool parse_crl(private_openssl_crl_t *this)
return FALSE;
}
X509_CRL_get0_signature(NULL, &alg, this->crl);
X509_CRL_get0_signature(this->crl, NULL, &alg);
X509_ALGOR_get0(&oid, NULL, NULL, alg);
#if OPENSSL_VERSION_NUMBER < 0x10100000L
if (!chunk_equals(