mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1020695, Update Mozilla to use NSS 3.16.2, r=wtc
This commit is contained in:
parent
a0b040b3e9
commit
5f9fdca404
@ -1 +1 @@
|
|||||||
NSS_3_16_2_BETA4
|
NSS_3_16_2_RTM
|
||||||
|
@ -10,3 +10,4 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#error "Do not include this header file."
|
#error "Do not include this header file."
|
||||||
|
|
||||||
|
@ -1386,7 +1386,7 @@ RSA_PrivateKeyCheck(const RSAPrivateKey *key)
|
|||||||
!key->publicExponent.data || !key->privateExponent.data ||
|
!key->publicExponent.data || !key->privateExponent.data ||
|
||||||
!key->exponent1.data || !key->exponent2.data ||
|
!key->exponent1.data || !key->exponent2.data ||
|
||||||
!key->coefficient.data) {
|
!key->coefficient.data) {
|
||||||
/*call RSA_PopulatePrivateKey first, if the application wishes to
|
/* call RSA_PopulatePrivateKey first, if the application wishes to
|
||||||
* recover these parameters */
|
* recover these parameters */
|
||||||
err = MP_BADARG;
|
err = MP_BADARG;
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
@ -1415,9 +1415,6 @@ RSA_PrivateKeyCheck(const RSAPrivateKey *key)
|
|||||||
rv = SECFailure; \
|
rv = SECFailure; \
|
||||||
goto cleanup; \
|
goto cleanup; \
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
* The following errors cannot be recovered from.
|
|
||||||
*/
|
|
||||||
/* n == p * q */
|
/* n == p * q */
|
||||||
CHECK_MPI_OK( mp_mul(&p, &q, &res) );
|
CHECK_MPI_OK( mp_mul(&p, &q, &res) );
|
||||||
VERIFY_MPI_EQUAL(&res, &n);
|
VERIFY_MPI_EQUAL(&res, &n);
|
||||||
@ -1435,10 +1432,6 @@ RSA_PrivateKeyCheck(const RSAPrivateKey *key)
|
|||||||
/* d*e == 1 mod q-1 */
|
/* d*e == 1 mod q-1 */
|
||||||
CHECK_MPI_OK( mp_mulmod(&d, &e, &qsub1, &res) );
|
CHECK_MPI_OK( mp_mulmod(&d, &e, &qsub1, &res) );
|
||||||
VERIFY_MPI_EQUAL_1(&res);
|
VERIFY_MPI_EQUAL_1(&res);
|
||||||
/*
|
|
||||||
* The following errors can be recovered from. However, the purpose of this
|
|
||||||
* function is to check consistency, so they are not.
|
|
||||||
*/
|
|
||||||
/* d_p == d mod p-1 */
|
/* d_p == d mod p-1 */
|
||||||
CHECK_MPI_OK( mp_mod(&d, &psub1, &res) );
|
CHECK_MPI_OK( mp_mod(&d, &psub1, &res) );
|
||||||
VERIFY_MPI_EQUAL(&res, &d_p);
|
VERIFY_MPI_EQUAL(&res, &d_p);
|
||||||
|
@ -33,12 +33,12 @@
|
|||||||
* The format of the version string should be
|
* The format of the version string should be
|
||||||
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
|
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
|
||||||
*/
|
*/
|
||||||
#define NSS_VERSION "3.16.2" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta"
|
#define NSS_VERSION "3.16.2" _NSS_ECC_STRING _NSS_CUSTOMIZED
|
||||||
#define NSS_VMAJOR 3
|
#define NSS_VMAJOR 3
|
||||||
#define NSS_VMINOR 16
|
#define NSS_VMINOR 16
|
||||||
#define NSS_VPATCH 2
|
#define NSS_VPATCH 2
|
||||||
#define NSS_VBUILD 0
|
#define NSS_VBUILD 0
|
||||||
#define NSS_BETA PR_TRUE
|
#define NSS_BETA PR_FALSE
|
||||||
|
|
||||||
#ifndef RC_INVOKED
|
#ifndef RC_INVOKED
|
||||||
|
|
||||||
|
@ -25,11 +25,11 @@
|
|||||||
* The format of the version string should be
|
* The format of the version string should be
|
||||||
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
|
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
|
||||||
*/
|
*/
|
||||||
#define SOFTOKEN_VERSION "3.16.2" SOFTOKEN_ECC_STRING " Beta"
|
#define SOFTOKEN_VERSION "3.16.2" SOFTOKEN_ECC_STRING
|
||||||
#define SOFTOKEN_VMAJOR 3
|
#define SOFTOKEN_VMAJOR 3
|
||||||
#define SOFTOKEN_VMINOR 16
|
#define SOFTOKEN_VMINOR 16
|
||||||
#define SOFTOKEN_VPATCH 2
|
#define SOFTOKEN_VPATCH 2
|
||||||
#define SOFTOKEN_VBUILD 0
|
#define SOFTOKEN_VBUILD 0
|
||||||
#define SOFTOKEN_BETA PR_TRUE
|
#define SOFTOKEN_BETA PR_FALSE
|
||||||
|
|
||||||
#endif /* _SOFTKVER_H_ */
|
#endif /* _SOFTKVER_H_ */
|
||||||
|
@ -19,12 +19,12 @@
|
|||||||
* The format of the version string should be
|
* The format of the version string should be
|
||||||
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
|
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
|
||||||
*/
|
*/
|
||||||
#define NSSUTIL_VERSION "3.16.2 Beta"
|
#define NSSUTIL_VERSION "3.16.2"
|
||||||
#define NSSUTIL_VMAJOR 3
|
#define NSSUTIL_VMAJOR 3
|
||||||
#define NSSUTIL_VMINOR 16
|
#define NSSUTIL_VMINOR 16
|
||||||
#define NSSUTIL_VPATCH 2
|
#define NSSUTIL_VPATCH 2
|
||||||
#define NSSUTIL_VBUILD 0
|
#define NSSUTIL_VBUILD 0
|
||||||
#define NSSUTIL_BETA PR_TRUE
|
#define NSSUTIL_BETA PR_FALSE
|
||||||
|
|
||||||
SEC_BEGIN_PROTOS
|
SEC_BEGIN_PROTOS
|
||||||
|
|
||||||
|
@ -299,9 +299,15 @@ fi
|
|||||||
# created, we check for modutil to know whether the build
|
# created, we check for modutil to know whether the build
|
||||||
# is complete. If a new file is created after that, the
|
# is complete. If a new file is created after that, the
|
||||||
# following test for modutil should check for that instead.
|
# following test for modutil should check for that instead.
|
||||||
|
# Exception: when building softoken only, shlibsign is the
|
||||||
|
# last file created.
|
||||||
|
if [ ${NSS_BUILD_SOFTOKEN_ONLY} -eq "1" ]; then
|
||||||
|
LAST_FILE_BUILT=shlibsign
|
||||||
|
else
|
||||||
|
LAST_FILE_BUILT=modutil
|
||||||
|
fi
|
||||||
|
|
||||||
if [ ! -f ${DIST}/${OBJDIR}/bin/modutil -a \
|
if [ ! -f ${DIST}/${OBJDIR}/bin/${LAST_FILE_BUILT}${PROG_SUFFIX} ]; then
|
||||||
! -f ${DIST}/${OBJDIR}/bin/modutil.exe ]; then
|
|
||||||
echo "Build Incomplete. Aborting test." >> ${LOGFILE}
|
echo "Build Incomplete. Aborting test." >> ${LOGFILE}
|
||||||
html_head "Testing Initialization"
|
html_head "Testing Initialization"
|
||||||
Exit "Checking for build"
|
Exit "Checking for build"
|
||||||
|
@ -129,6 +129,12 @@ if [ ! -x ${DIST}/${OBJDIR}/bin/bltest${PROG_SUFFIX} ]; then
|
|||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
cipher_init
|
cipher_init
|
||||||
cipher_main
|
# Skip cipher_main if this an NSS without softoken build.
|
||||||
cipher_gcm
|
if [ "${NSS_BUILD_WITHOUT_SOFTOKEN}" != "1" ]; then
|
||||||
|
cipher_main
|
||||||
|
fi
|
||||||
|
# Skip cipher_gcm if this is a softoken only build.
|
||||||
|
if [ "${NSS_BUILD_SOFTOKEN_ONLY}" != "1" ]; then
|
||||||
|
cipher_gcm
|
||||||
|
fi
|
||||||
cipher_cleanup
|
cipher_cleanup
|
||||||
|
Loading…
Reference in New Issue
Block a user