开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 3

_service:tar_scm:nss.spec Changed

@@ -1,6 +1,7 @@
 %global nspr_version 4.35.0
-%global nss_version 3.89.0
-%global nss_archive_version 3.89
+%global nss_version 3.94.0
+%global nss_ver 3_94
+%global nss_archive_version 3.94
 %global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %global allTools "certutil cmsutil crlutil derdump modutil pk12util signtool signver ssltap vfychain vfyserv"
 
@@ -14,18 +15,18 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          %{nss_version}
-Release:          2
+Release:          4
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Provides:         nss-system-init
 Requires:         nspr >= %{nspr_version} nss-util >= %{nss_version} nss-softokn%{_isa} >= %{nss_version}
-Requires:         p11-kit-trust crypto-policies 
+Requires:         p11-kit-trust crypto-policies
 Requires(post):   coreutils, sed
 BuildRequires:    nspr-devel >= %{nspr_version} nss-softokn sqlite-devel zlib-devel
-BuildRequires:    pkgconf gawk psmisc perl-interpreter gcc-c++ 
+BuildRequires:    pkgconf gawk psmisc perl-interpreter gcc-c++
 obsoletes:	  nss-sysinit < %{version}-%{release}
 
-Source0:          https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_89_RTM/src/%{name}-%{nss_archive_version}.tar.gz
+Source0:          https://ftp.mozilla.org/pub/security/nss/releases/NSS_%{nss_ver}_RTM/src/%{name}-%{nss_archive_version}.tar.gz
 Source1:          nss-util.pc
 Source2:          nss-util-config
 Source3:          nss-softokn.pc
@@ -42,10 +43,11 @@
 
 # Feature: support sm2 and sm3
 Patch9000:        Feature-nss-add-implement-of-SM3-digest-algorithm.patch
-Patch9001:        Feature-nss-add-implement-of-SM2-signature-algorithm.patch  
+Patch9001:        Feature-nss-add-implement-of-SM2-signature-algorithm.patch
 Patch9002:        Feature-nss-support-SM3-digest-algorithm.patch
 Patch9003:        Feature-nss-support-SM2-signature-algorithm.patch
 Patch9004:        Feature-nss-fix-the-certificate-resolution-in-sm2.patch
+Patch9005:        Feature-fix-sm2-sm3-code-error.patch
 
 %description
 Network Security Services (NSS) is a set of libraries designed to
@@ -134,6 +136,7 @@
 %patch9002 -p1
 %patch9003 -p1
 %patch9004 -p1
+%patch9005 -p1
 popd
 
 %build
@@ -556,6 +559,18 @@
 %doc %{_mandir}/man*
 
 %changelog
+* Mon Jan 22 2024 jinlun <jinlun@huawei.com> - 3.94.0-4
+- fix sm2 sm3 code error
+
+* Fri Dec 15 2023 jinlun <jinlun@huawei.com> - 3.94.0-3
+- fix nss_version error.
+
+* Sat Nov 25 2023 jinlun <jinlun@huawei.com> - 3.94-2
+- fix nss-softokn.pc version error.
+
+* Mon Nov 20 2023 Jingwiw  <wangjingwei@iscas.ac.cn> - 3.94-1
+- update version to 3.94
+
 * Tue Sep 12 2023 jinlun <jinlun@huawei.com> - 3.89.0-2
 - fix the certificate resolution in sm2

_service:tar_scm:Feature-fix-sm2-sm3-code-error.patch Added

@@ -0,0 +1,39 @@
+From 4343eb37c04f464f1f09e91e71d619a7eed1b38b Mon Sep 17 00:00:00 2001
+From: jinlun <jinlun@huawei.com>
+Date: Mon, 22 Jan 2024 17:03:52 +0800
+Subject: PATCH fix sm2 sm3 code error
+
+---
+ lib/util/secoid.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/lib/util/secoid.c b/lib/util/secoid.c
+index e97eead..cc776c1 100644
+--- a/lib/util/secoid.c
++++ b/lib/util/secoid.c
+@@ -1813,10 +1813,6 @@ const static SECOidData oidsSEC_OID_TOTAL = {
+        "IPsec User",
+        CKM_INVALID_MECHANISM, INVALID_CERT_EXTENSION),
+ 
+-    OD(sm3, SEC_OID_SM3, "SM3", CKM_NSS_SM3, INVALID_CERT_EXTENSION),
+-    OD(sm2, SEC_OID_SM2, "SM2", CKM_NSS_SM2, INVALID_CERT_EXTENSION),
+-    OD(sm2_with_sm3, SEC_OID_SM2_WITH_SM3, "SM2_WITH_SM3", CKM_NSS_SM2_WITH_SM3, INVALID_CERT_EXTENSION),
+-
+     OD(sha3_224, SEC_OID_SHA3_224, "SHA3-224", CKM_SHA3_224, INVALID_CERT_EXTENSION),
+     OD(sha3_256, SEC_OID_SHA3_256, "SHA3-256", CKM_SHA3_256, INVALID_CERT_EXTENSION),
+     OD(sha3_384, SEC_OID_SHA3_384, "SHA3-384", CKM_SHA3_384, INVALID_CERT_EXTENSION),
+@@ -1826,6 +1822,11 @@ const static SECOidData oidsSEC_OID_TOTAL = {
+     OD(hmac_sha3_256, SEC_OID_HMAC_SHA3_256, "HMAC SHA3-256", CKM_SHA3_256_HMAC, INVALID_CERT_EXTENSION),
+     OD(hmac_sha3_384, SEC_OID_HMAC_SHA3_384, "HMAC SHA3-384", CKM_SHA3_384_HMAC, INVALID_CERT_EXTENSION),
+     OD(hmac_sha3_512, SEC_OID_HMAC_SHA3_512, "HMAC SHA3-512", CKM_SHA3_512_HMAC, INVALID_CERT_EXTENSION),
++
++    OD(sm3, SEC_OID_SM3, "SM3", CKM_NSS_SM3, INVALID_CERT_EXTENSION),
++    OD(sm2, SEC_OID_SM2, "SM2", CKM_NSS_SM2, INVALID_CERT_EXTENSION),
++    OD(sm2_with_sm3, SEC_OID_SM2_WITH_SM3, "SM2_WITH_SM3", CKM_NSS_SM2_WITH_SM3, INVALID_CERT_EXTENSION),
++
+ };
+ 
+ /* PRIVATE EXTENDED SECOID Table
+-- 
+2.33.0
+

_service:tar_scm:Feature-nss-support-SM2-signature-algorithm.patch Changed

@@ -5,22 +5,6 @@
 
 Co-authored-by: godcansee <liu332084460@foxmail.com>
 Signed-off-by: Huaxin Lu <luhuaxin1@huawei.com>
----
- lib/cryptohi/cryptohi.h     |  2 ++
- lib/cryptohi/seckey.c       |  3 +++
- lib/cryptohi/secsign.c      | 43 +++++++++++++++++++++++++++++++++++++
- lib/cryptohi/secvfy.c       |  5 +++++
- lib/freebl/ec.c             |  5 ++++-
- lib/freebl/ecdecode.c       |  5 ++++-
- lib/freebl/ecl/ecl-curve.h  | 33 ++++++++++++++++++++++++++++
- lib/freebl/ecl/ecl-exp.h    |  1 +
- lib/freebl/freebl_base.gypi |  1 +
- lib/freebl/manifest.mn      |  2 ++
- lib/nss/nss.def             |  6 ++++++
- lib/util/pkcs11n.h          |  2 ++
- lib/util/secoid.c           |  4 ++++
- lib/util/secoidt.h          |  2 ++
- 14 files changed, 112 insertions(+), 2 deletions(-)
 
 diff --git a/lib/cryptohi/cryptohi.h b/lib/cryptohi/cryptohi.h
 index 7b66f0b..4f99ef9 100644
@@ -36,10 +20,10 @@
  
  #endif /* _CRYPTOHI_H_ */
 diff --git a/lib/cryptohi/seckey.c b/lib/cryptohi/seckey.c
-index fa13bc3..4bcd43e 100644
+index 656609e..6a230e1 100644
 --- a/lib/cryptohi/seckey.c
 +++ b/lib/cryptohi/seckey.c
-@@ -520,6 +520,7 @@ seckey_GetKeyType(SECOidTag tag)
+@@ -519,6 +519,7 @@ seckey_GetKeyType(SECOidTag tag)
              keyType = dhKey;
              break;
          case SEC_OID_ANSIX962_EC_PUBLIC_KEY:
@@ -47,7 +31,7 @@
              keyType = ecKey;
              break;
          /* accommodate applications that hand us a signature type when they
-@@ -776,6 +777,7 @@ SECKEY_ECParamsToKeySize(const SECItem *encodedParams)
+@@ -775,6 +776,7 @@ SECKEY_ECParamsToKeySize(const SECItem *encodedParams)
  
          case SEC_OID_SECG_EC_SECP256K1:
          case SEC_OID_ANSIX962_EC_PRIME256V1:
@@ -55,7 +39,7 @@
              return 256;
  
          case SEC_OID_ANSIX962_EC_C2PNB272W1:
-@@ -924,6 +926,7 @@ SECKEY_ECParamsToBasePointOrderLen(const SECItem *encodedParams)
+@@ -923,6 +925,7 @@ SECKEY_ECParamsToBasePointOrderLen(const SECItem *encodedParams)
  
          case SEC_OID_SECG_EC_SECP256K1:
          case SEC_OID_ANSIX962_EC_PRIME256V1:
@@ -64,10 +48,10 @@
  
          case SEC_OID_ANSIX962_EC_C2PNB272W1:
 diff --git a/lib/cryptohi/secsign.c b/lib/cryptohi/secsign.c
-index c46b2b1..90be1d1 100644
+index 8779904..8a12b25 100644
 --- a/lib/cryptohi/secsign.c
 +++ b/lib/cryptohi/secsign.c
-@@ -861,3 +861,46 @@ SEC_CreateSignatureAlgorithmParameters(PLArenaPool *arena,
+@@ -882,3 +882,46 @@ SEC_CreateSignatureAlgorithmParameters(PLArenaPool *arena,
              return result;
      }
  }
@@ -115,7 +99,7 @@
 +    return SECSuccess;
 +}
 diff --git a/lib/cryptohi/secvfy.c b/lib/cryptohi/secvfy.c
-index 1754584..1d75bdf 100644
+index 8c9dc2d..981cb0d 100644
 --- a/lib/cryptohi/secvfy.c
 +++ b/lib/cryptohi/secvfy.c
 @@ -288,6 +288,8 @@ sec_GetEncAlgFromSigAlg(SECOidTag sigAlg)
@@ -138,7 +122,7 @@
          case SEC_OID_PKCS1_MD4_WITH_RSA_ENCRYPTION:
          default:
 diff --git a/lib/freebl/ec.c b/lib/freebl/ec.c
-index 73a625a..bf2aea7 100644
+index 5bf7d81..2b8e321 100644
 --- a/lib/freebl/ec.c
 +++ b/lib/freebl/ec.c
 @@ -15,6 +15,7 @@
@@ -148,8 +132,8 @@
 +#include "sm2.h"
  
  #define EC_DOUBLECHECK PR_FALSE
-
-@@ -907,7 +908,9 @@ ECDSA_SignDigest(ECPrivateKey *key, SECItem *signature, const SECItem *digest)
+ 
+@@ -988,7 +989,9 @@ ECDSA_SignDigest(ECPrivateKey *key, SECItem *signature, const SECItem *digest)
          goto cleanup;
  
      /* Generate ECDSA signature with the specified k value */
@@ -161,14 +145,13 @@
  cleanup:
      if (kBytes) {
 diff --git a/lib/freebl/ecdecode.c b/lib/freebl/ecdecode.c
-index 652ad42..4c090d2 100644
+index bd31eb0..29f41c9 100644
 --- a/lib/freebl/ecdecode.c
 +++ b/lib/freebl/ecdecode.c
-@@ -179,7 +179,10 @@ EC_FillParams(PLArenaPool *arena, const SECItem *encodedParams,
-             CHECK_SEC_OK(gf_populate_params_bytes(ECCurve25519, ec_field_plain,
+@@ -181,6 +181,10 @@ EC_FillParams(PLArenaPool *arena, const SECItem *encodedParams,
                                                    params));
              break;
--
+ 
 +        case SEC_OID_SM2:
 +            /* Populate params for Curve SM2 */
 +           CHECK_SEC_OK(gf_populate_params_bytes(ECCurve_sm2p256v1, ec_field_plain,
@@ -177,10 +160,10 @@
              break;
      };
 diff --git a/lib/freebl/ecl/ecl-curve.h b/lib/freebl/ecl/ecl-curve.h
-index fc8003f..e64fe4d 100644
+index dec3ce3..b525ba5 100644
 --- a/lib/freebl/ecl/ecl-curve.h
 +++ b/lib/freebl/ecl/ecl-curve.h
-@@ -206,6 +206,38 @@ static const ECCurveBytes ecCurve_25519 = {
+@@ -178,6 +178,38 @@ static const ECCurveBytes ecCurve_25519 = {
      KU_KEY_AGREEMENT
  };
  
@@ -219,7 +202,7 @@
  /* mapping between ECCurveName enum and pointers to ECCurveParams */
  static const ECCurveBytes *ecCurve_map = {
      NULL,               /* ECCurve_noName */
-@@ -267,6 +299,7 @@ static const ECCurveBytes *ecCurve_map = {
+@@ -239,6 +271,7 @@ static const ECCurveBytes *ecCurve_map = {
      NULL,               /* ECCurve_WTLS_8 */
      NULL,               /* ECCurve_WTLS_9 */
      &ecCurve_25519,     /* ECCurve25519 */
@@ -240,10 +223,10 @@
      ECCurve_pastLastCurve
  } ECCurveName;
 diff --git a/lib/freebl/freebl_base.gypi b/lib/freebl/freebl_base.gypi
-index 85a569f..253ce8d 100644
+index 920d613..e6094a9 100644
 --- a/lib/freebl/freebl_base.gypi
 +++ b/lib/freebl/freebl_base.gypi
-@@ -59,6 +59,7 @@
+@@ -61,6 +61,7 @@
      'sha_fast.c',
      'shvfy.c',
      'sm3.c',
@@ -252,10 +235,10 @@
      'tlsprfalg.c',
      'secmpi.c',
 diff --git a/lib/freebl/manifest.mn b/lib/freebl/manifest.mn
-index fd3218d..2dbf7c9 100644
+index 3214369..f321f67 100644
 --- a/lib/freebl/manifest.mn
 +++ b/lib/freebl/manifest.mn
-@@ -158,6 +158,7 @@ CSRCS = \
+@@ -161,6 +161,7 @@ CSRCS = \
  	$(LOWHASH_SRCS) \
  	$(EXTRA_SRCS) \
  	sm3.c \
@@ -263,7 +246,7 @@
  	$(NULL)
  
  ifndef NSS_DISABLE_DEPRECATED_SEED
-@@ -188,6 +189,7 @@ ALL_HDRS =  \
+@@ -191,6 +192,7 @@ ALL_HDRS =  \
  	vis_proto.h \
  	seed.h \
  	sm3.h \
@@ -272,10 +255,10 @@
  
  
 diff --git a/lib/nss/nss.def b/lib/nss/nss.def
-index e87395b..2bc4965 100644
+index 35850ca..4d778e5 100644
 --- a/lib/nss/nss.def
 +++ b/lib/nss/nss.def
-@@ -1238,3 +1238,9 @@ PK11_SlotGetLastFIPSStatus;
+@@ -1253,3 +1253,9 @@ SECMOD_LockedModuleHasRemovableSlots;
  ;+    local:
  ;+       *;
  ;+};
@@ -286,10 +269,10 @@
 +;+       *;
 +;+};
 diff --git a/lib/util/pkcs11n.h b/lib/util/pkcs11n.h
-index 9bb704c..f195077 100644
+index 5027847..31a0807 100644
 --- a/lib/util/pkcs11n.h
 +++ b/lib/util/pkcs11n.h
-@@ -252,6 +252,8 @@
+@@ -260,6 +260,8 @@
  
  /* SM algorithm (to be proposed to PKCS #11) */
  #define CKM_NSS_SM3 (CKM_NSS + 45)
@@ -299,10 +282,10 @@
  
  /*

_service:tar_scm:Feature-nss-support-SM3-digest-algorithm.patch Changed

@@ -5,32 +5,9 @@
 
 Co-authored-by: godcansee <liu332084460@foxmail.com>
 Signed-off-by: Huaxin Lu <luhuaxin1@huawei.com>
----
- lib/cryptohi/sechash.c      | 19 ++++++++
- lib/freebl/blapi.h          | 18 ++++++++
- lib/freebl/blapit.h         |  4 ++
- lib/freebl/freebl_base.gypi |  1 +
- lib/freebl/ldvector.c       | 13 +++++-
- lib/freebl/loader.c         | 91 +++++++++++++++++++++++++++++++++++++
- lib/freebl/loader.h         | 14 ++++++
- lib/freebl/manifest.mn      |  2 +
- lib/freebl/rawhash.c        | 12 +++++
- lib/pk11wrap/pk11pars.c     |  2 +
- lib/pk11wrap/pk11slot.c     | 11 ++++-
- lib/pk11wrap/secmod.h       |  1 +
- lib/softoken/pkcs11.c       |  1 +
- lib/softoken/pkcs11c.c      |  2 +
- lib/util/hasht.h            |  2 +
- lib/util/pkcs11n.h          |  4 ++
- lib/util/secoid.c           |  6 +++
- lib/util/secoidt.h          |  2 +
- lib/util/utilmodt.h         |  1 +
- lib/util/utilpars.c         |  1 +
- lib/util/utilparst.h        |  2 +-
- 21 files changed, 205 insertions(+), 4 deletions(-)
 
 diff --git a/lib/cryptohi/sechash.c b/lib/cryptohi/sechash.c
-index 474fdff..7c4cdbf 100644
+index 5c592df..b288145 100644
 --- a/lib/cryptohi/sechash.c
 +++ b/lib/cryptohi/sechash.c
 @@ -85,6 +85,12 @@ sha512_NewContext(void)
@@ -43,10 +20,10 @@
 +    return (void *)PK11_CreateDigestContext(SEC_OID_SM3);
 +}
 +
- const SECHashObject SECHashObjects = {
-     { 0,
-       (void *(*)(void))null_hash_new_context,
-@@ -166,6 +172,16 @@ const SECHashObject SECHashObjects = {
+ static void *
+ sha3_224_NewContext(void)
+ {
+@@ -190,6 +196,16 @@ const SECHashObject SECHashObjects = {
            PK11_DigestFinal,
        SHA224_BLOCK_LENGTH,
        HASH_AlgSHA224 },
@@ -60,26 +37,26 @@
 +          PK11_DigestFinal,
 +      SM3_BLOCK_LENGTH,
 +      HASH_AlgSM3 },
- };
- 
- const SECHashObject *
-@@ -201,6 +217,9 @@ HASH_GetHashTypeByOidTag(SECOidTag hashOid)
+     { SHA3_224_LENGTH,
+       (void *(*)(void))sha3_224_NewContext,
+       (void *(*)(void *))PK11_CloneContext,
+@@ -265,6 +281,9 @@ HASH_GetHashTypeByOidTag(SECOidTag hashOid)
          case SEC_OID_SHA512:
              ht = HASH_AlgSHA512;
              break;
 +        case SEC_OID_SM3:
 +            ht = HASH_AlgSM3;
 +            break;
-         default:
-             PORT_SetError(SEC_ERROR_INVALID_ALGORITHM);
+         case SEC_OID_SHA3_224:
+             ht = HASH_AlgSHA3_224;
              break;
 diff --git a/lib/freebl/blapi.h b/lib/freebl/blapi.h
-index 94fd802..d53c196 100644
+index b8bc4d3..a06544e 100644
 --- a/lib/freebl/blapi.h
 +++ b/lib/freebl/blapi.h
-@@ -1484,6 +1484,24 @@ extern SECStatus SHA384_Flatten(SHA384Context *cx, unsigned char *space);
- extern SHA384Context *SHA384_Resurrect(unsigned char *space, void *arg);
- extern void SHA384_Clone(SHA384Context *dest, SHA384Context *src);
+@@ -1584,6 +1584,24 @@ extern SECStatus SHAKE_256_HashBuf(unsigned char *dest, unsigned int dest_len,
+                                    const unsigned char *src, PRUint32 src_length);
+ extern SECStatus SHAKE_256_Hash(unsigned char *dest, unsigned int dest_len, const char *src);
  
 +/******************************************/
 +
@@ -103,46 +80,46 @@
   * implement TLS 1.0 Pseudo Random Function (PRF) and TLS P_hash function
   */
 diff --git a/lib/freebl/blapit.h b/lib/freebl/blapit.h
-index 0054e17..2d400ec 100644
+index 8cba3ec..cbd6b79 100644
 --- a/lib/freebl/blapit.h
 +++ b/lib/freebl/blapit.h
-@@ -98,6 +98,7 @@ typedef int __BLAPI_DEPRECATED __attribute__((deprecated));
- #define SHA384_LENGTH 48     /* bytes */
- #define SHA512_LENGTH 64     /* bytes */
+@@ -102,6 +102,7 @@ typedef int __BLAPI_DEPRECATED __attribute__((deprecated));
+ #define SHA3_384_LENGTH 48   /* bytes */
+ #define SHA3_512_LENGTH 64   /* bytes */
  #define BLAKE2B512_LENGTH 64 /* Bytes */
 +#define SM3_LENGTH 32        /* bytes */
  #define HASH_LENGTH_MAX SHA512_LENGTH
  
  /*
-@@ -112,6 +113,7 @@ typedef int __BLAPI_DEPRECATED __attribute__((deprecated));
- #define SHA384_BLOCK_LENGTH 128  /* bytes */
- #define SHA512_BLOCK_LENGTH 128  /* bytes */
- #define BLAKE2B_BLOCK_LENGTH 128 /* Bytes */
+@@ -120,6 +121,7 @@ typedef int __BLAPI_DEPRECATED __attribute__((deprecated));
+ #define SHA3_384_BLOCK_LENGTH 104 /* bytes */
+ #define SHA3_512_BLOCK_LENGTH 72  /* bytes */
+ #define BLAKE2B_BLOCK_LENGTH 128  /* Bytes */
 +#define SM3_BLOCK_LENGTH 64      /* bytes */
- #define HASH_BLOCK_LENGTH_MAX SHA512_BLOCK_LENGTH
+ #define HASH_BLOCK_LENGTH_MAX SHA3_224_BLOCK_LENGTH
  
  #define AES_BLOCK_SIZE 16 /* bytes */
-@@ -243,6 +245,7 @@ struct MD5ContextStr;
+@@ -255,6 +257,7 @@ struct MD5ContextStr;
  struct SHA1ContextStr;
  struct SHA256ContextStr;
  struct SHA512ContextStr;
 +struct SM3ContextStr;
+ struct SHA3ContextStr;
+ struct SHAKEContextStr;
  struct AESKeyWrapContextStr;
- struct SEEDContextStr;
- struct ChaCha20ContextStr;
-@@ -264,6 +267,7 @@ typedef struct SHA256ContextStr SHA224Context;
+@@ -278,6 +281,7 @@ typedef struct SHA256ContextStr SHA224Context;
  typedef struct SHA512ContextStr SHA512Context;
  /* SHA384Context is really a SHA512ContextStr.  This is not a mistake. */
  typedef struct SHA512ContextStr SHA384Context;
 +typedef struct SM3ContextStr SM3Context;
- typedef struct AESKeyWrapContextStr AESKeyWrapContext;
- typedef struct SEEDContextStr SEEDContext;
- typedef struct ChaCha20ContextStr ChaCha20Context;
+ /* All SHA3_*Contexts are the same.  This is not a mistake. */
+ typedef struct SHA3ContextStr SHA3_224Context;
+ typedef struct SHA3ContextStr SHA3_256Context;
 diff --git a/lib/freebl/freebl_base.gypi b/lib/freebl/freebl_base.gypi
-index 34b6b3c..8f64046 100644
+index d2e16f2..920d613 100644
 --- a/lib/freebl/freebl_base.gypi
 +++ b/lib/freebl/freebl_base.gypi
-@@ -58,6 +58,7 @@
+@@ -60,6 +60,7 @@
      'rsapkcs.c',
      'sha_fast.c',
      'shvfy.c',
@@ -151,17 +128,13 @@
      'tlsprfalg.c',
      'secmpi.c',
 diff --git a/lib/freebl/ldvector.c b/lib/freebl/ldvector.c
-index 6f4bd6a..143584b 100644
+index ff0a5f8..bf41759 100644
 --- a/lib/freebl/ldvector.c
 +++ b/lib/freebl/ldvector.c
-@@ -375,9 +375,20 @@ static const struct FREEBLVectorStr vector = {
-     /* End of version 3.024 */
-     ChaCha20_InitContext,
-     ChaCha20_CreateContext,
--    ChaCha20_DestroyContext
-+    ChaCha20_DestroyContext,
+@@ -379,6 +379,18 @@ static const struct FREEBLVectorStr vector = {
  
      /* End of version 3.025 */
+ 
 +    SM3_NewContext,
 +    SM3_DestroyContext,
 +    SM3_Begin,
@@ -172,19 +145,19 @@
 +    SM3_TraceState,
 +    SM3_FlattenSize,
 +    SM3_Flatten,
-+    SM3_Resurrect
- };
- 
- const FREEBLVector*
++    SM3_Resurrect,
++
+     SHA3_224_NewContext,
+     SHA3_224_DestroyContext,
+     SHA3_224_FlattenSize,
 diff --git a/lib/freebl/loader.c b/lib/freebl/loader.c
-index 692a883..dc3a37e 100644
+index c44343f..8e4b542 100644
 --- a/lib/freebl/loader.c
 +++ b/lib/freebl/loader.c
-@@ -2446,3 +2446,94 @@ CMAC_Destroy(CMACContext *ctx, PRBool free_it)
-         return;
+@@ -2447,6 +2447,96 @@ CMAC_Destroy(CMACContext *ctx, PRBool free_it)
      (vector->p_CMAC_Destroy)(ctx, free_it);
  }
-+
+ 
 +SECStatus
 +SM3_Hash(unsigned char *dest, const char *src)
 +{

_service Changed

_service:tar_scm:nss-3.89.tar.gz -> _service:tar_scm:nss-3.94.tar.gz Changed

_service:tar_scm:nss-config Changed

_service:tar_scm:nss-softokn-config Changed

_service:tar_scm:nss-softokn.pc Changed

_service:tar_scm:nss-util-config Changed

_service:tar_scm:nss-util.pc Changed

_service:tar_scm:nss.pc Changed