diff options
| author | slavomir.katuscak%sun.com <devnull@localhost> | 2009-04-01 19:06:01 +0000 |
|---|---|---|
| committer | slavomir.katuscak%sun.com <devnull@localhost> | 2009-04-01 19:06:01 +0000 |
| commit | 74b5a7db0369b3c5f221308eae71f190bb97f37d (patch) | |
| tree | 39ed03a9c2278a26bd3fdd2b49d72ad0ff5606c9 | |
| parent | 236f731d4b53772834cd9f2c5a69e0fc2e9881a3 (diff) | |
| parent | 229486956ac732a13675dd0fc47bd0a509b19b24 (diff) | |
| download | nss-hg-74b5a7db0369b3c5f221308eae71f190bb97f37d.tar.gz | |
Updated list of memory leaks - added leak from bug #486298
| -rw-r--r-- | security/nss/lib/cryptohi/cryptohi.h | 6 | ||||
| -rw-r--r-- | security/nss/lib/cryptohi/secsign.c | 2 | ||||
| -rw-r--r-- | security/nss/lib/nss/nss.h | 6 | ||||
| -rw-r--r-- | security/nss/lib/softoken/softkver.h | 6 | ||||
| -rw-r--r-- | security/nss/tests/memleak/ignored | 3 |
5 files changed, 13 insertions, 10 deletions
diff --git a/security/nss/lib/cryptohi/cryptohi.h b/security/nss/lib/cryptohi/cryptohi.h index 5897a3a6b..2b564f6ae 100644 --- a/security/nss/lib/cryptohi/cryptohi.h +++ b/security/nss/lib/cryptohi/cryptohi.h @@ -174,9 +174,9 @@ extern SECStatus SEC_DerSignData(PRArenaPool *arena, SECItem *result, extern void SEC_DestroySignedData(CERTSignedData *sd, PRBool freeit); /* -** Get the hash algorithm tag number for the given type of the key and -** algorithm tag. Returns SEC_OID_UNKNOWN if key and algorithm -** are not match. +** Get the signature algorithm tag number for the given key type and hash +** algorithm tag. Returns SEC_OID_UNKNOWN if key type and hash algorithm +** do not match or are not supported. */ extern SECOidTag SEC_GetSignatureAlgorithmOidTag(KeyType keyType, SECOidTag hashAlgTag); diff --git a/security/nss/lib/cryptohi/secsign.c b/security/nss/lib/cryptohi/secsign.c index 270889e6c..1c50e9b97 100644 --- a/security/nss/lib/cryptohi/secsign.c +++ b/security/nss/lib/cryptohi/secsign.c @@ -511,9 +511,9 @@ SEC_GetSignatureAlgorithmOidTag(KeyType keyType, SECOidTag hashAlgTag) switch (hashAlgTag) { case SEC_OID_MD2: sigTag = SEC_OID_PKCS1_MD2_WITH_RSA_ENCRYPTION; break; - case SEC_OID_UNKNOWN: /* default for RSA if not specified */ case SEC_OID_MD5: sigTag = SEC_OID_PKCS1_MD5_WITH_RSA_ENCRYPTION; break; + case SEC_OID_UNKNOWN: /* default for RSA if not specified */ case SEC_OID_SHA1: sigTag = SEC_OID_PKCS1_SHA1_WITH_RSA_ENCRYPTION; break; case SEC_OID_SHA256: diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h index 04e2b74b6..d4ccca931 100644 --- a/security/nss/lib/nss/nss.h +++ b/security/nss/lib/nss/nss.h @@ -70,11 +70,11 @@ SEC_BEGIN_PROTOS * The format of the version string should be * "<major version>.<minor version>[.<patch level>][ <ECC>][ <Beta>]" */ -#define NSS_VERSION "3.11.10.1" _NSS_ECC_STRING _NSS_CUSTOMIZED +#define NSS_VERSION "3.11.11.0" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta" #define NSS_VMAJOR 3 #define NSS_VMINOR 11 -#define NSS_VPATCH 10 -#define NSS_BETA PR_FALSE +#define NSS_VPATCH 11 +#define NSS_BETA PR_TRUE /* * Return a boolean that indicates whether the underlying library diff --git a/security/nss/lib/softoken/softkver.h b/security/nss/lib/softoken/softkver.h index 03d8611ec..68f7be9d7 100644 --- a/security/nss/lib/softoken/softkver.h +++ b/security/nss/lib/softoken/softkver.h @@ -57,10 +57,10 @@ * The format of the version string should be * "<major version>.<minor version>[.<patch level>][ <ECC>][ <Beta>]" */ -#define SOFTOKEN_VERSION "3.11.10.1" SOFTOKEN_ECC_STRING +#define SOFTOKEN_VERSION "3.11.11.0" SOFTOKEN_ECC_STRING " Beta" #define SOFTOKEN_VMAJOR 3 #define SOFTOKEN_VMINOR 11 -#define SOFTOKEN_VPATCH 10 -#define SOFTOKEN_BETA PR_FALSE +#define SOFTOKEN_VPATCH 11 +#define SOFTOKEN_BETA PR_TRUE #endif /* _SOFTKVER_H_ */ diff --git a/security/nss/tests/memleak/ignored b/security/nss/tests/memleak/ignored index 58b19fe85..f825f55db 100644 --- a/security/nss/tests/memleak/ignored +++ b/security/nss/tests/memleak/ignored @@ -37,3 +37,6 @@ ocspclnt/main/CERT_SetOCSPDefaultResponder/** #397487 **/__rpc_getconfip/setnetconfig/** +#486928 +selfserv/main/PORT_Strdup_Util/PORT_Alloc_Util/** + |