pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/security/xml-security-c Revert previous security/opens...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3aaef448361d
branches:  trunk
changeset: 379449:3aaef448361d
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Mon Apr 30 06:50:58 2018 +0000

description:
Revert previous security/openssl is 1.0

Pointed by wiz@, thank you.

diffstat:

 security/xml-security-c/distinfo                                                     |   21 +-
 security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.cpp       |   74 -
 security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.hpp       |   40 -
 security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoHash.cpp         |   60 -
 security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoHash.hpp         |   22 -
 security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoHashHMAC.cpp     |   61 -
 security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoHashHMAC.hpp     |   22 -
 security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoKeyDSA.cpp       |  177 ---
 security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoKeyEC.cpp        |   80 -
 security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoKeyRSA.cpp       |  143 --
 security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoProvider.cpp     |   13 -
 security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.cpp |  311 -----
 security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoSymmetricKey.hpp |   29 -
 security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoX509.cpp         |   22 -
 security/xml-security-c/patches/patch-xsec_tools_checksig_InteropResolver.cpp        |   52 +-
 security/xml-security-c/patches/patch-xsec_tools_cipher_XencInteropResolver.cpp      |   13 -
 security/xml-security-c/patches/patch-xsec_tools_cipher_cipher.cpp                   |   13 -
 security/xml-security-c/patches/patch-xsec_tools_templatesign_templatesign.cpp       |   31 -
 security/xml-security-c/patches/patch-xsec_tools_xklient_xklient.cpp                 |  557 ----------
 19 files changed, 5 insertions(+), 1736 deletions(-)

diffs (truncated from 1830 to 300 lines):

diff -r bd492057fe0d -r 3aaef448361d security/xml-security-c/distinfo
--- a/security/xml-security-c/distinfo  Mon Apr 30 06:46:40 2018 +0000
+++ b/security/xml-security-c/distinfo  Mon Apr 30 06:50:58 2018 +0000
@@ -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
diff -r bd492057fe0d -r 3aaef448361d security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.cpp
--- a/security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.cpp    Mon Apr 30 06:46:40 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-$NetBSD: patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.cpp,v 1.1 2018/04/30 05:25:24 ryoon Exp $
-
---- xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp.orig      2012-07-23 16:56:11.000000000 +0000
-+++ xsec/enc/OpenSSL/OpenSSLCryptoBase64.cpp
-@@ -44,6 +44,15 @@
- 
- XERCES_CPP_NAMESPACE_USE
- 
-+OpenSSLCryptoBase64::OpenSSLCryptoBase64() {
-+      m_ectx = EVP_ENCODE_CTX_new();
-+      m_dctx = EVP_ENCODE_CTX_new();
-+}
-+
-+OpenSSLCryptoBase64::~OpenSSLCryptoBase64() {
-+      EVP_ENCODE_CTX_free(m_ectx);
-+      EVP_ENCODE_CTX_free(m_dctx);
-+}
- 
- // --------------------------------------------------------------------------------
- //           Decoding
-@@ -51,7 +60,7 @@ XERCES_CPP_NAMESPACE_USE
- 
- void OpenSSLCryptoBase64::decodeInit(void) {
- 
--      EVP_DecodeInit(&m_dctx);
-+      EVP_DecodeInit(m_dctx);
- 
- }
- 
-@@ -70,7 +79,7 @@ unsigned int OpenSSLCryptoBase64::decode
- 
-       }
- 
--      rc = EVP_DecodeUpdate(&m_dctx, 
-+      rc = EVP_DecodeUpdate(m_dctx, 
-                                                 outData, 
-                                                 &outLen, 
-                                                 (unsigned char *) inData, 
-@@ -99,7 +108,7 @@ unsigned int OpenSSLCryptoBase64::decode
-       int outLen;
-       outLen = outLength;
- 
--      EVP_DecodeFinal(&m_dctx, outData, &outLen); 
-+      EVP_DecodeFinal(m_dctx, outData, &outLen); 
- 
-       return outLen;
- 
-@@ -111,7 +120,7 @@ unsigned int OpenSSLCryptoBase64::decode
- 
- void OpenSSLCryptoBase64::encodeInit(void) {
- 
--      EVP_EncodeInit(&m_ectx);
-+      EVP_EncodeInit(m_ectx);
- 
- }
- 
-@@ -130,7 +139,7 @@ unsigned int OpenSSLCryptoBase64::encode
- 
-       }
- 
--      EVP_EncodeUpdate(&m_ectx, 
-+      EVP_EncodeUpdate(m_ectx, 
-                                         outData, 
-                                         &outLen, 
-                                         (unsigned char *) inData, 
-@@ -153,7 +162,7 @@ unsigned int OpenSSLCryptoBase64::encode
-       int outLen;
-       outLen = outLength;
- 
--      EVP_EncodeFinal(&m_ectx, outData, &outLen); 
-+      EVP_EncodeFinal(m_ectx, outData, &outLen); 
- 
-       return outLen;
- 
diff -r bd492057fe0d -r 3aaef448361d security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.hpp
--- a/security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.hpp    Mon Apr 30 06:46:40 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-$NetBSD: patch-xsec_enc_OpenSSL_OpenSSLCryptoBase64.hpp,v 1.1 2018/04/30 05:25:24 ryoon Exp $
-
---- xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp.orig      2012-07-23 16:56:11.000000000 +0000
-+++ xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp
-@@ -66,8 +66,8 @@ class DSIG_EXPORT OpenSSLCryptoBase64 : 
- public :
- 
-       
--      OpenSSLCryptoBase64() {};
--      virtual ~OpenSSLCryptoBase64() {};
-+      OpenSSLCryptoBase64();
-+      virtual ~OpenSSLCryptoBase64();
- 
-       /** @name Decoding Functions */
-       //@{
-@@ -189,20 +189,20 @@ public :
-        * \brief Get OpenSSL encode context structure
-        */
- 
--      EVP_ENCODE_CTX * getOpenSSLEncodeEVP_ENCODE_CTX(void) {return &m_ectx;}
-+      EVP_ENCODE_CTX * getOpenSSLEncodeEVP_ENCODE_CTX(void) {return m_ectx;}
- 
-       /**
-        * \brief Get OpenSSL encode context structure
-        */
- 
--      EVP_ENCODE_CTX * getOpenSSLDecodeEVP_ENCODE_CTX(void) {return &m_dctx;}
-+      EVP_ENCODE_CTX * getOpenSSLDecodeEVP_ENCODE_CTX(void) {return m_dctx;}
- 
-       //@}
- 
- private :
- 
--      EVP_ENCODE_CTX m_ectx;                          // Encode context
--      EVP_ENCODE_CTX m_dctx;                          // Decode context
-+      EVP_ENCODE_CTX *m_ectx;                         // Encode context
-+      EVP_ENCODE_CTX *m_dctx;                         // Decode context
- 
- };
- 
diff -r bd492057fe0d -r 3aaef448361d security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoHash.cpp
--- a/security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoHash.cpp      Mon Apr 30 06:46:40 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-$NetBSD: patch-xsec_enc_OpenSSL_OpenSSLCryptoHash.cpp,v 1.1 2018/04/30 05:25:24 ryoon Exp $
-
---- xsec/enc/OpenSSL/OpenSSLCryptoHash.cpp.orig        2012-07-23 16:56:11.000000000 +0000
-+++ xsec/enc/OpenSSL/OpenSSLCryptoHash.cpp
-@@ -40,6 +40,7 @@
- 
- OpenSSLCryptoHash::OpenSSLCryptoHash(HashType alg) {
- 
-+      m_mdctx = EVP_MD_CTX_create();
-       switch (alg) {
- 
-       case (XSECCryptoHash::HASH_SHA1) :
-@@ -104,7 +105,7 @@ OpenSSLCryptoHash::OpenSSLCryptoHash(Has
-                       "OpenSSL:Hash - Error loading Message Digest"); 
-       }
- 
--      EVP_DigestInit(&m_mdctx, mp_md);
-+      EVP_DigestInit(m_mdctx, mp_md);
-       m_hashType = alg;
- 
- }
-@@ -112,7 +113,7 @@ OpenSSLCryptoHash::OpenSSLCryptoHash(Has
- 
- OpenSSLCryptoHash::~OpenSSLCryptoHash() {
- 
--      EVP_MD_CTX_cleanup(&m_mdctx);
-+      EVP_MD_CTX_free(m_mdctx);
- 
- }
- 
-@@ -121,16 +122,16 @@ OpenSSLCryptoHash::~OpenSSLCryptoHash() 
- // Hashing Activities
- void OpenSSLCryptoHash::reset(void) {
- 
--      EVP_MD_CTX_cleanup(&m_mdctx);
--
--      EVP_DigestInit(&m_mdctx, mp_md);
-+      EVP_MD_CTX_free(m_mdctx);
-+      m_mdctx = EVP_MD_CTX_new();
-+      EVP_DigestInit(m_mdctx, mp_md);
- 
- }
- 
- void OpenSSLCryptoHash::hash(unsigned char * data, 
-                                                                unsigned int length) {
- 
--      EVP_DigestUpdate(&m_mdctx, data, length);
-+      EVP_DigestUpdate(m_mdctx, data, length);
- 
- }
- unsigned int OpenSSLCryptoHash::finish(unsigned char * hash,
-@@ -140,7 +141,7 @@ unsigned int OpenSSLCryptoHash::finish(u
- 
-       // Finish up and copy out hash, returning the length
- 
--      EVP_DigestFinal(&m_mdctx, m_mdValue, &m_mdLen);
-+      EVP_DigestFinal(m_mdctx, m_mdValue, &m_mdLen);
- 
-       // Copy to output buffer
-       
diff -r bd492057fe0d -r 3aaef448361d security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoHash.hpp
--- a/security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoHash.hpp      Mon Apr 30 06:46:40 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-xsec_enc_OpenSSL_OpenSSLCryptoHash.hpp,v 1.1 2018/04/30 05:25:24 ryoon Exp $
-
---- xsec/enc/OpenSSL/OpenSSLCryptoHash.hpp.orig        2012-07-23 16:56:11.000000000 +0000
-+++ xsec/enc/OpenSSL/OpenSSLCryptoHash.hpp
-@@ -138,7 +138,7 @@ public :
-        * \brief Get OpenSSL hash context structure
-        */
- 
--      EVP_MD_CTX * getOpenSSLEVP_MD_CTX(void) {return &m_mdctx;}
-+      EVP_MD_CTX * getOpenSSLEVP_MD_CTX(void) {return m_mdctx;}
- 
-       //@}
- 
-@@ -148,7 +148,7 @@ private:
-       // Not implemented constructors
-       OpenSSLCryptoHash();
- 
--      EVP_MD_CTX                      m_mdctx;                                                // Context for digest
-+      EVP_MD_CTX                      *m_mdctx;                                               // Context for digest
-       const EVP_MD            * mp_md;                                                // Digest instance
-       unsigned char           m_mdValue[EVP_MAX_MD_SIZE];             // Final output
-       unsigned int            m_mdLen;                                                // Length of digest
diff -r bd492057fe0d -r 3aaef448361d security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoHashHMAC.cpp
--- a/security/xml-security-c/patches/patch-xsec_enc_OpenSSL_OpenSSLCryptoHashHMAC.cpp  Mon Apr 30 06:46:40 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-$NetBSD: patch-xsec_enc_OpenSSL_OpenSSLCryptoHashHMAC.cpp,v 1.1 2018/04/30 05:25:24 ryoon Exp $
-
---- xsec/enc/OpenSSL/OpenSSLCryptoHashHMAC.cpp.orig    2012-07-23 16:56:11.000000000 +0000
-+++ xsec/enc/OpenSSL/OpenSSLCryptoHashHMAC.cpp
-@@ -43,6 +43,7 @@
- OpenSSLCryptoHashHMAC::OpenSSLCryptoHashHMAC(HashType alg) {
- 
-       // Initialise the digest
-+      m_hctx = HMAC_CTX_new();
- 
-       switch (alg) {
- 
-@@ -127,7 +128,7 @@ void OpenSSLCryptoHashHMAC::setKey(XSECC
-       m_keyLen = ((XSECCryptoKeyHMAC *) key)->getKey(m_keyBuf);
- 
- 
--      HMAC_Init(&m_hctx, 
-+      HMAC_Init(m_hctx, 
-               m_keyBuf.rawBuffer(),
-               m_keyLen,
-               mp_md);
-@@ -139,7 +140,7 @@ void OpenSSLCryptoHashHMAC::setKey(XSECC
- OpenSSLCryptoHashHMAC::~OpenSSLCryptoHashHMAC() {
- 
-       if (m_initialised)
--              HMAC_CTX_cleanup(&m_hctx);
-+              HMAC_CTX_free(m_hctx);
- 
- }
- 
-@@ -151,9 +152,9 @@ void OpenSSLCryptoHashHMAC::reset(void) 
- 
-       if (m_initialised) {
- 
--              HMAC_CTX_cleanup(&m_hctx);
--
--              HMAC_Init(&m_hctx, 
-+              HMAC_CTX_free(m_hctx);
-+              m_hctx = HMAC_CTX_new();
-+              HMAC_Init(m_hctx, 
-                       m_keyBuf.rawBuffer(),
-                       m_keyLen,
-                       mp_md);
-@@ -170,7 +171,7 @@ void OpenSSLCryptoHashHMAC::hash(unsigne
-                       "OpenSSL:HashHMAC - hash called prior to setKey");
- 
- 
--      HMAC_Update(&m_hctx, data, (int) length);
-+      HMAC_Update(m_hctx, data, (int) length);
- 
- }
- 
-@@ -181,7 +182,7 @@ unsigned int OpenSSLCryptoHashHMAC::fini



Home | Main Index | Thread Index | Old Index