Index: branches/2017Q4/security/ca_root_nss/Makefile =================================================================== --- branches/2017Q4/security/ca_root_nss/Makefile (revision 454956) +++ branches/2017Q4/security/ca_root_nss/Makefile (revision 454957) @@ -1,70 +1,70 @@ # $FreeBSD$ PORTNAME= ca_root_nss PORTVERSION= ${VERSION_NSS} CATEGORIES= security MASTER_SITES= MOZILLA/security/nss/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src DISTNAME= nss-${VERSION_NSS}${NSS_SUFFIX} MAINTAINER= ports-secteam@FreeBSD.org COMMENT= Root certificate bundle from the Mozilla Project LICENSE= MPL20 OPTIONS_DEFINE= ETCSYMLINK OPTIONS_DEFAULT= ETCSYMLINK OPTIONS_SUB= yes ETCSYMLINK_DESC= Add symlink to /etc/ssl/cert.pem ETCSYMLINK_CONFLICTS_INSTALL= ca-roots-[0-9]* USES= perl5 ssl:build USE_PERL5= build NO_ARCH= yes NO_WRKSUBDIR= yes CERTDIR?= share/certs PLIST_SUB+= CERTDIR=${CERTDIR} # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! # !!! These versions are intended to track security/nss. !!! # !!! Please DO NOT submit patches for new version until it has !!! # !!! been committed there first. !!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -VERSION_NSS= 3.32.1 +VERSION_NSS= 3.34 #NSS_SUFFIX= -with-ckbi-1.98 CERTDATA_TXT_PATH= nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl SUB_FILES= MAca-bundle.pl pkg-message SUB_LIST= VERSION_NSS=${VERSION_NSS} .include do-extract: @${MKDIR} ${WRKDIR} @${TAR} -C ${WRKDIR} -xf ${DISTDIR}/nss-${VERSION_NSS}${NSS_SUFFIX}${EXTRACT_SUFX} \ ${CERTDATA_TXT_PATH} @${CP} ${WRKDIR}/${CERTDATA_TXT_PATH} ${WRKDIR} @${RM} -r ${WRKDIR}/nss-${VERSION_NSS} do-build: apply-slist @${SETENV} PATH=${LOCALBASE}/bin:$${PATH} \ ${PERL} ${WRKDIR}/${BUNDLE_PROCESSOR} \ < ${WRKDIR}/certdata.txt > \ ${WRKDIR}/ca-root-nss.crt do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${CERTDIR} ${INSTALL_DATA} ${WRKDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/${CERTDIR} .if ${PORT_OPTIONS:METCSYMLINK} ${MKDIR} ${STAGEDIR}/etc/ssl ${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}/etc/ssl/cert.pem .endif ${MKDIR} ${STAGEDIR}${PREFIX}/etc/ssl ${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/etc/ssl/cert.pem.sample ${MKDIR} ${STAGEDIR}${PREFIX}/openssl ${LN} -sf ${PREFIX}/${CERTDIR}/ca-root-nss.crt ${STAGEDIR}${PREFIX}/openssl/cert.pem.sample .include Index: branches/2017Q4/security/ca_root_nss/distinfo =================================================================== --- branches/2017Q4/security/ca_root_nss/distinfo (revision 454956) +++ branches/2017Q4/security/ca_root_nss/distinfo (revision 454957) @@ -1,3 +1,3 @@ -TIMESTAMP = 1505146642 -SHA256 (nss-3.32.1.tar.gz) = 4de59ca7f5bf4a56fbcfdbb4a054f254ba9f408f56476957404a091048624652 -SIZE (nss-3.32.1.tar.gz) = 9494609 +TIMESTAMP = 1510646485 +SHA256 (nss-3.34.tar.gz) = 0d45954181373023c7cfc33e77c8c636d394ec7e55b93e059149ed7888652af5 +SIZE (nss-3.34.tar.gz) = 9586315 Index: branches/2017Q4/security/nss/Makefile =================================================================== --- branches/2017Q4/security/nss/Makefile (revision 454956) +++ branches/2017Q4/security/nss/Makefile (revision 454957) @@ -1,108 +1,107 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= nss -PORTVERSION= 3.33 -PORTREVISION= 1 +PORTVERSION= 3.34 #DISTVERSIONSUFFIX= -with-ckbi-1.98 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src MAINTAINER= gecko@FreeBSD.org COMMENT= Libraries to support development of security-enabled applications LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= zip:archivers/zip \ nspr>=4.12:devel/nspr \ sqlite3>=3.7.15:databases/sqlite3 LIB_DEPENDS= libnspr4.so:devel/nspr \ libsqlite3.so:databases/sqlite3 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/nss MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= ${PREFIX}/lib/nss USES= cpe gmake perl5 CPE_VENDOR= mozilla CPE_PRODUCT= network_security_services USE_PERL5= build MAKE_ENV= LIBRARY_PATH="${LOCALBASE}/lib" \ SQLITE_INCLUDE_DIR="${LOCALBASE}/include" \ FREEBL_LOWHASH=1 \ NSS_DISABLE_GTESTS=1 \ NSS_USE_SYSTEM_SQLITE=1 CFLAGS+= -I${LOCALBASE}/include/nspr SUB_FILES= nss-config nss.pc SUB_LIST= PORTVERSION=${PORTVERSION} DIST= ${WRKSRC:H}/dist EXTRACT_AFTER_ARGS=--exclude */lib/zlib --exclude */lib/dbm --exclude */lib/sqlite INSTALL_BINS= certcgi certutil cmsutil crlutil derdump makepqg \ mangle modutil ocspclnt oidcalc p7content p7env p7sign \ p7verify pk12util rsaperf shlibsign signtool signver \ ssltap strsclnt symkeyutil vfychain vfyserv OPTIONS_DEFINE= DEBUG .include .if ! ${PORT_OPTIONS:MDEBUG} MAKE_ENV+= BUILD_OPT=1 BINS= ${DIST}/${OPSYS}${OSREL}_OPT.OBJ .else BINS= ${DIST}/${OPSYS}${OSREL}_DBG.OBJ .endif .if ${OPSYS} == FreeBSD && ${ARCH} == i386 USES+= compiler:c++14-lang # gcm.h .endif .if ${OPSYS} == FreeBSD && ${ARCH} == amd64 USE_BINUTILS= # intel-gcm.s CC+= -B${LOCALBASE}/bin .endif check regression-test test: cd ${WRKSRC}/tests; \ ${SETENV} PATH="${BINS}/bin:${PATH}" \ LD_LIBRARY_PATH="${BINS}/lib" \ ${MAKE_ENV} \ ./all.sh @if ${GREP} -Fh '>Failed<' \ ${WRKSRC:H}/tests_results/security/*/results.html; then \ echo "Some tests have failed. Let ${MAINTAINER} know."; \ exit 1; \ else \ echo "All tests succeeded. Good news."; \ fi post-patch: @${REINPLACE_CMD} '/NSS_DEFAULT_SYSTEM/s,/etc,${PREFIX}&,' \ ${WRKSRC}/lib/sysinit/nsssysinit.c @cd ${WRKSRC} && \ ${FIND} . -name "*.c" -o -name "*.h" | \ ${XARGS} ${REINPLACE_CMD} -e 's|"nspr.h"||' ${FIND} ${WRKSRC}/tests -name '*.sh' | ${XARGS} ${GREP} -l -F '/bin/bash' | \ ${XARGS} ${REINPLACE_CMD} -e 's|#! */bin/bash|#!${SH}|' do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/nss/nss ${STAGEDIR}${PREFIX}/lib/nss ${FIND} ${DIST}/public/nss -type l \ -exec ${INSTALL_DATA} {} ${STAGEDIR}${PREFIX}/include/nss/nss \; ${INSTALL_LIB} ${BINS}/lib/*.so \ ${STAGEDIR}${PREFIX}/lib/nss ${INSTALL_DATA} ${BINS}/lib/libcrmf.a \ ${STAGEDIR}${PREFIX}/lib/nss .for bin in ${INSTALL_BINS} ${INSTALL_PROGRAM} ${BINS}/bin/${bin} \ ${STAGEDIR}${PREFIX}/bin .endfor ${INSTALL_SCRIPT} ${WRKDIR}/nss-config ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKDIR}/nss.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig .include Index: branches/2017Q4/security/nss/distinfo =================================================================== --- branches/2017Q4/security/nss/distinfo (revision 454956) +++ branches/2017Q4/security/nss/distinfo (revision 454957) @@ -1,3 +1,3 @@ -TIMESTAMP = 1505890047 -SHA256 (nss-3.33.tar.gz) = 98f0dabd36408e83dd3a11727336cc3cdfee4cbdd9aede2b2831eb2389c284e4 -SIZE (nss-3.33.tar.gz) = 9578033 +TIMESTAMP = 1510646485 +SHA256 (nss-3.34.tar.gz) = 0d45954181373023c7cfc33e77c8c636d394ec7e55b93e059149ed7888652af5 +SIZE (nss-3.34.tar.gz) = 9586315 Index: branches/2017Q4/security/nss/files/patch-bug1400603 =================================================================== --- branches/2017Q4/security/nss/files/patch-bug1400603 (revision 454956) +++ branches/2017Q4/security/nss/files/patch-bug1400603 (nonexistent) @@ -1,942 +0,0 @@ -commit e84403331d99 -Author: Daiki Ueno -Date: Fri Sep 22 11:27:34 2017 +0200 - - Bug 1400603 - freebl: Reorganize AES-GCM source code based on hw/sw implementation, r=franziskus - - Reviewers: franziskus - - Reviewed By: franziskus - - Bug #: 1400603 - - Differential Revision: https://phabricator.services.mozilla.com/D65 ---- - lib/freebl/Makefile | 4 +- - lib/freebl/aes-x86.c | 157 +++++++++++++++++++++++++++++++++++++++++ - lib/freebl/freebl.gyp | 65 ++++++++++------- - lib/freebl/gcm-x86.c | 127 ++++++++++++++++++++++++++++++++++ - lib/freebl/gcm.c | 162 +++++++++++++------------------------------ - lib/freebl/gcm.h | 14 ++++ - lib/freebl/rijndael.c | 188 ++++++++------------------------------------------ - lib/freebl/rijndael.h | 18 ++++- - 8 files changed, 436 insertions(+), 299 deletions(-) - -diff --git lib/freebl/Makefile lib/freebl/Makefile -index d50e18696b..bc1ea86a5e 100644 ---- lib/freebl/Makefile -+++ lib/freebl/Makefile -@@ -110,7 +110,9 @@ endif - # NSS_X86_OR_X64 means the target is either x86 or x64 - ifeq (,$(filter-out i386 x386 x86 x86_64,$(CPU_ARCH))) - DEFINES += -DNSS_X86_OR_X64 -- CFLAGS += -mpclmul -maes -+ EXTRA_SRCS += gcm-x86.c aes-x86.c -+$(OBJDIR)/gcm-x86.o: CFLAGS += -mpclmul -maes -+$(OBJDIR)/aes-x86.o: CFLAGS += -mpclmul -maes - ifneq (,$(USE_64)$(USE_X32)) - DEFINES += -DNSS_X64 - else -diff --git lib/freebl/aes-x86.c lib/freebl/aes-x86.c -new file mode 100644 -index 0000000000..830b4782fe ---- /dev/null -+++ lib/freebl/aes-x86.c -@@ -0,0 +1,157 @@ -+/* 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 -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#ifdef FREEBL_NO_DEPEND -+#include "stubs.h" -+#endif -+#include "rijndael.h" -+#include "secerr.h" -+ -+#include /* aes-ni */ -+ -+#define EXPAND_KEY128(k, rcon, res) \ -+ tmp_key = _mm_aeskeygenassist_si128(k, rcon); \ -+ tmp_key = _mm_shuffle_epi32(tmp_key, 0xFF); \ -+ tmp = _mm_xor_si128(k, _mm_slli_si128(k, 4)); \ -+ tmp = _mm_xor_si128(tmp, _mm_slli_si128(tmp, 4)); \ -+ tmp = _mm_xor_si128(tmp, _mm_slli_si128(tmp, 4)); \ -+ res = _mm_xor_si128(tmp, tmp_key) -+ -+static void -+native_key_expansion128(AESContext *cx, const unsigned char *key) -+{ -+ __m128i *keySchedule = cx->keySchedule; -+ pre_align __m128i tmp_key post_align; -+ pre_align __m128i tmp post_align; -+ keySchedule[0] = _mm_loadu_si128((__m128i *)key); -+ EXPAND_KEY128(keySchedule[0], 0x01, keySchedule[1]); -+ EXPAND_KEY128(keySchedule[1], 0x02, keySchedule[2]); -+ EXPAND_KEY128(keySchedule[2], 0x04, keySchedule[3]); -+ EXPAND_KEY128(keySchedule[3], 0x08, keySchedule[4]); -+ EXPAND_KEY128(keySchedule[4], 0x10, keySchedule[5]); -+ EXPAND_KEY128(keySchedule[5], 0x20, keySchedule[6]); -+ EXPAND_KEY128(keySchedule[6], 0x40, keySchedule[7]); -+ EXPAND_KEY128(keySchedule[7], 0x80, keySchedule[8]); -+ EXPAND_KEY128(keySchedule[8], 0x1B, keySchedule[9]); -+ EXPAND_KEY128(keySchedule[9], 0x36, keySchedule[10]); -+} -+ -+#define EXPAND_KEY192_PART1(res, k0, kt, rcon) \ -+ tmp2 = _mm_slli_si128(k0, 4); \ -+ tmp1 = _mm_xor_si128(k0, tmp2); \ -+ tmp2 = _mm_slli_si128(tmp2, 4); \ -+ tmp1 = _mm_xor_si128(_mm_xor_si128(tmp1, tmp2), _mm_slli_si128(tmp2, 4)); \ -+ tmp2 = _mm_aeskeygenassist_si128(kt, rcon); \ -+ res = _mm_xor_si128(tmp1, _mm_shuffle_epi32(tmp2, 0x55)) -+ -+#define EXPAND_KEY192_PART2(res, k1, k2) \ -+ tmp2 = _mm_xor_si128(k1, _mm_slli_si128(k1, 4)); \ -+ res = _mm_xor_si128(tmp2, _mm_shuffle_epi32(k2, 0xFF)) -+ -+#define EXPAND_KEY192(k0, res1, res2, res3, carry, rcon1, rcon2) \ -+ EXPAND_KEY192_PART1(tmp3, k0, res1, rcon1); \ -+ EXPAND_KEY192_PART2(carry, res1, tmp3); \ -+ res1 = _mm_castpd_si128(_mm_shuffle_pd(_mm_castsi128_pd(res1), \ -+ _mm_castsi128_pd(tmp3), 0)); \ -+ res2 = _mm_castpd_si128(_mm_shuffle_pd(_mm_castsi128_pd(tmp3), \ -+ _mm_castsi128_pd(carry), 1)); \ -+ EXPAND_KEY192_PART1(res3, tmp3, carry, rcon2) -+ -+static void -+native_key_expansion192(AESContext *cx, const unsigned char *key) -+{ -+ __m128i *keySchedule = cx->keySchedule; -+ pre_align __m128i tmp1 post_align; -+ pre_align __m128i tmp2 post_align; -+ pre_align __m128i tmp3 post_align; -+ pre_align __m128i carry post_align; -+ keySchedule[0] = _mm_loadu_si128((__m128i *)key); -+ keySchedule[1] = _mm_loadu_si128((__m128i *)(key + 16)); -+ EXPAND_KEY192(keySchedule[0], keySchedule[1], keySchedule[2], -+ keySchedule[3], carry, 0x1, 0x2); -+ EXPAND_KEY192_PART2(keySchedule[4], carry, keySchedule[3]); -+ EXPAND_KEY192(keySchedule[3], keySchedule[4], keySchedule[5], -+ keySchedule[6], carry, 0x4, 0x8); -+ EXPAND_KEY192_PART2(keySchedule[7], carry, keySchedule[6]); -+ EXPAND_KEY192(keySchedule[6], keySchedule[7], keySchedule[8], -+ keySchedule[9], carry, 0x10, 0x20); -+ EXPAND_KEY192_PART2(keySchedule[10], carry, keySchedule[9]); -+ EXPAND_KEY192(keySchedule[9], keySchedule[10], keySchedule[11], -+ keySchedule[12], carry, 0x40, 0x80); -+} -+ -+#define EXPAND_KEY256_PART(res, rconx, k1x, k2x, X) \ -+ tmp_key = _mm_shuffle_epi32(_mm_aeskeygenassist_si128(k2x, rconx), X); \ -+ tmp2 = _mm_slli_si128(k1x, 4); \ -+ tmp1 = _mm_xor_si128(k1x, tmp2); \ -+ tmp2 = _mm_slli_si128(tmp2, 4); \ -+ tmp1 = _mm_xor_si128(_mm_xor_si128(tmp1, tmp2), _mm_slli_si128(tmp2, 4)); \ -+ res = _mm_xor_si128(tmp1, tmp_key); -+ -+#define EXPAND_KEY256(res1, res2, k1, k2, rcon) \ -+ EXPAND_KEY256_PART(res1, rcon, k1, k2, 0xFF); \ -+ EXPAND_KEY256_PART(res2, 0x00, k2, res1, 0xAA) -+ -+static void -+native_key_expansion256(AESContext *cx, const unsigned char *key) -+{ -+ __m128i *keySchedule = cx->keySchedule; -+ pre_align __m128i tmp_key post_align; -+ pre_align __m128i tmp1 post_align; -+ pre_align __m128i tmp2 post_align; -+ keySchedule[0] = _mm_loadu_si128((__m128i *)key); -+ keySchedule[1] = _mm_loadu_si128((__m128i *)(key + 16)); -+ EXPAND_KEY256(keySchedule[2], keySchedule[3], keySchedule[0], -+ keySchedule[1], 0x01); -+ EXPAND_KEY256(keySchedule[4], keySchedule[5], keySchedule[2], -+ keySchedule[3], 0x02); -+ EXPAND_KEY256(keySchedule[6], keySchedule[7], keySchedule[4], -+ keySchedule[5], 0x04); -+ EXPAND_KEY256(keySchedule[8], keySchedule[9], keySchedule[6], -+ keySchedule[7], 0x08); -+ EXPAND_KEY256(keySchedule[10], keySchedule[11], keySchedule[8], -+ keySchedule[9], 0x10); -+ EXPAND_KEY256(keySchedule[12], keySchedule[13], keySchedule[10], -+ keySchedule[11], 0x20); -+ EXPAND_KEY256_PART(keySchedule[14], 0x40, keySchedule[12], -+ keySchedule[13], 0xFF); -+} -+ -+/* -+ * AES key expansion using aes-ni instructions. -+ */ -+void -+rijndael_native_key_expansion(AESContext *cx, const unsigned char *key, -+ unsigned int Nk) -+{ -+ switch (Nk) { -+ case 4: -+ native_key_expansion128(cx, key); -+ return; -+ case 6: -+ native_key_expansion192(cx, key); -+ return; -+ case 8: -+ native_key_expansion256(cx, key); -+ return; -+ default: -+ /* This shouldn't happen (checked by the caller). */ -+ return; -+ } -+} -+ -+void -+rijndael_native_encryptBlock(AESContext *cx, -+ unsigned char *output, -+ const unsigned char *input) -+{ -+ int i; -+ pre_align __m128i m post_align = _mm_loadu_si128((__m128i *)input); -+ m = _mm_xor_si128(m, cx->keySchedule[0]); -+ for (i = 1; i < cx->Nr; ++i) { -+ m = _mm_aesenc_si128(m, cx->keySchedule[i]); -+ } -+ m = _mm_aesenclast_si128(m, cx->keySchedule[cx->Nr]); -+ _mm_storeu_si128((__m128i *)output, m); -+} -diff --git lib/freebl/freebl.gyp lib/freebl/freebl.gyp -index 1e93475004..5f59eef29c 100644 ---- lib/freebl/freebl.gyp -+++ lib/freebl/freebl.gyp -@@ -22,6 +22,37 @@ - '-mssse3' - ] - }, -+ { -+ 'target_name': 'gcm-aes-x86_c_lib', -+ 'type': 'static_library', -+ 'sources': [ -+ 'gcm-x86.c', 'aes-x86.c' -+ ], -+ 'dependencies': [ -+ '<(DEPTH)/exports.gyp:nss_exports' -+ ], -+ # Enable isa option for pclmul and aes-ni; supported since gcc 4.4. -+ # This is only supported by x84/x64. It's not needed for Windows, -+ # unless clang-cl is used. -+ 'cflags_mozilla': [ -+ '-mpclmul', '-maes' -+ ], -+ 'conditions': [ -+ [ 'OS=="linux" or OS=="android" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', { -+ 'cflags': [ -+ '-mpclmul', '-maes' -+ ], -+ }], -+ # macOS build doesn't use cflags. -+ [ 'OS=="mac"', { -+ 'xcode_settings': { -+ 'OTHER_CFLAGS': [ -+ '-mpclmul', '-maes' -+ ], -+ }, -+ }] -+ ] -+ }, - { - 'target_name': 'freebl', - 'type': 'static_library', -@@ -45,6 +76,11 @@ - '<(DEPTH)/exports.gyp:nss_exports', - ], - 'conditions': [ -+ [ 'target_arch=="ia32" or target_arch=="x64"', { -+ 'dependencies': [ -+ 'gcm-aes-x86_c_lib' -+ ], -+ }], - [ 'OS=="linux"', { - 'defines!': [ - 'FREEBL_NO_DEPEND', -@@ -76,6 +112,11 @@ - '<(DEPTH)/exports.gyp:nss_exports', - ], - 'conditions': [ -+ [ 'target_arch=="ia32" or target_arch=="x64"', { -+ 'dependencies': [ -+ 'gcm-aes-x86_c_lib' -+ ] -+ }], - [ 'OS!="linux" and OS!="android"', { - 'conditions': [ - [ 'moz_fold_libs==0', { -@@ -154,27 +195,11 @@ - 'MP_API_COMPATIBLE' - ], - 'conditions': [ -- [ 'target_arch=="ia32" or target_arch=="x64"', { -- 'cflags_mozilla': [ -- '-mpclmul', -- '-maes', -- ], -- 'conditions': [ -- [ 'OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', { -- 'cflags': [ -- '-mpclmul', -- '-maes', -- ], -- }], -- ], -- }], - [ 'OS=="mac"', { - 'xcode_settings': { - # I'm not sure since when this is supported. - # But I hope that doesn't matter. We also assume this is x86/x64. - 'OTHER_CFLAGS': [ -- '-mpclmul', -- '-maes', - '-std=gnu99', - ], - }, -@@ -268,14 +293,6 @@ - 'MP_USE_UINT_DIGIT', - ], - }], -- [ 'target_arch=="ia32" or target_arch=="x64"', { -- 'cflags': [ -- # enable isa option for pclmul am aes-ni; supported since gcc 4.4 -- # This is only support by x84/x64. It's not needed for Windows. -- '-mpclmul', -- '-maes', -- ], -- }], - [ 'target_arch=="arm"', { - 'defines': [ - 'MP_ASSEMBLY_MULTIPLY', -diff --git lib/freebl/gcm-x86.c lib/freebl/gcm-x86.c -new file mode 100644 -index 0000000000..e34d633943 ---- /dev/null -+++ lib/freebl/gcm-x86.c -@@ -0,0 +1,127 @@ -+/* 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 -+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -+ -+#ifdef FREEBL_NO_DEPEND -+#include "stubs.h" -+#endif -+#include "gcm.h" -+#include "secerr.h" -+ -+#include /* clmul */ -+ -+#define WRITE64(x, bytes) \ -+ (bytes)[0] = (x) >> 56; \ -+ (bytes)[1] = (x) >> 48; \ -+ (bytes)[2] = (x) >> 40; \ -+ (bytes)[3] = (x) >> 32; \ -+ (bytes)[4] = (x) >> 24; \ -+ (bytes)[5] = (x) >> 16; \ -+ (bytes)[6] = (x) >> 8; \ -+ (bytes)[7] = (x); -+ -+SECStatus -+gcm_HashWrite_hw(gcmHashContext *ghash, unsigned char *outbuf) -+{ -+ uint64_t tmp_out[2]; -+ _mm_storeu_si128((__m128i *)tmp_out, ghash->x); -+ /* maxout must be larger than 16 byte (checked by the caller). */ -+ WRITE64(tmp_out[0], outbuf + 8); -+ WRITE64(tmp_out[1], outbuf); -+ return SECSuccess; -+} -+ -+SECStatus -+gcm_HashMult_hw(gcmHashContext *ghash, const unsigned char *buf, -+ unsigned int count) -+{ -+ size_t i; -+ pre_align __m128i z_high post_align; -+ pre_align __m128i z_low post_align; -+ pre_align __m128i C post_align; -+ pre_align __m128i D post_align; -+ pre_align __m128i E post_align; -+ pre_align __m128i F post_align; -+ pre_align __m128i bin post_align; -+ pre_align __m128i Ci post_align; -+ pre_align __m128i tmp post_align; -+ -+ for (i = 0; i < count; i++, buf += 16) { -+ bin = _mm_set_epi16(((uint16_t)buf[0] << 8) | buf[1], -+ ((uint16_t)buf[2] << 8) | buf[3], -+ ((uint16_t)buf[4] << 8) | buf[5], -+ ((uint16_t)buf[6] << 8) | buf[7], -+ ((uint16_t)buf[8] << 8) | buf[9], -+ ((uint16_t)buf[10] << 8) | buf[11], -+ ((uint16_t)buf[12] << 8) | buf[13], -+ ((uint16_t)buf[14] << 8) | buf[15]); -+ Ci = _mm_xor_si128(bin, ghash->x); -+ -+ /* Do binary mult ghash->X = Ci * ghash->H. */ -+ C = _mm_clmulepi64_si128(Ci, ghash->h, 0x00); -+ D = _mm_clmulepi64_si128(Ci, ghash->h, 0x11); -+ E = _mm_clmulepi64_si128(Ci, ghash->h, 0x01); -+ F = _mm_clmulepi64_si128(Ci, ghash->h, 0x10); -+ tmp = _mm_xor_si128(E, F); -+ z_high = _mm_xor_si128(tmp, _mm_slli_si128(D, 8)); -+ z_high = _mm_unpackhi_epi64(z_high, D); -+ z_low = _mm_xor_si128(_mm_slli_si128(tmp, 8), C); -+ z_low = _mm_unpackhi_epi64(_mm_slli_si128(C, 8), z_low); -+ -+ /* Shift one to the left (multiply by x) as gcm spec is stupid. */ -+ C = _mm_slli_si128(z_low, 8); -+ E = _mm_srli_epi64(C, 63); -+ D = _mm_slli_si128(z_high, 8); -+ F = _mm_srli_epi64(D, 63); -+ /* Carry over */ -+ C = _mm_srli_si128(z_low, 8); -+ D = _mm_srli_epi64(C, 63); -+ z_low = _mm_or_si128(_mm_slli_epi64(z_low, 1), E); -+ z_high = _mm_or_si128(_mm_or_si128(_mm_slli_epi64(z_high, 1), F), D); -+ -+ /* Reduce */ -+ C = _mm_slli_si128(z_low, 8); -+ /* D = z_low << 127 */ -+ D = _mm_slli_epi64(C, 63); -+ /* E = z_low << 126 */ -+ E = _mm_slli_epi64(C, 62); -+ /* F = z_low << 121 */ -+ F = _mm_slli_epi64(C, 57); -+ /* z_low ^= (z_low << 127) ^ (z_low << 126) ^ (z_low << 121); */ -+ z_low = _mm_xor_si128(_mm_xor_si128(_mm_xor_si128(z_low, D), E), F); -+ C = _mm_srli_si128(z_low, 8); -+ /* D = z_low >> 1 */ -+ D = _mm_slli_epi64(C, 63); -+ D = _mm_or_si128(_mm_srli_epi64(z_low, 1), D); -+ /* E = z_low >> 2 */ -+ E = _mm_slli_epi64(C, 62); -+ E = _mm_or_si128(_mm_srli_epi64(z_low, 2), E); -+ /* F = z_low >> 7 */ -+ F = _mm_slli_epi64(C, 57); -+ F = _mm_or_si128(_mm_srli_epi64(z_low, 7), F); -+ /* ghash->x ^= z_low ^ (z_low >> 1) ^ (z_low >> 2) ^ (z_low >> 7); */ -+ ghash->x = _mm_xor_si128(_mm_xor_si128( -+ _mm_xor_si128(_mm_xor_si128(z_high, z_low), D), E), -+ F); -+ } -+ return SECSuccess; -+} -+ -+SECStatus -+gcm_HashInit_hw(gcmHashContext *ghash) -+{ -+ ghash->ghash_mul = gcm_HashMult_hw; -+ ghash->x = _mm_setzero_si128(); -+ /* MSVC requires __m64 to load epi64. */ -+ ghash->h = _mm_set_epi32(ghash->h_high >> 32, (uint32_t)ghash->h_high, -+ ghash->h_low >> 32, (uint32_t)ghash->h_low); -+ ghash->hw = PR_TRUE; -+ return SECSuccess; -+} -+ -+SECStatus -+gcm_HashZeroX_hw(gcmHashContext *ghash) -+{ -+ ghash->x = _mm_setzero_si128(); -+ return SECSuccess; -+} -diff --git lib/freebl/gcm.c lib/freebl/gcm.c -index 780b7a6322..f1e16da78e 100644 ---- lib/freebl/gcm.c -+++ lib/freebl/gcm.c -@@ -17,18 +17,50 @@ - - #include - --#ifdef NSS_X86_OR_X64 --#include /* clmul */ --#endif -- - /* Forward declarations */ -+SECStatus gcm_HashInit_hw(gcmHashContext *ghash); -+SECStatus gcm_HashWrite_hw(gcmHashContext *ghash, unsigned char *outbuf); - SECStatus gcm_HashMult_hw(gcmHashContext *ghash, const unsigned char *buf, - unsigned int count); -+SECStatus gcm_HashZeroX_hw(gcmHashContext *ghash); - SECStatus gcm_HashMult_sftw(gcmHashContext *ghash, const unsigned char *buf, - unsigned int count); - SECStatus gcm_HashMult_sftw32(gcmHashContext *ghash, const unsigned char *buf, - unsigned int count); - -+/* Stub definitions for the above *_hw functions, which shouldn't be -+ * used unless NSS_X86_OR_X64 is defined */ -+#ifndef NSS_X86_OR_X64 -+SECStatus -+gcm_HashWrite_hw(gcmHashContext *ghash, unsigned char *outbuf) -+{ -+ PORT_SetError(SEC_ERROR_LIBRARY_FAILURE); -+ return SECFailure; -+} -+ -+SECStatus -+gcm_HashMult_hw(gcmHashContext *ghash, const unsigned char *buf, -+ unsigned int count) -+{ -+ PORT_SetError(SEC_ERROR_LIBRARY_FAILURE); -+ return SECFailure; -+} -+ -+SECStatus -+gcm_HashInit_hw(gcmHashContext *ghash) -+{ -+ PORT_SetError(SEC_ERROR_LIBRARY_FAILURE); -+ return SECFailure; -+} -+ -+SECStatus -+gcm_HashZeroX_hw(gcmHashContext *ghash) -+{ -+ PORT_SetError(SEC_ERROR_LIBRARY_FAILURE); -+ return SECFailure; -+} -+#endif /* NSS_X86_OR_X64 */ -+ - uint64_t - get64(const unsigned char *bytes) - { -@@ -46,6 +78,8 @@ get64(const unsigned char *bytes) - SECStatus - gcmHash_InitContext(gcmHashContext *ghash, const unsigned char *H, PRBool sw) - { -+ SECStatus rv = SECSuccess; -+ - ghash->cLen = 0; - ghash->bufLen = 0; - PORT_Memset(ghash->counterBuf, 0, sizeof(ghash->counterBuf)); -@@ -53,17 +87,7 @@ gcmHash_InitContext(gcmHashContext *ghash, const unsigned char *H, PRBool sw) - ghash->h_low = get64(H + 8); - ghash->h_high = get64(H); - if (clmul_support() && !sw) { --#ifdef NSS_X86_OR_X64 -- ghash->ghash_mul = gcm_HashMult_hw; -- ghash->x = _mm_setzero_si128(); -- /* MSVC requires __m64 to load epi64. */ -- ghash->h = _mm_set_epi32(ghash->h_high >> 32, (uint32_t)ghash->h_high, -- ghash->h_low >> 32, (uint32_t)ghash->h_low); -- ghash->hw = PR_TRUE; --#else -- PORT_SetError(SEC_ERROR_LIBRARY_FAILURE); -- return SECFailure; --#endif /* NSS_X86_OR_X64 */ -+ rv = gcm_HashInit_hw(ghash); - } else { - /* We fall back to the software implementation if we can't use / don't - * want to use pclmul. */ -@@ -75,7 +99,7 @@ gcmHash_InitContext(gcmHashContext *ghash, const unsigned char *H, PRBool sw) - ghash->x_high = ghash->x_low = 0; - ghash->hw = PR_FALSE; - } -- return SECSuccess; -+ return rv; - } - - #ifdef HAVE_INT128_SUPPORT -@@ -283,102 +307,17 @@ gcm_HashMult_sftw32(gcmHashContext *ghash, const unsigned char *buf, - } - #endif /* HAVE_INT128_SUPPORT */ - --SECStatus --gcm_HashMult_hw(gcmHashContext *ghash, const unsigned char *buf, -- unsigned int count) --{ --#ifdef NSS_X86_OR_X64 -- size_t i; -- pre_align __m128i z_high post_align; -- pre_align __m128i z_low post_align; -- pre_align __m128i C post_align; -- pre_align __m128i D post_align; -- pre_align __m128i E post_align; -- pre_align __m128i F post_align; -- pre_align __m128i bin post_align; -- pre_align __m128i Ci post_align; -- pre_align __m128i tmp post_align; -- -- for (i = 0; i < count; i++, buf += 16) { -- bin = _mm_set_epi16(((uint16_t)buf[0] << 8) | buf[1], -- ((uint16_t)buf[2] << 8) | buf[3], -- ((uint16_t)buf[4] << 8) | buf[5], -- ((uint16_t)buf[6] << 8) | buf[7], -- ((uint16_t)buf[8] << 8) | buf[9], -- ((uint16_t)buf[10] << 8) | buf[11], -- ((uint16_t)buf[12] << 8) | buf[13], -- ((uint16_t)buf[14] << 8) | buf[15]); -- Ci = _mm_xor_si128(bin, ghash->x); -- -- /* Do binary mult ghash->X = Ci * ghash->H. */ -- C = _mm_clmulepi64_si128(Ci, ghash->h, 0x00); -- D = _mm_clmulepi64_si128(Ci, ghash->h, 0x11); -- E = _mm_clmulepi64_si128(Ci, ghash->h, 0x01); -- F = _mm_clmulepi64_si128(Ci, ghash->h, 0x10); -- tmp = _mm_xor_si128(E, F); -- z_high = _mm_xor_si128(tmp, _mm_slli_si128(D, 8)); -- z_high = _mm_unpackhi_epi64(z_high, D); -- z_low = _mm_xor_si128(_mm_slli_si128(tmp, 8), C); -- z_low = _mm_unpackhi_epi64(_mm_slli_si128(C, 8), z_low); -- -- /* Shift one to the left (multiply by x) as gcm spec is stupid. */ -- C = _mm_slli_si128(z_low, 8); -- E = _mm_srli_epi64(C, 63); -- D = _mm_slli_si128(z_high, 8); -- F = _mm_srli_epi64(D, 63); -- /* Carry over */ -- C = _mm_srli_si128(z_low, 8); -- D = _mm_srli_epi64(C, 63); -- z_low = _mm_or_si128(_mm_slli_epi64(z_low, 1), E); -- z_high = _mm_or_si128(_mm_or_si128(_mm_slli_epi64(z_high, 1), F), D); -- -- /* Reduce */ -- C = _mm_slli_si128(z_low, 8); -- /* D = z_low << 127 */ -- D = _mm_slli_epi64(C, 63); -- /* E = z_low << 126 */ -- E = _mm_slli_epi64(C, 62); -- /* F = z_low << 121 */ -- F = _mm_slli_epi64(C, 57); -- /* z_low ^= (z_low << 127) ^ (z_low << 126) ^ (z_low << 121); */ -- z_low = _mm_xor_si128(_mm_xor_si128(_mm_xor_si128(z_low, D), E), F); -- C = _mm_srli_si128(z_low, 8); -- /* D = z_low >> 1 */ -- D = _mm_slli_epi64(C, 63); -- D = _mm_or_si128(_mm_srli_epi64(z_low, 1), D); -- /* E = z_low >> 2 */ -- E = _mm_slli_epi64(C, 62); -- E = _mm_or_si128(_mm_srli_epi64(z_low, 2), E); -- /* F = z_low >> 7 */ -- F = _mm_slli_epi64(C, 57); -- F = _mm_or_si128(_mm_srli_epi64(z_low, 7), F); -- /* ghash->x ^= z_low ^ (z_low >> 1) ^ (z_low >> 2) ^ (z_low >> 7); */ -- ghash->x = _mm_xor_si128(_mm_xor_si128( -- _mm_xor_si128(_mm_xor_si128(z_high, z_low), D), E), -- F); -- } -- return SECSuccess; --#else -- PORT_SetError(SEC_ERROR_LIBRARY_FAILURE); -- return SECFailure; --#endif /* NSS_X86_OR_X64 */ --} -- - static SECStatus - gcm_zeroX(gcmHashContext *ghash) - { -+ SECStatus rv = SECSuccess; -+ - if (ghash->hw) { --#ifdef NSS_X86_OR_X64 -- ghash->x = _mm_setzero_si128(); -- return SECSuccess; --#else -- PORT_SetError(SEC_ERROR_LIBRARY_FAILURE); -- return SECFailure; --#endif /* NSS_X86_OR_X64 */ -+ rv = gcm_HashZeroX_hw(ghash); - } - - ghash->x_high = ghash->x_low = 0; -- return SECSuccess; -+ return rv; - } - - /* -@@ -503,15 +442,10 @@ gcmHash_Final(gcmHashContext *ghash, unsigned char *outbuf, - } - - if (ghash->hw) { --#ifdef NSS_X86_OR_X64 -- uint64_t tmp_out[2]; -- _mm_storeu_si128((__m128i *)tmp_out, ghash->x); -- WRITE64(tmp_out[0], T + 8); -- WRITE64(tmp_out[1], T); --#else -- PORT_SetError(SEC_ERROR_LIBRARY_FAILURE); -- return SECFailure; --#endif /* NSS_X86_OR_X64 */ -+ rv = gcm_HashWrite_hw(ghash, T); -+ if (rv != SECSuccess) { -+ goto cleanup; -+ } - } else { - WRITE64(ghash->x_low, T + 8); - WRITE64(ghash->x_high, T); -diff --git lib/freebl/gcm.h lib/freebl/gcm.h -index 0c707a0811..42ef0f7179 100644 ---- lib/freebl/gcm.h -+++ lib/freebl/gcm.h -@@ -9,7 +9,21 @@ - #include - - #ifdef NSS_X86_OR_X64 -+/* GCC <= 4.8 doesn't support including emmintrin.h without enabling SSE2 */ -+#if !defined(__clang__) && defined(__GNUC__) && defined(__GNUC_MINOR__) && \ -+ (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 8)) -+#pragma GCC push_options -+#pragma GCC target("sse2") -+#undef NSS_DISABLE_SSE2 -+#define NSS_DISABLE_SSE2 1 -+#endif /* GCC <= 4.8 */ -+ - #include /* __m128i */ -+ -+#ifdef NSS_DISABLE_SSE2 -+#undef NSS_DISABLE_SSE2 -+#pragma GCC pop_options -+#endif /* NSS_DISABLE_SSE2 */ - #endif - - SEC_BEGIN_PROTOS -diff --git lib/freebl/rijndael.c lib/freebl/rijndael.c -index a09f13098e..5de27de9ce 100644 ---- lib/freebl/rijndael.c -+++ lib/freebl/rijndael.c -@@ -27,6 +27,34 @@ - #include "intel-gcm.h" - #endif /* INTEL_GCM */ - -+/* Forward declarations */ -+void rijndael_native_key_expansion(AESContext *cx, const unsigned char *key, -+ unsigned int Nk); -+void rijndael_native_encryptBlock(AESContext *cx, -+ unsigned char *output, -+ const unsigned char *input); -+ -+/* Stub definitions for the above rijndael_native_* functions, which -+ * shouldn't be used unless NSS_X86_OR_X64 is defined */ -+#ifndef NSS_X86_OR_X64 -+void -+rijndael_native_key_expansion(AESContext *cx, const unsigned char *key, -+ unsigned int Nk) -+{ -+ PORT_SetError(SEC_ERROR_LIBRARY_FAILURE); -+ PORT_Assert(0); -+} -+ -+void -+rijndael_native_encryptBlock(AESContext *cx, -+ unsigned char *output, -+ const unsigned char *input) -+{ -+ PORT_SetError(SEC_ERROR_LIBRARY_FAILURE); -+ PORT_Assert(0); -+} -+#endif /* NSS_X86_OR_X64 */ -+ - /* - * There are currently three ways to build this code, varying in performance - * and code size. -@@ -309,162 +337,6 @@ rijndael_key_expansion7(AESContext *cx, const unsigned char *key, unsigned int N - } - } - --#if defined(NSS_X86_OR_X64) --#define EXPAND_KEY128(k, rcon, res) \ -- tmp_key = _mm_aeskeygenassist_si128(k, rcon); \ -- tmp_key = _mm_shuffle_epi32(tmp_key, 0xFF); \ -- tmp = _mm_xor_si128(k, _mm_slli_si128(k, 4)); \ -- tmp = _mm_xor_si128(tmp, _mm_slli_si128(tmp, 4)); \ -- tmp = _mm_xor_si128(tmp, _mm_slli_si128(tmp, 4)); \ -- res = _mm_xor_si128(tmp, tmp_key) -- --static void --native_key_expansion128(AESContext *cx, const unsigned char *key) --{ -- __m128i *keySchedule = cx->keySchedule; -- pre_align __m128i tmp_key post_align; -- pre_align __m128i tmp post_align; -- keySchedule[0] = _mm_loadu_si128((__m128i *)key); -- EXPAND_KEY128(keySchedule[0], 0x01, keySchedule[1]); -- EXPAND_KEY128(keySchedule[1], 0x02, keySchedule[2]); -- EXPAND_KEY128(keySchedule[2], 0x04, keySchedule[3]); -- EXPAND_KEY128(keySchedule[3], 0x08, keySchedule[4]); -- EXPAND_KEY128(keySchedule[4], 0x10, keySchedule[5]); -- EXPAND_KEY128(keySchedule[5], 0x20, keySchedule[6]); -- EXPAND_KEY128(keySchedule[6], 0x40, keySchedule[7]); -- EXPAND_KEY128(keySchedule[7], 0x80, keySchedule[8]); -- EXPAND_KEY128(keySchedule[8], 0x1B, keySchedule[9]); -- EXPAND_KEY128(keySchedule[9], 0x36, keySchedule[10]); --} -- --#define EXPAND_KEY192_PART1(res, k0, kt, rcon) \ -- tmp2 = _mm_slli_si128(k0, 4); \ -- tmp1 = _mm_xor_si128(k0, tmp2); \ -- tmp2 = _mm_slli_si128(tmp2, 4); \ -- tmp1 = _mm_xor_si128(_mm_xor_si128(tmp1, tmp2), _mm_slli_si128(tmp2, 4)); \ -- tmp2 = _mm_aeskeygenassist_si128(kt, rcon); \ -- res = _mm_xor_si128(tmp1, _mm_shuffle_epi32(tmp2, 0x55)) -- --#define EXPAND_KEY192_PART2(res, k1, k2) \ -- tmp2 = _mm_xor_si128(k1, _mm_slli_si128(k1, 4)); \ -- res = _mm_xor_si128(tmp2, _mm_shuffle_epi32(k2, 0xFF)) -- --#define EXPAND_KEY192(k0, res1, res2, res3, carry, rcon1, rcon2) \ -- EXPAND_KEY192_PART1(tmp3, k0, res1, rcon1); \ -- EXPAND_KEY192_PART2(carry, res1, tmp3); \ -- res1 = _mm_castpd_si128(_mm_shuffle_pd(_mm_castsi128_pd(res1), \ -- _mm_castsi128_pd(tmp3), 0)); \ -- res2 = _mm_castpd_si128(_mm_shuffle_pd(_mm_castsi128_pd(tmp3), \ -- _mm_castsi128_pd(carry), 1)); \ -- EXPAND_KEY192_PART1(res3, tmp3, carry, rcon2) -- --static void --native_key_expansion192(AESContext *cx, const unsigned char *key) --{ -- __m128i *keySchedule = cx->keySchedule; -- pre_align __m128i tmp1 post_align; -- pre_align __m128i tmp2 post_align; -- pre_align __m128i tmp3 post_align; -- pre_align __m128i carry post_align; -- keySchedule[0] = _mm_loadu_si128((__m128i *)key); -- keySchedule[1] = _mm_loadu_si128((__m128i *)(key + 16)); -- EXPAND_KEY192(keySchedule[0], keySchedule[1], keySchedule[2], -- keySchedule[3], carry, 0x1, 0x2); -- EXPAND_KEY192_PART2(keySchedule[4], carry, keySchedule[3]); -- EXPAND_KEY192(keySchedule[3], keySchedule[4], keySchedule[5], -- keySchedule[6], carry, 0x4, 0x8); -- EXPAND_KEY192_PART2(keySchedule[7], carry, keySchedule[6]); -- EXPAND_KEY192(keySchedule[6], keySchedule[7], keySchedule[8], -- keySchedule[9], carry, 0x10, 0x20); -- EXPAND_KEY192_PART2(keySchedule[10], carry, keySchedule[9]); -- EXPAND_KEY192(keySchedule[9], keySchedule[10], keySchedule[11], -- keySchedule[12], carry, 0x40, 0x80); --} -- --#define EXPAND_KEY256_PART(res, rconx, k1x, k2x, X) \ -- tmp_key = _mm_shuffle_epi32(_mm_aeskeygenassist_si128(k2x, rconx), X); \ -- tmp2 = _mm_slli_si128(k1x, 4); \ -- tmp1 = _mm_xor_si128(k1x, tmp2); \ -- tmp2 = _mm_slli_si128(tmp2, 4); \ -- tmp1 = _mm_xor_si128(_mm_xor_si128(tmp1, tmp2), _mm_slli_si128(tmp2, 4)); \ -- res = _mm_xor_si128(tmp1, tmp_key); -- --#define EXPAND_KEY256(res1, res2, k1, k2, rcon) \ -- EXPAND_KEY256_PART(res1, rcon, k1, k2, 0xFF); \ -- EXPAND_KEY256_PART(res2, 0x00, k2, res1, 0xAA) -- --static void --native_key_expansion256(AESContext *cx, const unsigned char *key) --{ -- __m128i *keySchedule = cx->keySchedule; -- pre_align __m128i tmp_key post_align; -- pre_align __m128i tmp1 post_align; -- pre_align __m128i tmp2 post_align; -- keySchedule[0] = _mm_loadu_si128((__m128i *)key); -- keySchedule[1] = _mm_loadu_si128((__m128i *)(key + 16)); -- EXPAND_KEY256(keySchedule[2], keySchedule[3], keySchedule[0], -- keySchedule[1], 0x01); -- EXPAND_KEY256(keySchedule[4], keySchedule[5], keySchedule[2], -- keySchedule[3], 0x02); -- EXPAND_KEY256(keySchedule[6], keySchedule[7], keySchedule[4], -- keySchedule[5], 0x04); -- EXPAND_KEY256(keySchedule[8], keySchedule[9], keySchedule[6], -- keySchedule[7], 0x08); -- EXPAND_KEY256(keySchedule[10], keySchedule[11], keySchedule[8], -- keySchedule[9], 0x10); -- EXPAND_KEY256(keySchedule[12], keySchedule[13], keySchedule[10], -- keySchedule[11], 0x20); -- EXPAND_KEY256_PART(keySchedule[14], 0x40, keySchedule[12], -- keySchedule[13], 0xFF); --} -- --#endif /* NSS_X86_OR_X64 */ -- --/* -- * AES key expansion using aes-ni instructions. -- */ --static void --native_key_expansion(AESContext *cx, const unsigned char *key, unsigned int Nk) --{ --#ifdef NSS_X86_OR_X64 -- switch (Nk) { -- case 4: -- native_key_expansion128(cx, key); -- return; -- case 6: -- native_key_expansion192(cx, key); -- return; -- case 8: -- native_key_expansion256(cx, key); -- return; -- default: -- /* This shouldn't happen. */ -- PORT_Assert(0); -- } --#else -- PORT_Assert(0); --#endif /* NSS_X86_OR_X64 */ --} -- --static void --native_encryptBlock(AESContext *cx, -- unsigned char *output, -- const unsigned char *input) --{ --#ifdef NSS_X86_OR_X64 -- int i; -- pre_align __m128i m post_align = _mm_loadu_si128((__m128i *)input); -- m = _mm_xor_si128(m, cx->keySchedule[0]); -- for (i = 1; i < cx->Nr; ++i) { -- m = _mm_aesenc_si128(m, cx->keySchedule[i]); -- } -- m = _mm_aesenclast_si128(m, cx->keySchedule[cx->Nr]); -- _mm_storeu_si128((__m128i *)output, m); --#else -- PORT_Assert(0); --#endif /* NSS_X86_OR_X64 */ --} -- - /* rijndael_key_expansion - * - * Generate the expanded key from the key input by the user. -@@ -830,7 +702,7 @@ rijndael_encryptECB(AESContext *cx, unsigned char *output, - - if (aesni_support()) { - /* Use hardware acceleration for normal AES parameters. */ -- encryptor = &native_encryptBlock; -+ encryptor = &rijndael_native_encryptBlock; - } else { - encryptor = &rijndael_encryptBlock128; - } -@@ -1026,7 +898,7 @@ aes_InitContext(AESContext *cx, const unsigned char *key, unsigned int keysize, - cx->mode == NSS_AES_CTR)) { - PORT_Assert(keysize == 16 || keysize == 24 || keysize == 32); - /* Prepare hardware key for normal AES parameters. */ -- native_key_expansion(cx, key, Nk); -+ rijndael_native_key_expansion(cx, key, Nk); - } else { - rijndael_key_expansion(cx, key, Nk); - } -diff --git lib/freebl/rijndael.h lib/freebl/rijndael.h -index 1f4a8a9f73..1b63a323da 100644 ---- lib/freebl/rijndael.h -+++ lib/freebl/rijndael.h -@@ -8,8 +8,22 @@ - #include "blapii.h" - #include - --#ifdef NSS_X86_OR_X64 --#include /* aes-ni */ -+#if defined(NSS_X86_OR_X64) -+/* GCC <= 4.8 doesn't support including emmintrin.h without enabling SSE2 */ -+#if !defined(__clang__) && defined(__GNUC__) && defined(__GNUC_MINOR__) && \ -+ (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 8)) -+#pragma GCC push_options -+#pragma GCC target("sse2") -+#undef NSS_DISABLE_SSE2 -+#define NSS_DISABLE_SSE2 1 -+#endif /* GCC <= 4.8 */ -+ -+#include /* __m128i */ -+ -+#ifdef NSS_DISABLE_SSE2 -+#undef NSS_DISABLE_SSE2 -+#pragma GCC pop_options -+#endif /* NSS_DISABLE_SSE2 */ - #endif - - typedef void AESBlockFunc(AESContext *cx, Property changes on: branches/2017Q4/security/nss/files/patch-bug1400603 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q4 =================================================================== --- branches/2017Q4 (revision 454956) +++ branches/2017Q4 (revision 454957) Property changes on: branches/2017Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r454204