wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 858231, update to NSS 3.15 and NSPR 4.10, final releases, r=wtc

Browse Source
This commit is contained in:
Kai Engert 2013-06-05 21:03:40 +02:00
parent 788d65e368
commit 6b7a5f546d
10 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nsprpub/TAG-INFO
View File

@ -1 +1 @@
NSPR_4_10_BETA2
NSPR_4_10_RTM

1
nsprpub/config/prdepend.h
View File

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

4
nsprpub/pr/include/prinit.h
View File

@ -31,11 +31,11 @@ PR_BEGIN_EXTERN_C
** The format of the version string is
** "<major version>.<minor version>[.<patch level>] [<Beta>]"
*/
#define PR_VERSION "4.10 Beta"
#define PR_VERSION "4.10"
#define PR_VMAJOR 4
#define PR_VMINOR 10
#define PR_VPATCH 0
#define PR_BETA PR_TRUE
#define PR_BETA PR_FALSE
/*
** PRVersionCheck

2
security/nss/TAG-INFO
View File

@ -1 +1 @@
NSS_3_15_BETA6
NSS_3_15_RTM

3
security/nss/cmd/bltest/blapitest.c
View File

@ -1033,8 +1033,7 @@ misalignBuffer(PLArenaPool *arena, bltestIO *io, int off)
ptrdiff_t offset = (ptrdiff_t)io->buf.data % WORDSIZE;
int length = io->buf.len;
if (offset != off) {
SECITEM_ReallocItem(arena, &io->buf, length, length + 2*WORDSIZE);
io->buf.len = length + 2*WORDSIZE; /* why doesn't realloc do this? */
SECITEM_ReallocItemV2(arena, &io->buf, length + 2*WORDSIZE);
/* offset may have changed? */
offset = (ptrdiff_t)io->buf.data % WORDSIZE;
if (offset != off) {

22
security/nss/cmd/certutil/certutil.c
View File

@ -1202,16 +1202,18 @@ static void luG(enum usage_level ul, const char *command)
" -d keydir");
FPS "%-20s Cert & Key database prefix\n",
" -P dbprefix");
FPS "%-20s PKCS #11 key Attributes\n",
" --keyAttrFlags attrflags.");
FPS "%-20s\n"
"%-20s PKCS #11 key Attributes.\n",
" --keyAttrFlags attrflags", "");
FPS "%-20s Comma separated list of key attribute attribute flags,\n", "");
FPS "%-20s selected from the following list of choices:\n", "");
FPS "%-20s {token | session} {public | private} {sensitive | insensitive}\n", "");
FPS "%-20s {modifiable | unmodifiable} {extractable | unextractable}\n", "");
FPS "%-20s PKCS #11 key Operation Flags\n",
" --keyOpFlagsOn opflags.");
FPS "%-20s PKCS #11 key Operation Flags\n",
" --keyOpFlagsOff opflags.");
FPS "%-20s\n",
" --keyOpFlagsOn opflags");
FPS "%-20s\n"
"%-20s PKCS #11 key Operation Flags.\n",
" --keyOpFlagsOff opflags", "");
FPS "%-20s Comma separated list of one or more of the following:\n", "");
FPS "%-20s encrypt, decrypt, sign, sign_recover, verify,\n", "");
FPS "%-20s verify_recover, wrap, unwrap, derive\n", "");
@ -1447,7 +1449,7 @@ static void luR(enum usage_level ul, const char *command)
FPS "%-20s \n",
" See -S for available extension options");
FPS "%-20s \n",
" See -G for available key flag options");
" See -G for available key flag options");
FPS "\n");
}
@ -1631,7 +1633,7 @@ static void luS(enum usage_level ul, const char *command)
FPS "%-20s Create a subject key ID extension\n",
" --extSKID ");
FPS "%-20s \n",
" See -G for available key flag options");
" See -G for available key flag options");
FPS "%-20s Create a name constraints extension\n",
" --extNC ");
FPS "\n");
@ -1986,7 +1988,7 @@ flagArray attrFlagsArray[] =
{NAME_SIZE(sensitive), PK11_ATTR_SENSITIVE},
{NAME_SIZE(insensitive), PK11_ATTR_INSENSITIVE},
{NAME_SIZE(extractable), PK11_ATTR_EXTRACTABLE},
{NAME_SIZE(unextractable), PK11_ATTR_EXTRACTABLE}
{NAME_SIZE(unextractable), PK11_ATTR_UNEXTRACTABLE}
};
@ -1999,8 +2001,6 @@ GetFlags(char *flagsString, flagArray *flagArray, int count)
CK_ULONG flagsValue = strtol(flagsString, NULL, 0);
int i;
fprintf(stderr, "parsing flags <%s>\n", flagsString);
if ((flagsValue != 0) || (*flagsString == 0)) {
return flagsValue;
}

2
security/nss/cmd/lib/secutil.c
View File

@ -530,7 +530,7 @@ SECU_ReadDERFromFile(SECItem *der, PRFileDesc *inFile, PRBool ascii)
}
} else {
/* need one additional byte for zero terminator */
rv = SECITEM_ReallocItem(NULL, &filedata, filedata.len, filedata.len+1);
rv = SECITEM_ReallocItemV2(NULL, &filedata, filedata.len+1);
if (rv != SECSuccess) {
PORT_Free(filedata.data);
return rv;

4
security/nss/lib/nss/nss.h
View File

@ -33,12 +33,12 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
*/
#define NSS_VERSION "3.15" _NSS_ECC_STRING _NSS_CUSTOMIZED "Beta"
#define NSS_VERSION "3.15" _NSS_ECC_STRING _NSS_CUSTOMIZED
#define NSS_VMAJOR 3
#define NSS_VMINOR 15
#define NSS_VPATCH 0
#define NSS_VBUILD 0
#define NSS_BETA PR_TRUE
#define NSS_BETA PR_FALSE
#ifndef RC_INVOKED

4
security/nss/lib/softoken/softkver.h
View File

@ -25,11 +25,11 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
*/
#define SOFTOKEN_VERSION "3.15" SOFTOKEN_ECC_STRING "Beta"
#define SOFTOKEN_VERSION "3.15" SOFTOKEN_ECC_STRING
#define SOFTOKEN_VMAJOR 3
#define SOFTOKEN_VMINOR 15
#define SOFTOKEN_VPATCH 0
#define SOFTOKEN_VBUILD 0
#define SOFTOKEN_BETA PR_TRUE
#define SOFTOKEN_BETA PR_FALSE
#endif /* _SOFTKVER_H_ */

4
security/nss/lib/util/nssutil.h
View File

@ -19,12 +19,12 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
*/
#define NSSUTIL_VERSION "3.15 Beta"
#define NSSUTIL_VERSION "3.15"
#define NSSUTIL_VMAJOR 3
#define NSSUTIL_VMINOR 15
#define NSSUTIL_VPATCH 0
#define NSSUTIL_VBUILD 0
#define NSSUTIL_BETA PR_TRUE
#define NSSUTIL_BETA PR_FALSE
SEC_BEGIN_PROTOS