Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-8]: src/crypto/external/bsd/openssl/dist/crypto Pull up following...



details:   https://anonhg.NetBSD.org/src/rev/2431583c4cae
branches:  netbsd-8
changeset: 851924:2431583c4cae
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Aug 09 13:21:36 2018 +0000

description:
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)

diffstat:

 crypto/external/bsd/openssl/dist/crypto/evp/evp.h       |  8 ++++++++
 crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.h |  9 +++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)

diffs (37 lines):

diff -r 8581f55f1bb7 -r 2431583c4cae crypto/external/bsd/openssl/dist/crypto/evp/evp.h
--- a/crypto/external/bsd/openssl/dist/crypto/evp/evp.h Wed Aug 08 10:37:27 2018 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/evp/evp.h Thu Aug 09 13:21:36 2018 +0000
@@ -1559,6 +1559,14 @@
        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
 
 
diff -r 8581f55f1bb7 -r 2431583c4cae crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.h
--- a/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.h   Wed Aug 08 10:37:27 2018 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.h   Thu Aug 09 13:21:36 2018 +0000
@@ -645,6 +645,15 @@
                                                            *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
 }



Home | Main Index | Thread Index | Old Index