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

Bug 1277255, land NSS_3_25_RC1, r=me

Browse Source
This commit is contained in:
Kai Engert 2016-06-20 19:17:28 +02:00
parent 1359297bec
commit c6ce2eb18b
4 changed files with 17 additions and 3 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_25_RC0
NSS_3_25_RC1

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

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

13
security/nss/lib/freebl/Makefile
View File

@ -522,7 +522,18 @@ ifndef NSS_DISABLE_CHACHAPOLY
else
EXTRA_SRCS += poly1305.c
endif
EXTRA_SRCS += chacha20_vec.c
ifeq ($(OS_TARGET),SunOS)
ifndef NS_USE_GCC
CHACHA_NO_SSE2 = 1
endif
endif
ifdef CHACHA_NO_SSE2
EXTRA_SRCS += chacha20.c
else
EXTRA_SRCS += chacha20_vec.c
endif
else
EXTRA_SRCS += poly1305.c
EXTRA_SRCS += chacha20.c

4
security/nss/lib/ssl/ssl3con.c
View File

@ -4018,12 +4018,16 @@ static CK_MECHANISM_TYPE
ssl3_GetHashMechanismByHashType(SSLHashType hashType)
{
switch (hashType) {
case ssl_hash_sha512:
return CKM_SHA512;
case ssl_hash_sha384:
return CKM_SHA384;
case ssl_hash_sha256:
case ssl_hash_none:
/* ssl_hash_none is for pre-1.2 suites, which use SHA-256. */
return CKM_SHA256;
case ssl_hash_sha1:
return CKM_SHA_1;
default:
PORT_Assert(0);
}