Skip to content

Commit

Permalink
Bug 1400603 - freebl: Reorganize AES-GCM source code based on hw/sw i…
Browse files Browse the repository at this point in the history 
…mplementation, r=franziskus

Reviewers: franziskus

Reviewed By: franziskus

Bug #: 1400603

Differential Revision: https://phabricator.services.mozilla.com/D65

--HG--
extra : histedit_source : c93d86bff9fb46d8487fbe164f24841aa9804f11
  • Loading branch information
@ueno
ueno committed Sep 22, 2017
1 parent be8e99c commit f5afb96
Show file tree
Hide file tree
Showing 8 changed files with 436 additions and 299 deletions.
4 changes: 3 additions & 1 deletion lib/freebl/Makefile
View file
Expand Up @@ -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
Expand Down
157 changes: 157 additions & 0 deletions lib/freebl/aes-x86.c
View file
@@ -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 <wmmintrin.h> /* 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);
}
65 changes: 41 additions & 24 deletions lib/freebl/freebl.gyp
View file
Expand Up @@ -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',
Expand All @@ -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',
Expand Down Expand Up @@ -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', {
Expand Down Expand Up @@ -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',
],
},
Expand Down Expand Up @@ -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',
Expand Down

0 comments on commit f5afb96

Please sign in to comment.