CVS commit: [netbsd-8] src/crypto/external/bsd/openssl/dist/crypto

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Thu Aug  9 13:21:36 UTC 2018

Modified Files:
        src/crypto/external/bsd/openssl/dist/crypto/evp [netbsd-8]: evp.h
        src/crypto/external/bsd/openssl/dist/crypto/x509 [netbsd-8]: x509_vfy.h

Log Message:
Pull up following revision(s) (requested by christos in ticket #967):

        crypto/external/bsd/openssl.old/dist/crypto/evp/evp.h: revision 1.6
        crypto/external/bsd/openssl.old/dist/crypto/x509/x509_vfy.h: revision 
1.2
        (applied to crypto/external/bsd/openssl/)

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.1.1.9.4.1 -r1.1.1.9.4.2 \
    src/crypto/external/bsd/openssl/dist/crypto/evp/evp.h
cvs rdiff -u -r1.2 -r1.2.6.1 \
    src/crypto/external/bsd/openssl/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/dist/crypto/evp/evp.h
diff -u src/crypto/external/bsd/openssl/dist/crypto/evp/evp.h:1.1.1.9.4.1 src/crypto/external/bsd/openssl/dist/crypto/evp/evp.h:1.1.1.9.4.2
--- src/crypto/external/bsd/openssl/dist/crypto/evp/evp.h:1.1.1.9.4.1	Sat Jun 23 10:52:31 2018
+++ src/crypto/external/bsd/openssl/dist/crypto/evp/evp.h	Thu Aug  9 13:21: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/dist/crypto/x509/x509_vfy.h
diff -u src/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.h:1.2 src/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.h:1.2.6.1
--- src/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.h:1.2	Fri Oct 14 16:23:21 2016
+++ src/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.h	Thu Aug  9 13:21: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
 }