CVS commit: pkgsrc/security/xml-security-c

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Apr 30 06:50:58 UTC 2018

Modified Files:
        pkgsrc/security/xml-security-c: distinfo
        pkgsrc/security/xml-security-c/patches:
            patch-xsec_tools_checksig_InteropResolver.cpp
Removed Files:
        pkgsrc/security/xml-security-c/patches:
            patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.cpp
            patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.hpp
            patch-xsec_enc_OpenSSL_OpenSSLCryptoHash.cpp
            patch-xsec_enc_OpenSSL_OpenSSLCryptoHash.hpp
            patch-xsec_enc_OpenSSL_OpenSSLCryptoHashHMAC.cpp
            patch-xsec_enc_OpenSSL_OpenSSLCryptoHashHMAC.hpp
            patch-xsec_enc_OpenSSL_OpenSSLCryptoKeyDSA.cpp
            patch-xsec_enc_OpenSSL_OpenSSLCryptoKeyEC.cpp
            patch-xsec_enc_OpenSSL_OpenSSLCryptoKeyRSA.cpp
            patch-xsec_enc_OpenSSL_OpenSSLCryptoProvider.cpp
            patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.cpp
            patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.hpp
            patch-xsec_enc_OpenSSL_OpenSSLCryptoX509.cpp
            patch-xsec_tools_cipher_XencInteropResolver.cpp
            patch-xsec_tools_cipher_cipher.cpp
            patch-xsec_tools_templatesign_templatesign.cpp
            patch-xsec_tools_xklient_xklient.cpp

Log Message:
Revert previous security/openssl is 1.0

Pointed by wiz@, thank you.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/xml-security-c/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.cpp \
    pkgsrc/security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.hpp \
    pkgsrc/security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoHash.cpp \
    pkgsrc/security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoHash.hpp \
    pkgsrc/security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoHashHMAC.cpp \
    pkgsrc/security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoHashHMAC.hpp \
    pkgsrc/security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoKeyDSA.cpp \
    pkgsrc/security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoKeyEC.cpp \
    pkgsrc/security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoKeyRSA.cpp \
    pkgsrc/security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoProvider.cpp \
    pkgsrc/security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.cpp \
    pkgsrc/security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.hpp \
    pkgsrc/security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoX509.cpp \
    pkgsrc/security/xml-security-c/patches/patch-xsec_tools_cipher_XencInteropResolver.cpp \
    pkgsrc/security/xml-security-c/patches/patch-xsec_tools_cipher_cipher.cpp \
    pkgsrc/security/xml-security-c/patches/patch-xsec_tools_templatesign_templatesign.cpp \
    pkgsrc/security/xml-security-c/patches/patch-xsec_tools_xklient_xklient.cpp
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/security/xml-security-c/patches/patch-xsec_tools_checksig_InteropResolver.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/xml-security-c/distinfo
diff -u pkgsrc/security/xml-security-c/distinfo:1.9 pkgsrc/security/xml-security-c/distinfo:1.10
--- pkgsrc/security/xml-security-c/distinfo:1.9 Mon Apr 30 05:25:24 2018
+++ pkgsrc/security/xml-security-c/distinfo     Mon Apr 30 06:50:58 2018
@@ -1,25 +1,8 @@
-$NetBSD: distinfo,v 1.9 2018/04/30 05:25:24 ryoon Exp $
+$NetBSD: distinfo,v 1.10 2018/04/30 06:50:58 ryoon Exp $
 
 SHA1 (xml-security-c-1.7.3.tar.gz) = bcbe98e0bd3695a0b961a223cce53e2f35c4681b
 RMD160 (xml-security-c-1.7.3.tar.gz) = f0c9c3668a3ff2e13647909b926e20fdba828ad2
 SHA512 (xml-security-c-1.7.3.tar.gz) = ea46709d6706edf345e19132d9998774e50dc7b5947a7b4a55e3627998f5ac66f976fdff0a5015ef3cee73c03c04f3c4cf993efd397082491c2000c6548b89d2
 Size (xml-security-c-1.7.3.tar.gz) = 909320 bytes
 SHA1 (patch-xsec_Makefile.in) = f610c63b888f8f744a5de5b47975eb7dc4aee55b
-SHA1 (patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.cpp) = b66c6be973b29e02657c2eaffe331f311a8c7214
-SHA1 (patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.hpp) = ceb72c460f7ee9341047b1517306bf02cb8c3756
-SHA1 (patch-xsec_enc_OpenSSL_OpenSSLCryptoHash.cpp) = b8614ee4f947b88988b3e9b40fc35a080145ac2f
-SHA1 (patch-xsec_enc_OpenSSL_OpenSSLCryptoHash.hpp) = 19628ec1aefa7e62ffec19e99968a97295717d1b
-SHA1 (patch-xsec_enc_OpenSSL_OpenSSLCryptoHashHMAC.cpp) = fc1aa0983bc7eb72b75f8d1f35637a2d3376ec54
-SHA1 (patch-xsec_enc_OpenSSL_OpenSSLCryptoHashHMAC.hpp) = 1ae06a624875c97598b1d88f6260d8e49b311566
-SHA1 (patch-xsec_enc_OpenSSL_OpenSSLCryptoKeyDSA.cpp) = 7a483f89b19cdcf3993c7940d3bc50afba2aa186
-SHA1 (patch-xsec_enc_OpenSSL_OpenSSLCryptoKeyEC.cpp) = 6e8415da5b6a9cb9f093f66cfd490a96625a7fbb
-SHA1 (patch-xsec_enc_OpenSSL_OpenSSLCryptoKeyRSA.cpp) = 57f7df09f24e0245802cf039471325c640ce849b
-SHA1 (patch-xsec_enc_OpenSSL_OpenSSLCryptoProvider.cpp) = a5eb8e4b636b0bfba71f4c580509d09f43adb5bc
-SHA1 (patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.cpp) = dda82e60360708f286af697ac34671cb9e363c83
-SHA1 (patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.hpp) = 6d7757997addc269c3c93ef3ddecd97449af6fc4
-SHA1 (patch-xsec_enc_OpenSSL_OpenSSLCryptoX509.cpp) = 1ed63c79f7339ed4a50479766311fc0833a2b63a
-SHA1 (patch-xsec_tools_checksig_InteropResolver.cpp) = f71158bbe946eedc69558789ea39513762a6d8d1
-SHA1 (patch-xsec_tools_cipher_XencInteropResolver.cpp) = b36653313698c6bdf849f948dee2d2d0dafc6d2c
-SHA1 (patch-xsec_tools_cipher_cipher.cpp) = 86c91a43e799f757efd445690de6a5b07c56eefd
-SHA1 (patch-xsec_tools_templatesign_templatesign.cpp) = 9068b2641eeb01dba14895b5514628d10f5f2c5f
-SHA1 (patch-xsec_tools_xklient_xklient.cpp) = ca4deeded395f0094ce91873c0c904385833a103
+SHA1 (patch-xsec_tools_checksig_InteropResolver.cpp) = bdc668a7f0212113d0efbaf189e7021a44108e26

Index: pkgsrc/security/xml-security-c/patches/patch-xsec_tools_checksig_InteropResolver.cpp
diff -u pkgsrc/security/xml-security-c/patches/patch-xsec_tools_checksig_InteropResolver.cpp:1.2 pkgsrc/security/xml-security-c/patches/patch-xsec_tools_checksig_InteropResolver.cpp:1.3
--- pkgsrc/security/xml-security-c/patches/patch-xsec_tools_checksig_InteropResolver.cpp:1.2    Mon Apr 30 05:25:24 2018
+++ pkgsrc/security/xml-security-c/patches/patch-xsec_tools_checksig_InteropResolver.cpp        Mon Apr 30 06:50:58 2018
@@ -1,56 +1,10 @@
-$NetBSD: patch-xsec_tools_checksig_InteropResolver.cpp,v 1.2 2018/04/30 05:25:24 ryoon Exp $
+$NetBSD: patch-xsec_tools_checksig_InteropResolver.cpp,v 1.3 2018/04/30 06:50:58 ryoon Exp $
 
 false is a bad pointer value.
 
---- xsec/tools/checksig/InteropResolver.cpp.orig       2018-04-10 03:53:05.001719015 +0000
+--- xsec/tools/checksig/InteropResolver.cpp.orig       2017-09-23 12:23:36.663288313 +0000
 +++ xsec/tools/checksig/InteropResolver.cpp
-@@ -318,7 +318,7 @@ bool InteropResolver::checkMatch(DSIGKey
-                               char * cserial = XMLString::transcode(serial);
-                               char * xserial;
- 
--                              BIGNUM * bnserial = ASN1_INTEGER_to_BN(x->cert_info->serialNumber, NULL);
-+                              BIGNUM * bnserial = ASN1_INTEGER_to_BN(X509_get0_serialNumber(x), NULL);
-                               xserial = BN_bn2dec(bnserial);
-                               BN_free(bnserial);
- 
-@@ -360,8 +360,7 @@ bool InteropResolver::checkMatch(DSIGKey
-                               if (xlen != 0) {
- 
-                                       // Have a buffer with a number in it
--                                      STACK_OF(X509_EXTENSION) *exts;
--                                      exts = x->cert_info->extensions;
-+                                      const STACK_OF(X509_EXTENSION) *exts = X509_get0_extensions(x);
- 
-                                       if (exts != NULL) {
- 
-@@ -379,8 +378,8 @@ bool InteropResolver::checkMatch(DSIGKey
-                                                       memcpy(&octxski[2], xski, xlen);
-                                                       
-                                                       ext = sk_X509_EXTENSION_value(exts,extn);
--                                                      ASN1_OCTET_STRING *skid = ext->value;
--                                                      ASN1_OCTET_STRING * xskid = M_ASN1_OCTET_STRING_new();
-+                                                      ASN1_OCTET_STRING *skid = X509_EXTENSION_get_data(ext);
-+                                                      ASN1_OCTET_STRING * xskid = ASN1_OCTET_STRING_new();
-                                                       ASN1_STRING_set(xskid, octxski, xlen+2);
-                                                       
-                                                       if (ASN1_OCTET_STRING_cmp(xskid, skid) == 0) {
-@@ -602,12 +601,12 @@ XSECCryptoKey * InteropResolver::resolve
-               // Now check if the cert is in the CRL (code lifted from OpenSSL x509_vfy.c
- 
-         int idx;
--        X509_REVOKED rtmp;
-+        X509_REVOKED *rtmp = X509_REVOKED_new();
- 
-         /* Look for serial number of certificate in CRL */
-         
--              rtmp.serialNumber = X509_get_serialNumber(x);
--        idx = sk_X509_REVOKED_find(c->crl->revoked, &rtmp);
-+              X509_REVOKED_set_serialNumber(rtmp, X509_get_serialNumber(x));
-+        idx = sk_X509_REVOKED_find(X509_CRL_get_REVOKED(c), rtmp);
-         
-               /* Not found: OK */
-         
-@@ -645,7 +644,7 @@ XSECCryptoKey * InteropResolver::resolve
+@@ -645,7 +645,7 @@ XSECCryptoKey * InteropResolver::resolve
  
        }