Module Name: src
Committed By: christos
Date: Wed Aug 8 19:19:36 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl.old/dist/crypto/evp: evp.h
src/crypto/external/bsd/openssl.old/dist/crypto/x509: x509_vfy.h
Log Message:
Add missing functions for racoon2 to compile under netbsd-8
>From Chuck Zmudzinski
XXX: pullup-8 (to openssl not openssl.old)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssl.old/dist/crypto/x509/x509_vfy.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h
diff -u src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h:1.5 src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h:1.6
--- src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h:1.5 Tue Feb 6 14:58:30 2018
+++ src/crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h Wed Aug 8 15:19:36 2018
@@ -1559,6 +1559,14 @@ static inline RSA *EVP_PKEY_get0_RSA(EVP
return pkey->pkey.rsa;
}
+static inline DSA *EVP_PKEY_get0_DSA(EVP_PKEY *pkey)
+{
+ if (pkey->type != EVP_PKEY_DSA) {
+ return NULL;
+ }
+ return pkey->pkey.dsa;
+}
+
#endif
Index: src/crypto/external/bsd/openssl.old/dist/crypto/x509/x509_vfy.h
diff -u src/crypto/external/bsd/openssl.old/dist/crypto/x509/x509_vfy.h:1.1.1.1 src/crypto/external/bsd/openssl.old/dist/crypto/x509/x509_vfy.h:1.2
--- src/crypto/external/bsd/openssl.old/dist/crypto/x509/x509_vfy.h:1.1.1.1 Sat Feb 3 17:43:48 2018
+++ src/crypto/external/bsd/openssl.old/dist/crypto/x509/x509_vfy.h Wed Aug 8 15:19:36 2018
@@ -645,6 +645,15 @@ STACK_OF(POLICYQUALINFO) *X509_policy_no
*node);
const X509_POLICY_NODE *X509_policy_node_get0_parent(const X509_POLICY_NODE
*node);
+#if OPENSSL_API_COMPAT >= 0x10100000L
+
+static inline X509 *
+X509_STORE_CTX_get0_cert(X509_STORE_CTX *x)
+{
+ return X509_STORE_CTX_get_current_cert(x);
+}
+
+#endif
#ifdef __cplusplus
}
