summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordaurnimator <quae@daurnimator.com>2017-04-03 16:58:06 +1000
committerdaurnimator <quae@daurnimator.com>2017-04-03 16:58:15 +1000
commit9c2be15399e2026849529cd7bc79df2b0bfff4a9 (patch)
tree69a138fb1e0d5a909a90ca892192fdb40799cabb
parente9f16fa7037f72c02f4dc82a93f852d08d08ca39 (diff)
downloadluaossl-9c2be15399e2026849529cd7bc79df2b0bfff4a9.tar.gz
luaossl-9c2be15399e2026849529cd7bc79df2b0bfff4a9.tar.bz2
luaossl-9c2be15399e2026849529cd7bc79df2b0bfff4a9.zip
Add compat with openssl < 1.0.2 for X509_get_signature_nid
-rw-r--r--src/openssl.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/openssl.c b/src/openssl.c
index a640ed6..dd406bc 100644
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -302,6 +302,10 @@
302#define HAVE_SSLV2_SERVER_METHOD (!OPENSSL_PREREQ(1,1,0) && !defined OPENSSL_NO_SSL2) 302#define HAVE_SSLV2_SERVER_METHOD (!OPENSSL_PREREQ(1,1,0) && !defined OPENSSL_NO_SSL2)
303#endif 303#endif
304 304
305#ifndef HAVE_X509_GET_SIGNATURE_NID
306#define HAVE_X509_GET_SIGNATURE_NID (OPENSSL_PREREQ(1,0,2))
307#endif
308
305#ifndef HAVE_X509_STORE_REFERENCES 309#ifndef HAVE_X509_STORE_REFERENCES
306#define HAVE_X509_STORE_REFERENCES (!OPENSSL_PREREQ(1,1,0)) 310#define HAVE_X509_STORE_REFERENCES (!OPENSSL_PREREQ(1,1,0))
307#endif 311#endif
@@ -1615,6 +1619,10 @@ static int compat_SSL_CTX_set1_param(SSL_CTX *ctx, X509_VERIFY_PARAM *vpm) {
1615#define X509_get0_ext(crt, i) X509_get_ext((crt), (i)) 1619#define X509_get0_ext(crt, i) X509_get_ext((crt), (i))
1616#endif 1620#endif
1617 1621
1622#if !HAVE_X509_GET_SIGNATURE_NID
1623#define X509_get_signature_nid(crt) OBJ_obj2nid((crt)->sig_alg->algorithm)
1624#endif
1625
1618#if !HAVE_X509_CRL_GET0_EXT 1626#if !HAVE_X509_CRL_GET0_EXT
1619#define X509_CRL_get0_ext(crt, i) X509_CRL_get_ext((crt), (i)) 1627#define X509_CRL_get0_ext(crt, i) X509_CRL_get_ext((crt), (i))
1620#endif 1628#endif