зеркало из https://github.com/mozilla/gecko-dev.git
Bug 993569 - Update Mozilla 31 to use NSS 3.16.1 Beta 3. The main change
is https://hg.mozilla.org/projects/nss/rev/7e8485a5ed49.
This commit is contained in:
Родитель
16fbdd68b9
Коммит
8063163ac9
|
@ -1 +1 @@
|
||||||
NSS_3_16_1_BETA2
|
NSS_3_16_1_BETA3
|
||||||
|
|
|
@ -10,3 +10,4 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#error "Do not include this header file."
|
#error "Do not include this header file."
|
||||||
|
|
||||||
|
|
|
@ -135,9 +135,9 @@ else
|
||||||
ifdef BUILD_OPT
|
ifdef BUILD_OPT
|
||||||
OPTIMIZER += -Ox # maximum optimization for freebl
|
OPTIMIZER += -Ox # maximum optimization for freebl
|
||||||
endif
|
endif
|
||||||
# The Intel AES assembly code requires Visual C++ 2010 (10.0). The _xgetbv
|
# The Intel AES assembly code requires Visual C++ 2010.
|
||||||
# compiler intrinsic function requires Visual C++ 2010 (10.0) SP1.
|
# if $(_MSC_VER) >= 1600 (Visual C++ 2010)
|
||||||
ifeq ($(_MSC_VER_GE_10SP1),1)
|
ifeq ($(firstword $(sort $(_MSC_VER) 1600)),1600)
|
||||||
DEFINES += -DUSE_HW_AES -DINTEL_GCM
|
DEFINES += -DUSE_HW_AES -DINTEL_GCM
|
||||||
ASFILES += intel-aes-x86-masm.asm intel-gcm-x86-masm.asm
|
ASFILES += intel-aes-x86-masm.asm intel-gcm-x86-masm.asm
|
||||||
EXTRA_SRCS += intel-gcm-wrap.c
|
EXTRA_SRCS += intel-gcm-wrap.c
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* blapi.h - public prototypes for the crypto library
|
* blapi.h - public prototypes for the freebl library
|
||||||
*
|
*
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* blapii.h - private data structures and prototypes for the crypto library
|
* blapii.h - private data structures and prototypes for the freebl library
|
||||||
*
|
*
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* blapit.h - public data structures for the crypto library
|
* blapit.h - public data structures for the freebl library
|
||||||
*
|
*
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
|
|
@ -972,13 +972,24 @@ AESContext * AES_AllocateContext(void)
|
||||||
/*
|
/*
|
||||||
* Adapted from the example code in "How to detect New Instruction support in
|
* Adapted from the example code in "How to detect New Instruction support in
|
||||||
* the 4th generation Intel Core processor family" by Max Locktyukhin.
|
* the 4th generation Intel Core processor family" by Max Locktyukhin.
|
||||||
|
*
|
||||||
|
* XGETBV:
|
||||||
|
* Reads an extended control register (XCR) specified by ECX into EDX:EAX.
|
||||||
*/
|
*/
|
||||||
static PRBool
|
static PRBool
|
||||||
check_xcr0_ymm()
|
check_xcr0_ymm()
|
||||||
{
|
{
|
||||||
PRUint32 xcr0;
|
PRUint32 xcr0;
|
||||||
#if defined(_MSC_VER)
|
#if defined(_MSC_VER)
|
||||||
|
#if defined(_M_IX86)
|
||||||
|
__asm {
|
||||||
|
mov ecx, 0
|
||||||
|
xgetbv
|
||||||
|
mov xcr0, eax
|
||||||
|
}
|
||||||
|
#else
|
||||||
xcr0 = (PRUint32)_xgetbv(0); /* Requires VS2010 SP1 or later. */
|
xcr0 = (PRUint32)_xgetbv(0); /* Requires VS2010 SP1 or later. */
|
||||||
|
#endif
|
||||||
#else
|
#else
|
||||||
__asm__ ("xgetbv" : "=a" (xcr0) : "c" (0) : "%edx");
|
__asm__ ("xgetbv" : "=a" (xcr0) : "c" (0) : "%edx");
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* secdig.h - public prototypes for digestinfos from the util lib
|
* secdig.h - public prototypes for digest-info functions
|
||||||
*
|
*
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* secdigt.h - public data structures for digestinfos from the util lib.
|
* secdigt.h - public data structures for digest-info objects
|
||||||
*
|
*
|
||||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
@ -23,6 +23,4 @@ struct SGNDigestInfoStr {
|
||||||
};
|
};
|
||||||
typedef struct SGNDigestInfoStr SGNDigestInfo;
|
typedef struct SGNDigestInfoStr SGNDigestInfo;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif /* _SECDIGT_H_ */
|
#endif /* _SECDIGT_H_ */
|
||||||
|
|
Загрузка…
Ссылка в новой задаче