Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 898431: Update to NSS 3.15.4 beta 7 (NSS_3_15_4_BETA7), r=me

Browse Source 
--HG--
extra : rebase_source : 51f5e01db5d8dec46f341e217fa2ba97382c723c
extra : amend_source : 04d8a9e4a861228c217b9d766cd8781d49ed496f
This commit is contained in:
Brian Smith 2013-12-04 20:51:58 -08:00
parent 29ddeee1e5
commit 1e0f7a1545
4 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/nss/TAG-INFO
View File

@ -1 +1 @@
NSS_3_15_4_BETA6
NSS_3_15_4_BETA7

1
security/nss/coreconf/coreconf.dep
View File

@ -10,4 +10,3 @@
*/
#error "Do not include this header file."

28
security/nss/lib/ckfw/builtins/certdata.txt
View File

@ -13489,6 +13489,34 @@ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
# Distrust "Distrusted AC DG Tresor SSL"
# Issuer: CN=AC DGTPE Signature Authentification,O=DGTPE,C=FR
# Serial Number: 204199 (0x31da7)
# Subject: CN=AC DG Tr..sor SSL,O=DG Tr..sor,C=FR
# Not Valid Before: Thu Jul 18 10:05:28 2013
# Not Valid After : Fri Jul 18 10:05:28 2014
# Fingerprint (MD5): 3A:EA:9E:FC:00:0C:E2:06:6C:E0:AC:39:C1:31:DE:C8
# Fingerprint (SHA1): 5C:E3:39:46:5F:41:A1:E4:23:14:9F:65:54:40:95:40:4D:E6:EB:E2
CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
CKA_TOKEN CK_BBOOL CK_TRUE
CKA_PRIVATE CK_BBOOL CK_FALSE
CKA_MODIFIABLE CK_BBOOL CK_FALSE
CKA_LABEL UTF8 "Distrusted AC DG Tresor SSL"
CKA_ISSUER MULTILINE_OCTAL
\060\113\061\013\060\011\006\003\125\004\006\023\002\106\122\061
\016\060\014\006\003\125\004\012\023\005\104\107\124\120\105\061
\054\060\052\006\003\125\004\003\023\043\101\103\040\104\107\124
\120\105\040\123\151\147\156\141\164\165\162\145\040\101\165\164
\150\145\156\164\151\146\151\143\141\164\151\157\156
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
\002\003\003\035\247
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_NOT_TRUSTED
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED
CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
#
# Certificate "Security Communication EV RootCA1"
#

4
security/nss/lib/freebl/unix_rand.c
View File

@ -983,6 +983,8 @@ size_t RNG_FileUpdate(const char *fileName, size_t limit)
* Moreover, we read into a buffer of size BUFSIZ, so buffered I/O
* has no performance advantage. */
fd = fileno(file);
/* 'file' was just opened, so this should not fail. */
PORT_Assert(fd != -1);
while (limit > fileBytes) {
bytes = PR_MIN(sizeof buffer, limit - fileBytes);
bytes = read(fd, buffer, bytes);
@ -1150,6 +1152,8 @@ size_t RNG_SystemRNG(void *dest, size_t maxLen)
* EOF in unbuffered I/O mode on Android.
*/
fd = fileno(file);
/* 'file' was just opened, so this should not fail. */
PORT_Assert(fd != -1);
while (maxLen > fileBytes) {
bytes = maxLen - fileBytes;
bytes = read(fd, buffer, bytes);