denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'chapoly'

Browse Source 
Add ChaCha20/Poly1305 AEAD support in IKEv2 and libipsec ESP through the
chapoly plugin, and in kernel ESP SAs starting with Linux 4.2.
This commit is contained in:
Martin Willi
2015-07-12 13:55:08 +02:00
parent b01b331afe 396607987a
commit 3232c0e64e
44 changed files with 2657 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS
+8
View File
@@ -1,3 +1,11 @@
- Added support for the ChaCha20/Poly1305 AEAD cipher specified in RFC7539 and
draft-ietf-ipsecme-chacha20-poly1305 using the chacha20poly1305 ike/esp
proposal keyword. The new chapoly plugin implements the cipher, optionally
SSE-accelerated on x86/x64 architectures. It is usable both in IKEv2 and the
strongSwan libipsec ESP backend. On Linux 4.2 or newer the kernel-netlink
plugin can configure the cipher for ESP SAs.
strongswan-5.3.2
----------------
configure.ac
+21
View File
@@ -127,6 +127,7 @@ ARG_ENABL_SET([af-alg], [enable AF_ALG crypto interface to Linux Crypto
ARG_ENABL_SET([bliss], [enable BLISS software implementation plugin.])
ARG_ENABL_SET([blowfish], [enable Blowfish software implementation plugin.])
ARG_ENABL_SET([ccm], [enables the CCM AEAD wrapper crypto plugin.])
ARG_ENABL_SET([chapoly], [enables the ChaCha20/Poly1305 AEAD plugin.])
ARG_DISBL_SET([cmac], [disable CMAC crypto implementation plugin.])
ARG_ENABL_SET([ctr], [enables the Counter Mode wrapper crypto plugin.])
ARG_DISBL_SET([des], [disable DES/3DES software implementation plugin.])
@@ -838,6 +839,22 @@ AC_COMPILE_IFELSE(
]
)
AC_MSG_CHECKING([x86/x64 target])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[], [[
#if !defined(__i386__) && !defined(__x86_64__)
# error not on x86/x64
#endif
]])],
[
x86x64=true
AC_MSG_RESULT([yes])
],
[AC_MSG_RESULT([no])]
)
AM_CONDITIONAL(USE_X86X64, [test "x$x86x64" = xtrue])
if test x$printf_hooks = xvstr; then
AC_CHECK_LIB([vstr],[main],[LIBS="$LIBS"],[AC_MSG_ERROR([Vstr string library not found])],[])
AC_DEFINE([USE_VSTR], [], [use Vstr string library for printf hooks])
@@ -1293,6 +1310,7 @@ ADD_PLUGIN([fips-prf], [s charon nm cmd])
ADD_PLUGIN([gmp], [s charon scepclient pki scripts manager medsrv attest nm cmd aikgen])
ADD_PLUGIN([agent], [s charon nm cmd])
ADD_PLUGIN([keychain], [s charon cmd])
ADD_PLUGIN([chapoly], [s charon scripts nm cmd])
ADD_PLUGIN([xcbc], [s charon nm cmd])
ADD_PLUGIN([cmac], [s charon nm cmd])
ADD_PLUGIN([hmac], [s charon pki scripts nm cmd])
@@ -1449,6 +1467,7 @@ AM_CONDITIONAL(USE_GCRYPT, test x$gcrypt = xtrue)
AM_CONDITIONAL(USE_AGENT, test x$agent = xtrue)
AM_CONDITIONAL(USE_KEYCHAIN, test x$keychain = xtrue)
AM_CONDITIONAL(USE_PKCS11, test x$pkcs11 = xtrue)
AM_CONDITIONAL(USE_CHAPOLY, test x$chapoly = xtrue)
AM_CONDITIONAL(USE_CTR, test x$ctr = xtrue)
AM_CONDITIONAL(USE_CCM, test x$ccm = xtrue)
AM_CONDITIONAL(USE_GCM, test x$gcm = xtrue)
@@ -1698,6 +1717,7 @@ AC_CONFIG_FILES([
src/libstrongswan/plugins/agent/Makefile
src/libstrongswan/plugins/keychain/Makefile
src/libstrongswan/plugins/pkcs11/Makefile
src/libstrongswan/plugins/chapoly/Makefile
src/libstrongswan/plugins/ctr/Makefile
src/libstrongswan/plugins/ccm/Makefile
src/libstrongswan/plugins/gcm/Makefile
@@ -1713,6 +1733,7 @@ AC_CONFIG_FILES([
src/libhydra/plugins/kernel_pfroute/Makefile
src/libhydra/tests/Makefile
src/libipsec/Makefile
src/libipsec/tests/Makefile
src/libsimaka/Makefile
src/libtls/Makefile
src/libtls/tests/Makefile
src/charon-tkm/tests/tests.c
+2 -2
View File
@@ -36,8 +36,8 @@
static test_configuration_t tests[] = {
#define TEST_SUITE(x) \
{ .suite = x, },
#define TEST_SUITE_DEPEND(x, type, args) \
{ .suite = x, .feature = PLUGIN_DEPENDS(type, args) },
#define TEST_SUITE_DEPEND(x, type, ...) \
{ .suite = x, .feature = PLUGIN_DEPENDS(type, __VA_ARGS__) },
#include "tests.h"
{ .suite = NULL, }
};
src/libcharon/sa/ikev2/keymat_v2.c
+2
View File
@@ -112,6 +112,7 @@ static bool derive_ike_aead(private_keymat_v2_t *this, u_int16_t alg,
case ENCR_AES_GCM_ICV12:
case ENCR_AES_GCM_ICV16:
/* RFC 4106 */
case ENCR_CHACHA20_POLY1305:
salt_size = 4;
break;
case ENCR_AES_CCM_ICV8:
@@ -527,6 +528,7 @@ METHOD(keymat_v2_t, derive_child_keys, bool,
case ENCR_AES_GCM_ICV16:
case ENCR_AES_CTR:
case ENCR_NULL_AUTH_AES_GMAC:
case ENCR_CHACHA20_POLY1305:
enc_size += 4;
break;
default:
src/libcharon/tests/Makefile.am
+3
View File
@@ -4,6 +4,7 @@ check_PROGRAMS = $(TESTS)
libcharon_tests_SOURCES = \
suites/test_mem_pool.c \
suites/test_message_chapoly.c \
libcharon_tests.h libcharon_tests.c
libcharon_tests_CFLAGS = \
@@ -11,6 +12,8 @@ libcharon_tests_CFLAGS = \
-I$(top_srcdir)/src/libhydra \
-I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libstrongswan/tests \
-DPLUGINDIR=\""$(abs_top_builddir)/src/libstrongswan/plugins\"" \
-DPLUGINS=\""${s_plugins}\"" \
@COVERAGE_CFLAGS@
libcharon_tests_LDFLAGS = @COVERAGE_LDFLAGS@
src/libcharon/tests/libcharon_tests.c
+16 -2
View File
@@ -27,8 +27,8 @@
static test_configuration_t tests[] = {
#define TEST_SUITE(x) \
{ .suite = x, },
#define TEST_SUITE_DEPEND(x, type, args) \
{ .suite = x, .feature = PLUGIN_DEPENDS(type, args) },
#define TEST_SUITE_DEPEND(x, type, ...) \
{ .suite = x, .feature = PLUGIN_DEPENDS(type, __VA_ARGS__) },
#include "libcharon_tests.h"
{ .suite = NULL, }
};
@@ -37,13 +37,27 @@ static bool test_runner_init(bool init)
{
if (init)
{
char *plugins, *plugindir;
libhydra_init();
libcharon_init();
plugins = getenv("TESTS_PLUGINS") ?:
lib->settings->get_str(lib->settings,
"tests.load", PLUGINS);
plugindir = lib->settings->get_str(lib->settings,
"tests.plugindir", PLUGINDIR);
plugin_loader_add_plugindirs(plugindir, plugins);
if (!lib->plugins->load(lib->plugins, plugins))
{
return FALSE;
}
}
else
{
lib->processor->set_threads(lib->processor, 0);
lib->processor->cancel(lib->processor);
lib->plugins->unload(lib->plugins);
libcharon_deinit();
libhydra_deinit();
}
src/libcharon/tests/libcharon_tests.h
+1
View File
@@ -14,3 +14,4 @@
*/
TEST_SUITE(mem_pool_suite_create)
TEST_SUITE_DEPEND(message_chapoly_suite_create, AEAD, ENCR_CHACHA20_POLY1305, 32)
src/libcharon/tests/suites/test_message_chapoly.c
+138
View File
@@ -0,0 +1,138 @@
/*
* Copyright (C) 2015 Martin Willi
* Copyright (C) 2015 revosec AG
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#include "test_suite.h"
#include <encoding/message.h>
static aead_t *aead;
static iv_gen_t *ivgen;
METHOD(keymat_t, get_version, ike_version_t,
keymat_t *this)
{
return IKEV2;
}
METHOD(keymat_t, get_aead, aead_t*,
keymat_t *this, bool in)
{
return aead;
}
METHOD(aead_t, get_iv_gen, iv_gen_t*,
aead_t *this)
{
return ivgen;
}
METHOD(iv_gen_t, get_iv, bool,
iv_gen_t *this, u_int64_t seq, size_t size, u_int8_t *buffer)
{
if (size != 8)
{
return FALSE;
}
memcpy(buffer, "\x10\x11\x12\x13\x14\x15\x16\x17", 8);
return TRUE;
}
METHOD(iv_gen_t, allocate_iv, bool,
iv_gen_t *this, u_int64_t seq, size_t size, chunk_t *chunk)
{
if (size != 8)
{
return FALSE;
}
*chunk = chunk_alloc(size);
return get_iv(this, seq, chunk->len, chunk->ptr);
}
/**
* Appendix B draft-ietf-ipsecme-chacha20-poly1305-06
*/
START_TEST(test_chacha20poly1305)
{
u_int64_t spii, spir;
ike_sa_id_t *id;
message_t *m;
u_int32_t window = htonl(10);
chunk_t chunk, exp;
keymat_t keymat = {
.get_version = _get_version,
.create_dh = (void*)return_null,
.create_nonce_gen = (void*)return_null,
.get_aead = _get_aead,
};
m = message_create(IKEV2, 0);
m->set_exchange_type(m, INFORMATIONAL);
htoun64(&spii, 0xc0c1c2c3c4c5c6c7);
htoun64(&spir, 0xd0d1d2d3d4d5d6d7);
id = ike_sa_id_create(IKEV2, spii, spir, FALSE);
m->set_ike_sa_id(m, id);
id->destroy(id);
m->set_source(m, host_create_from_string("1.2.3.4", 4500));
m->set_destination(m, host_create_from_string("4.3.2.1", 4500));
m->set_message_id(m, 9);
m->add_notify(m, TRUE, SET_WINDOW_SIZE, chunk_from_thing(window));
aead = lib->crypto->create_aead(lib->crypto, ENCR_CHACHA20_POLY1305, 32, 4);
ck_assert(aead);
ck_assert(aead->set_key(aead, chunk_from_chars(
0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,
0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
0x98,0x99,0x9a,0x9b,0x9c,0x9d,0x9e,0x9f,
0xa0,0xa1,0xa2,0xa3)));
INIT(ivgen,
.get_iv = _get_iv,
.allocate_iv = _allocate_iv,
.destroy = (void*)free,
);
aead->get_iv_gen = _get_iv_gen,
ck_assert(m->generate(m, &keymat, NULL) == SUCCESS);
chunk = m->get_packet_data(m);
exp = chunk_from_chars(0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,
0xd0,0xd1,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7,
0x2e,0x20,0x25,0x00,0x00,0x00,0x00,0x09,
0x00,0x00,0x00,0x45,0x29,0x00,0x00,0x29,
0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
0x61,0x03,0x94,0x70,0x1f,0x8d,0x01,0x7f,
0x7c,0x12,0x92,0x48,0x89,0x6b,0x71,0xbf,
0xe2,0x52,0x36,0xef,0xd7,0xcd,0xc6,0x70,
0x66,0x90,0x63,0x15,0xb2);
ck_assert_msg(chunk_equals(chunk, exp), "got %B\nexp %B", &chunk, &exp);
ivgen->destroy(ivgen);
aead->destroy(aead);
m->destroy(m);
}
END_TEST
Suite *message_chapoly_suite_create()
{
Suite *s;
TCase *tc;
s = suite_create("chapoly");
tc = tcase_create("ChaCha20Poly1305 IKEv2 encryption");
tcase_add_test(tc, test_chacha20poly1305);
suite_add_tcase(s, tc);
return s;
}
src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c
+2
View File
@@ -199,6 +199,7 @@ static kernel_algorithm_t encryption_algs[] = {
/* {ENCR_CAMELLIA_CCM_ICV16, "***" }, */
{ENCR_SERPENT_CBC, "serpent" },
{ENCR_TWOFISH_CBC, "twofish" },
{ENCR_CHACHA20_POLY1305, "rfc7539esp(chacha20,poly1305)"},
};
/**
@@ -1291,6 +1292,7 @@ METHOD(kernel_ipsec_t, add_sa, status_t,
case ENCR_AES_GCM_ICV16:
case ENCR_NULL_AUTH_AES_GMAC:
case ENCR_CAMELLIA_CCM_ICV16:
case ENCR_CHACHA20_POLY1305:
icv_size += 32;
/* FALL */
case ENCR_AES_CCM_ICV12:
src/libhydra/tests/hydra_tests.c
+2 -2
View File
@@ -26,8 +26,8 @@
static test_configuration_t tests[] = {
#define TEST_SUITE(x) \
{ .suite = x, },
#define TEST_SUITE_DEPEND(x, type, args) \
{ .suite = x, .feature = PLUGIN_DEPENDS(type, args) },
#define TEST_SUITE_DEPEND(x, type, ...) \
{ .suite = x, .feature = PLUGIN_DEPENDS(type, __VA_ARGS__) },
#include "hydra_tests.h"
{ .suite = NULL, }
};
src/libipsec/Makefile.am
+1 -8
View File
@@ -24,11 +24,4 @@ AM_LDFLAGS = \
EXTRA_DIST = Android.mk
# build optional plugins
########################
if MONOLITHIC
SUBDIRS =
else
SUBDIRS = .
endif
SUBDIRS = . tests
src/libipsec/esp_context.c
+1
View File
@@ -215,6 +215,7 @@ static bool create_aead(private_esp_context_t *this, int alg,
case ENCR_AES_GCM_ICV8:
case ENCR_AES_GCM_ICV12:
case ENCR_AES_GCM_ICV16:
case ENCR_CHACHA20_POLY1305:
/* the key includes a 4 byte salt */
this->aead = lib->crypto->create_aead(lib->crypto, alg,
key.len - 4, 4);
src/libipsec/tests/.gitignore
+1
View File
@@ -0,0 +1 @@
ipsec_tests
src/libipsec/tests/Makefile.am
+21
View File
@@ -0,0 +1,21 @@
TESTS = ipsec_tests
check_PROGRAMS = $(TESTS)
ipsec_tests_SOURCES = \
suites/test_chapoly.c \
ipsec_tests.h ipsec_tests.c
ipsec_tests_CFLAGS = \
-I$(top_srcdir)/src/libipsec \
-I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libstrongswan/tests \
-DPLUGINDIR=\""$(abs_top_builddir)/src/libstrongswan/plugins\"" \
-DPLUGINS=\""${s_plugins}\"" \
@COVERAGE_CFLAGS@
ipsec_tests_LDFLAGS = @COVERAGE_LDFLAGS@
ipsec_tests_LDADD = \
$(top_builddir)/src/libipsec/libipsec.la \
$(top_builddir)/src/libstrongswan/libstrongswan.la \
$(top_builddir)/src/libstrongswan/tests/libtest.la
src/libipsec/tests/ipsec_tests.c
+57
View File
@@ -0,0 +1,57 @@
/*
* Copyright (C) 2015 Martin Willi
* Copyright (C) 2015 revosec AG
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#include <test_runner.h>
/* declare test suite constructors */
#define TEST_SUITE(x) test_suite_t* x();
#define TEST_SUITE_DEPEND(x, ...) TEST_SUITE(x)
#include "ipsec_tests.h"
#undef TEST_SUITE
#undef TEST_SUITE_DEPEND
static test_configuration_t tests[] = {
#define TEST_SUITE(x) \
{ .suite = x, },
#define TEST_SUITE_DEPEND(x, type, ...) \
{ .suite = x, .feature = PLUGIN_DEPENDS(type, __VA_ARGS__) },
#include "ipsec_tests.h"
{ .suite = NULL, }
};
static bool test_runner_init(bool init)
{
if (init)
{
plugin_loader_add_plugindirs(PLUGINDIR, PLUGINS);
if (!lib->plugins->load(lib->plugins, PLUGINS))
{
return FALSE;
}
}
else
{
lib->credmgr->flush_cache(lib->credmgr, CERT_ANY);
lib->processor->set_threads(lib->processor, 0);
lib->processor->cancel(lib->processor);
lib->plugins->unload(lib->plugins);
}
return TRUE;
}
int main(int argc, char *argv[])
{
return test_runner_run("libipsec", tests, test_runner_init);
}
src/libipsec/tests/ipsec_tests.h
+16
View File
@@ -0,0 +1,16 @@
/*
* Copyright (C) 2015 Martin Willi
* Copyright (C) 2015 revosec AG
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
TEST_SUITE_DEPEND(chapoly_suite_create, AEAD, ENCR_CHACHA20_POLY1305, 32)
src/libipsec/tests/suites/test_chapoly.c
+136
View File
@@ -0,0 +1,136 @@
/*
* Copyright (C) 2015 Martin Willi
* Copyright (C) 2015 revosec AG
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#include <test_suite.h>
#include <ip_packet.h>
#include <esp_packet.h>
static iv_gen_t *ivgen;
METHOD(aead_t, get_iv_gen, iv_gen_t*,
aead_t *this)
{
return ivgen;
}
METHOD(iv_gen_t, get_iv, bool,
iv_gen_t *this, u_int64_t seq, size_t size, u_int8_t *buffer)
{
if (size != 8)
{
return FALSE;
}
memcpy(buffer, "\x10\x11\x12\x13\x14\x15\x16\x17", 8);
return TRUE;
}
METHOD(iv_gen_t, allocate_iv, bool,
iv_gen_t *this, u_int64_t seq, size_t size, chunk_t *chunk)
{
if (size != 8)
{
return FALSE;
}
*chunk = chunk_alloc(size);
return get_iv(this, seq, chunk->len, chunk->ptr);
}
/**
* Appendix A draft-ietf-ipsecme-chacha20-poly1305-06
*/
START_TEST(test_chapoly)
{
host_t *src, *dst;
ip_packet_t *icmp;
esp_packet_t *esp;
esp_context_t *ctx;
chunk_t data, exp;
u_int32_t seq = 0;
icmp = ip_packet_create(chunk_clone(chunk_from_chars(
0x45,0x00,0x00,0x54,0xa6,0xf2,0x00,0x00,
0x40,0x01,0xe7,0x78,0xc6,0x33,0x64,0x05,
0xc0,0x00,0x02,0x05,0x08,0x00,0x5b,0x7a,
0x3a,0x08,0x00,0x00,0x55,0x3b,0xec,0x10,
0x00,0x07,0x36,0x27,0x08,0x09,0x0a,0x0b,
0x0c,0x0d,0x0e,0x0f,0x10,0x11,0x12,0x13,
0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,
0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,
0x24,0x25,0x26,0x27,0x28,0x29,0x2a,0x2b,
0x2c,0x2d,0x2e,0x2f,0x30,0x31,0x32,0x33,
0x34,0x35,0x36,0x37)));
ck_assert(icmp);
src = host_create_from_string("203.0.113.153", 0);
dst = host_create_from_string("203.0.113.5", 0);
esp = esp_packet_create_from_payload(src, dst, icmp);
ctx = esp_context_create(ENCR_CHACHA20_POLY1305, chunk_from_chars(
0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,
0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,
0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,
0x98,0x99,0x9a,0x9b,0x9c,0x9d,0x9e,0x9f,
0xa0,0xa1,0xa2,0xa3),
AUTH_UNDEFINED, chunk_empty, FALSE);
while (seq != 4)
{
ck_assert(ctx->next_seqno(ctx, &seq));
}
INIT(ivgen,
.get_iv = _get_iv,
.allocate_iv = _allocate_iv,
.destroy = (void*)free,
);
ctx->get_aead(ctx)->get_iv_gen = _get_iv_gen;
ck_assert(esp->encrypt(esp, ctx, htonl(0x01020304)) == SUCCESS);
data = esp->packet.get_data(&esp->packet);
exp = chunk_from_chars(0x01,0x02,0x03,0x04,0x00,0x00,0x00,0x05,
0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
0x24,0x03,0x94,0x28,0xb9,0x7f,0x41,0x7e,
0x3c,0x13,0x75,0x3a,0x4f,0x05,0x08,0x7b,
0x67,0xc3,0x52,0xe6,0xa7,0xfa,0xb1,0xb9,
0x82,0xd4,0x66,0xef,0x40,0x7a,0xe5,0xc6,
0x14,0xee,0x80,0x99,0xd5,0x28,0x44,0xeb,
0x61,0xaa,0x95,0xdf,0xab,0x4c,0x02,0xf7,
0x2a,0xa7,0x1e,0x7c,0x4c,0x4f,0x64,0xc9,
0xbe,0xfe,0x2f,0xac,0xc6,0x38,0xe8,0xf3,
0xcb,0xec,0x16,0x3f,0xac,0x46,0x9b,0x50,
0x27,0x73,0xf6,0xfb,0x94,0xe6,0x64,0xda,
0x91,0x65,0xb8,0x28,0x29,0xf6,0x41,0xe0,
0x76,0xAA,0xA8,0x26,0x6B,0x7F,0xB0,0xF7,
0xB1,0x1B,0x36,0x99,0x07,0xE1,0xAD,0x43);
ck_assert_msg(chunk_equals(data, exp), "got %B\nexp %B", &data, &exp);
esp->destroy(esp);
ctx->destroy(ctx);
ivgen->destroy(ivgen);
}
END_TEST
Suite *chapoly_suite_create()
{
Suite *s;
TCase *tc;
s = suite_create("chapoly");
tc = tcase_create("ChaCha20Poly1305 ESP encryption");
tcase_add_test(tc, test_chapoly);
suite_add_tcase(s, tc);
return s;
}
src/libstrongswan/Makefile.am
+7
View File
@@ -540,6 +540,13 @@ if MONOLITHIC
endif
endif
if USE_CHAPOLY
SUBDIRS += plugins/chapoly
if MONOLITHIC
libstrongswan_la_LIBADD += plugins/chapoly/libstrongswan-chapoly.la
endif
endif
if USE_CTR
SUBDIRS += plugins/ctr
if MONOLITHIC
src/libstrongswan/crypto/crypters/crypter.c
+5 -3
View File
@@ -40,13 +40,14 @@ ENUM_NEXT(encryption_algorithm_names, ENCR_AES_GCM_ICV8, ENCR_NULL_AUTH_AES_GMAC
"AES_GCM_12",
"AES_GCM_16",
"NULL_AES_GMAC");
ENUM_NEXT(encryption_algorithm_names, ENCR_CAMELLIA_CBC, ENCR_CAMELLIA_CCM_ICV16, ENCR_NULL_AUTH_AES_GMAC,
ENUM_NEXT(encryption_algorithm_names, ENCR_CAMELLIA_CBC, ENCR_CHACHA20_POLY1305, ENCR_NULL_AUTH_AES_GMAC,
"CAMELLIA_CBC",
"CAMELLIA_CTR",
"CAMELLIA_CCM_8",
"CAMELLIA_CCM_12",
"CAMELLIA_CCM_16");
ENUM_NEXT(encryption_algorithm_names, ENCR_UNDEFINED, ENCR_RC2_CBC, ENCR_CAMELLIA_CCM_ICV16,
"CAMELLIA_CCM_16",
"CHACHA20_POLY1305");
ENUM_NEXT(encryption_algorithm_names, ENCR_UNDEFINED, ENCR_RC2_CBC, ENCR_CHACHA20_POLY1305,
"UNDEFINED",
"DES_ECB",
"SERPENT_CBC",
@@ -184,6 +185,7 @@ bool encryption_algorithm_is_aead(encryption_algorithm_t alg)
case ENCR_CAMELLIA_CCM_ICV8:
case ENCR_CAMELLIA_CCM_ICV12:
case ENCR_CAMELLIA_CCM_ICV16:
case ENCR_CHACHA20_POLY1305:
return TRUE;
default:
return FALSE;
src/libstrongswan/crypto/crypters/crypter.h
+1
View File
@@ -57,6 +57,7 @@ enum encryption_algorithm_t {
ENCR_CAMELLIA_CCM_ICV8 = 25,
ENCR_CAMELLIA_CCM_ICV12 = 26,
ENCR_CAMELLIA_CCM_ICV16 = 27,
ENCR_CHACHA20_POLY1305 = 28,
ENCR_UNDEFINED = 1024,
ENCR_DES_ECB = 1025,
ENCR_SERPENT_CBC = 1026,
src/libstrongswan/crypto/iv/iv_gen.c
+1
View File
@@ -48,6 +48,7 @@ iv_gen_t* iv_gen_create_for_alg(encryption_algorithm_t alg)
case ENCR_CAMELLIA_CCM_ICV8:
case ENCR_CAMELLIA_CCM_ICV12:
case ENCR_CAMELLIA_CCM_ICV16:
case ENCR_CHACHA20_POLY1305:
case ENCR_NULL_AUTH_AES_GMAC:
return iv_gen_seq_create();
case ENCR_NULL:
src/libstrongswan/crypto/proposal/proposal_keywords_static.txt
+1
View File
@@ -78,6 +78,7 @@ aes256gcm128, ENCRYPTION_ALGORITHM, ENCR_AES_GCM_ICV16, 256
aes128gmac, ENCRYPTION_ALGORITHM, ENCR_NULL_AUTH_AES_GMAC, 128
aes192gmac, ENCRYPTION_ALGORITHM, ENCR_NULL_AUTH_AES_GMAC, 192
aes256gmac, ENCRYPTION_ALGORITHM, ENCR_NULL_AUTH_AES_GMAC, 256
chacha20poly1305, ENCRYPTION_ALGORITHM, ENCR_CHACHA20_POLY1305, 256
blowfish, ENCRYPTION_ALGORITHM, ENCR_BLOWFISH, 128
blowfish128, ENCRYPTION_ALGORITHM, ENCR_BLOWFISH, 128
blowfish192, ENCRYPTION_ALGORITHM, ENCR_BLOWFISH, 192
src/libstrongswan/plugins/chapoly/Makefile.am
+29
View File
@@ -0,0 +1,29 @@
AM_CPPFLAGS = \
-I$(top_srcdir)/src/libstrongswan
AM_CFLAGS = \
$(PLUGIN_CFLAGS)
noinst_LTLIBRARIES =
if MONOLITHIC
noinst_LTLIBRARIES += libstrongswan-chapoly.la
else
plugin_LTLIBRARIES = libstrongswan-chapoly.la
endif
libstrongswan_chapoly_la_SOURCES = \
chapoly_plugin.h chapoly_plugin.c \
chapoly_drv.h chapoly_drv.c \
chapoly_drv_portable.h chapoly_drv_portable.c \
chapoly_aead.h chapoly_aead.c
noinst_LTLIBRARIES += libchapoly-drv-ssse3.la
libchapoly_drv_ssse3_la_SOURCES = chapoly_drv_ssse3.h chapoly_drv_ssse3.c
if USE_X86X64
libchapoly_drv_ssse3_la_CFLAGS = $(PLUGIN_CFLAGS) -mssse3
endif
libstrongswan_chapoly_la_LIBADD = \
libchapoly-drv-ssse3.la
libstrongswan_chapoly_la_LDFLAGS = -module -avoid-version
src/libstrongswan/plugins/chapoly/chapoly_aead.c
+333
View File
@@ -0,0 +1,333 @@
/*
* Copyright (C) 2015 Martin Willi
* Copyright (C) 2015 revosec AG
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#include "chapoly_aead.h"
#include "chapoly_drv.h"
#include <crypto/iv/iv_gen_seq.h>
/* maximum plain message size */
#define P_MAX 247877906880
typedef struct private_chapoly_aead_t private_chapoly_aead_t;
/**
* Private data of an chapoly_aead_t object.
*/
struct private_chapoly_aead_t {
/**
* Public chapoly_aead_t interface.
*/
chapoly_aead_t public;
/**
* IV generator.
*/
iv_gen_t *iv_gen;
/**
* Driver backend
*/
chapoly_drv_t *drv;
};
/**
* Include a partial block to ICV by padding it with zero bytes
*/
static bool poly_update_padded(private_chapoly_aead_t *this,
u_char *in, size_t len)
{
u_char b[POLY_BLOCK_SIZE];
memset(b, 0, sizeof(b));
memcpy(b, in, len);
return this->drv->poly(this->drv, b, 1);
}
/**
* Include associated data with padding to ICV
*/
static bool poly_head(private_chapoly_aead_t *this, u_char *assoc, size_t len)
{
u_int blocks, rem;
blocks = len / POLY_BLOCK_SIZE;
rem = len % POLY_BLOCK_SIZE;
if (!this->drv->poly(this->drv, assoc, blocks))
{
return FALSE;
}
if (rem)
{
return poly_update_padded(this, assoc + blocks * POLY_BLOCK_SIZE, rem);
}
return TRUE;
}
/**
* Include length fields to ICV
*/
static bool poly_tail(private_chapoly_aead_t *this, size_t alen, size_t clen)
{
struct {
u_int64_t alen;
u_int64_t clen;
} b;
b.alen = htole64(alen);
b.clen = htole64(clen);
return this->drv->poly(this->drv, (u_char*)&b, 1);
}
/**
* Perform ChaCha20 encryption inline and generate an ICV tag
*/
static bool do_encrypt(private_chapoly_aead_t *this, size_t len, u_char *data,
u_char *iv, size_t alen, u_char *assoc, u_char *icv)
{
u_int blocks, rem, prem;
if (!this->drv->init(this->drv, iv) ||
!poly_head(this, assoc, alen))
{
return FALSE;
}
blocks = len / CHACHA_BLOCK_SIZE;
if (!this->drv->encrypt(this->drv, data, blocks))
{
return FALSE;
}
rem = len % CHACHA_BLOCK_SIZE;
if (rem)
{
u_char stream[CHACHA_BLOCK_SIZE];
data += blocks * CHACHA_BLOCK_SIZE;
if (!this->drv->chacha(this->drv, stream))
{
return FALSE;
}
memxor(data, stream, rem);
blocks = rem / POLY_BLOCK_SIZE;
if (!this->drv->poly(this->drv, data, blocks))
{
return FALSE;
}
prem = rem % POLY_BLOCK_SIZE;
if (prem)
{
poly_update_padded(this, data + blocks * POLY_BLOCK_SIZE, prem);
}
}
return poly_tail(this, alen, len) &&
this->drv->finish(this->drv, icv);
}
/**
* Perform ChaCha20 decryption inline and generate an ICV tag
*/
static bool do_decrypt(private_chapoly_aead_t *this, size_t len, u_char *data,
u_char *iv, size_t alen, u_char *assoc, u_char *icv)
{
u_int blocks, rem, prem;
if (!this->drv->init(this->drv, iv) ||
!poly_head(this, assoc, alen))
{
return FALSE;
}
blocks = len / CHACHA_BLOCK_SIZE;
if (!this->drv->decrypt(this->drv, data, blocks))
{
return FALSE;
}
rem = len % CHACHA_BLOCK_SIZE;
if (rem)
{
u_char stream[CHACHA_BLOCK_SIZE];
data += blocks * CHACHA_BLOCK_SIZE;
blocks = rem / POLY_BLOCK_SIZE;
if (!this->drv->poly(this->drv, data, blocks))
{
return FALSE;
}
prem = rem % POLY_BLOCK_SIZE;
if (prem)
{
poly_update_padded(this, data + blocks * POLY_BLOCK_SIZE, prem);
}
if (!this->drv->chacha(this->drv, stream))
{
return FALSE;
}
memxor(data, stream, rem);
}
return poly_tail(this, alen, len) &&
this->drv->finish(this->drv, icv);
}
METHOD(aead_t, encrypt, bool,
private_chapoly_aead_t *this, chunk_t plain, chunk_t assoc, chunk_t iv,
chunk_t *encr)
{
u_char *out;
if (sizeof(plain.len) > sizeof(u_int32_t) && plain.len > P_MAX)
{
return FALSE;
}
if (iv.len != CHACHA_IV_SIZE)
{
return FALSE;
}
out = plain.ptr;
if (encr)
{
*encr = chunk_alloc(plain.len + POLY_ICV_SIZE);
out = encr->ptr;
memcpy(out, plain.ptr, plain.len);
}
do_encrypt(this, plain.len, out, iv.ptr, assoc.len, assoc.ptr,
out + plain.len);
return TRUE;
}
METHOD(aead_t, decrypt, bool,
private_chapoly_aead_t *this, chunk_t encr, chunk_t assoc, chunk_t iv,
chunk_t *plain)
{
u_char *out, icv[POLY_ICV_SIZE];
if (iv.len != CHACHA_IV_SIZE || encr.len < POLY_ICV_SIZE)
{
return FALSE;
}
encr.len -= POLY_ICV_SIZE;
if (sizeof(encr.len) > sizeof(u_int32_t) && encr.len > P_MAX)
{
return FALSE;
}
out = encr.ptr;
if (plain)
{
*plain = chunk_alloc(encr.len);
out = plain->ptr;
memcpy(out, encr.ptr, encr.len);
}
do_decrypt(this, encr.len, out, iv.ptr, assoc.len, assoc.ptr, icv);
return memeq_const(icv, encr.ptr + encr.len, POLY_ICV_SIZE);
}
METHOD(aead_t, get_block_size, size_t,
private_chapoly_aead_t *this)
{
return 1;
}
METHOD(aead_t, get_icv_size, size_t,
private_chapoly_aead_t *this)
{
return POLY_ICV_SIZE;
}
METHOD(aead_t, get_iv_size, size_t,
private_chapoly_aead_t *this)
{
return CHACHA_IV_SIZE;
}
METHOD(aead_t, get_iv_gen, iv_gen_t*,
private_chapoly_aead_t *this)
{
return this->iv_gen;
}
METHOD(aead_t, get_key_size, size_t,
private_chapoly_aead_t *this)
{
return CHACHA_KEY_SIZE + CHACHA_SALT_SIZE;
}
METHOD(aead_t, set_key, bool,
private_chapoly_aead_t *this, chunk_t key)
{
if (key.len != CHACHA_KEY_SIZE + CHACHA_SALT_SIZE)
{
return FALSE;
}
return this->drv->set_key(this->drv, "expand 32-byte k",
key.ptr, key.ptr + CHACHA_KEY_SIZE);
}
METHOD(aead_t, destroy, void,
private_chapoly_aead_t *this)
{
this->drv->destroy(this->drv);
this->iv_gen->destroy(this->iv_gen);
free(this);
}
/**
* See header
*/
chapoly_aead_t *chapoly_aead_create(encryption_algorithm_t algo,
size_t key_size, size_t salt_size)
{
private_chapoly_aead_t *this;
chapoly_drv_t *drv;
if (algo != ENCR_CHACHA20_POLY1305)
{
return NULL;
}
if (key_size && key_size != CHACHA_KEY_SIZE)
{
return NULL;
}
if (salt_size && salt_size != CHACHA_SALT_SIZE)
{
return NULL;
}
drv = chapoly_drv_probe();
if (!drv)
{
return NULL;
}
INIT(this,
.public = {
.aead = {
.encrypt = _encrypt,
.decrypt = _decrypt,
.get_block_size = _get_block_size,
.get_icv_size = _get_icv_size,
.get_iv_size = _get_iv_size,
.get_iv_gen = _get_iv_gen,
.get_key_size = _get_key_size,
.set_key = _set_key,
.destroy = _destroy,
},
},
.iv_gen = iv_gen_seq_create(),
.drv = drv,
);
return &this->public;
}
src/libstrongswan/plugins/chapoly/chapoly_aead.h
+52
View File
@@ -0,0 +1,52 @@
/*
* Copyright (C) 2015 Martin Willi
* Copyright (C) 2015 revosec AG
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
/**
* @defgroup chapoly_aead chapoly_aead
* @{ @ingroup chapoly
*/
#ifndef CHAPOLY_AEAD_H_
#define CHAPOLY_AEAD_H_
#include <crypto/aead.h>
typedef struct chapoly_aead_t chapoly_aead_t;
/**
* ChaCha20/Poly1305 AEAD implementation.
*
* TODO-Chapoly: draft-ietf-ipsecme-chacha20-poly1305-05
*/
struct chapoly_aead_t {
/**
* Implements aead_t interface.
*/
aead_t aead;
};
/**
* Create a chapoly_aead instance.
*
* @param algo algorithm to implement, ENCR_CHACHA20_POLY1305
* @param key_size key size in bytes, 32
* @param salt_size size of implicit salt length, 0
* @return AEAD, NULL if not supported
*/
chapoly_aead_t *chapoly_aead_create(encryption_algorithm_t algo,
size_t key_size, size_t salt_size);
#endif /** CHAPOLY_AEAD_H_ @}*/
src/libstrongswan/plugins/chapoly/chapoly_drv.c
+43
View File
@@ -0,0 +1,43 @@
/*
* Copyright (C) 2015 Martin Willi
* Copyright (C) 2015 revosec AG
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#include "chapoly_drv.h"
#include "chapoly_drv_portable.h"
#include "chapoly_drv_ssse3.h"
typedef chapoly_drv_t*(*chapoly_drv_create)();
/**
* See header.
*/
chapoly_drv_t *chapoly_drv_probe()
{
chapoly_drv_create drivers[] = {
chapoly_drv_ssse3_create,
chapoly_drv_portable_create,
};
chapoly_drv_t *driver;
int i;
for (i = 0; i < countof(drivers); i++)
{
driver = drivers[i]();
if (driver)
{
return driver;
}
}
return NULL;
}
src/libstrongswan/plugins/chapoly/chapoly_drv.h
+113
View File
@@ -0,0 +1,113 @@
/*
* Copyright (C) 2015 Martin Willi
* Copyright (C) 2015 revosec AG
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
/**
* @defgroup chapoly_drv chapoly_drv
* @{ @ingroup chapoly
*/
#ifndef CHAPOLY_DRV_H_
#define CHAPOLY_DRV_H_
#include <library.h>
#define CHACHA_BLOCK_SIZE 64
#define CHACHA_IV_SIZE 8
#define CHACHA_SALT_SIZE 4
#define CHACHA_KEY_SIZE 32
#define POLY_BLOCK_SIZE 16
#define POLY_ICV_SIZE 16
typedef struct chapoly_drv_t chapoly_drv_t;
/**
* ChaCha20/Poly1305 backend implementation.
*/
struct chapoly_drv_t {
/**
* Set the ChaCha20 encryption key.
*
* @param constant 16 byte key constant to use
* @param key 32 byte encryption key
* @param salt 4 byte nonce salt
* @return TRUE if key set
*/
bool (*set_key)(chapoly_drv_t *this, u_char *constant, u_char *key,
u_char *salt);
/**
* Start an AEAD en/decryption session, reset state.
*
* @param iv 8 byte initialization vector for nonce
* @return TRUE if initialized
*/
bool (*init)(chapoly_drv_t *this, u_char *iv);
/**
* Poly1305 update multiple blocks.
*
* @param data data to update Poly1305 for
* @param blocks number of 16-byte blocks to process
* @return TRUE if updated
*/
bool (*poly)(chapoly_drv_t *this, u_char *data, u_int blocks);
/**
* Create a single ChaCha20 keystream block.
*
* @param stream 64-byte block to write key stream data to
* @return TRUE if keystream returned
*/
bool (*chacha)(chapoly_drv_t *this, u_char *stream);
/**
* Encrypt multiple blocks of data inline, update Poly1305.
*
* @param data data to process
* @param blocks number of 64-byte blocks to process
* @return TRUE if encrypted
*/
bool (*encrypt)(chapoly_drv_t *this, u_char *data, u_int blocks);
/**
* Decrypt multiple blocks of data inline, update Poly1305.
*
* @param data data to process
* @param blocks number of 64-byte blocks to process
* @return TRUE if decrypted
*/
bool (*decrypt)(chapoly_drv_t *this, u_char *data, u_int blocks);
/**
* End a AEAD encryption session, return MAC.
*
* @param mac 16-byte block to write MAC to
* @return TRUE if MAC returned
*/
bool (*finish)(chapoly_drv_t *this, u_char *mac);
/**
* Destroy a chapoly_drv_t.
*/
void (*destroy)(chapoly_drv_t *this);
};
/**
* Create a chapoly_drv instance.
*/
chapoly_drv_t *chapoly_drv_probe();
#endif /** CHAPOLY_DRV_H_ @}*/
src/libstrongswan/plugins/chapoly/chapoly_drv_portable.c
+454
View File
@@ -0,0 +1,454 @@
/*
* Copyright (C) 2015 Martin Willi
* Copyright (C) 2015 revosec AG
*
* Based on public domain code by Andrew Moon and Daniel J. Bernstein.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#include "chapoly_drv_portable.h"
#define CHACHA_DOUBLEROUNDS 10
/* index of some state fields */
#define CHACHA_BLOCKCOUNT 12
#define CHACHA_NONCE1 13
#define CHACHA_NONCE2 14
#define CHACHA_NONCE3 15
typedef struct private_chapoly_drv_portable_t private_chapoly_drv_portable_t;
/**
* Private data of an chapoly_drv_portable_t object.
*/
struct private_chapoly_drv_portable_t {
/**
* Public chapoly_drv_portable_t interface.
*/
chapoly_drv_t public;
/**
* ChaCha20 state matrix
*/
u_int32_t m[16];
/**
* Poly1305 update key
*/
u_int32_t r[5];
/**
* Poly1305 state
*/
u_int32_t h[5];
/**
* Poly1305 finalize key
*/
u_int32_t s[4];
};
/**
* Convert unaligned little endian to host byte order
*/
static inline u_int32_t uletoh32(void *p)
{
u_int32_t ret;
memcpy(&ret, p, sizeof(ret));
ret = le32toh(ret);
return ret;
}
/**
* Convert host byte order to unaligned little endian
*/
static inline void htoule32(void *p, u_int32_t v)
{
v = htole32(v);
memcpy(p, &v, sizeof(v));
}
/**
* XOR a 32-bit integer into an unaligned destination
*/
static inline void xor32u(void *p, u_int32_t x)
{
u_int32_t y;
memcpy(&y, p, sizeof(y));
y ^= x;
memcpy(p, &y, sizeof(y));
}
/**
* Multiply two 64-bit words
*/
static inline u_int64_t mlt(u_int64_t a, u_int64_t b)
{
return a * b;
}
/**
* Shift a 64-bit unsigned integer v right by n bits, clamp to 32 bit
*/
static inline u_int32_t sr(u_int64_t v, u_char n)
{
return v >> n;
}
/**
* Circular left shift by n bits
*/
static inline u_int32_t rotl32(u_int32_t v, u_char n)
{
return (v << n) | (v >> (sizeof(v) * 8 - n));
}
/**
* AND two values, using a native integer size >= sizeof(u_int32_t)
*/
static inline u_long and(u_long v, u_long mask)
{
return v & mask;
}
/**
* XOR a Chacha20 keystream block into data, increment counter
*/
static void chacha_block_xor(private_chapoly_drv_portable_t *this, void *data)
{
u_int32_t x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, xa, xb, xc, xd, xe, xf;
u_int32_t *out = data;
u_int i;
x0 = this->m[ 0];
x1 = this->m[ 1];
x2 = this->m[ 2];
x3 = this->m[ 3];
x4 = this->m[ 4];
x5 = this->m[ 5];
x6 = this->m[ 6];
x7 = this->m[ 7];
x8 = this->m[ 8];
x9 = this->m[ 9];
xa = this->m[10];
xb = this->m[11];
xc = this->m[12];
xd = this->m[13];
xe = this->m[14];
xf = this->m[15];
for (i = 0; i < CHACHA_DOUBLEROUNDS; i++)
{
x0 += x4; xc = rotl32(xc ^ x0, 16);
x1 += x5; xd = rotl32(xd ^ x1, 16);
x2 += x6; xe = rotl32(xe ^ x2, 16);
x3 += x7; xf = rotl32(xf ^ x3, 16);
x8 += xc; x4 = rotl32(x4 ^ x8, 12);
x9 += xd; x5 = rotl32(x5 ^ x9, 12);
xa += xe; x6 = rotl32(x6 ^ xa, 12);
xb += xf; x7 = rotl32(x7 ^ xb, 12);
x0 += x4; xc = rotl32(xc ^ x0, 8);
x1 += x5; xd = rotl32(xd ^ x1, 8);
x2 += x6; xe = rotl32(xe ^ x2, 8);
x3 += x7; xf = rotl32(xf ^ x3, 8);
x8 += xc; x4 = rotl32(x4 ^ x8, 7);
x9 += xd; x5 = rotl32(x5 ^ x9, 7);
xa += xe; x6 = rotl32(x6 ^ xa, 7);
xb += xf; x7 = rotl32(x7 ^ xb, 7);
x0 += x5; xf = rotl32(xf ^ x0, 16);
x1 += x6; xc = rotl32(xc ^ x1, 16);
x2 += x7; xd = rotl32(xd ^ x2, 16);
x3 += x4; xe = rotl32(xe ^ x3, 16);
xa += xf; x5 = rotl32(x5 ^ xa, 12);
xb += xc; x6 = rotl32(x6 ^ xb, 12);
x8 += xd; x7 = rotl32(x7 ^ x8, 12);
x9 += xe; x4 = rotl32(x4 ^ x9, 12);
x0 += x5; xf = rotl32(xf ^ x0, 8);
x1 += x6; xc = rotl32(xc ^ x1, 8);
x2 += x7; xd = rotl32(xd ^ x2, 8);
x3 += x4; xe = rotl32(xe ^ x3, 8);
xa += xf; x5 = rotl32(x5 ^ xa, 7);
xb += xc; x6 = rotl32(x6 ^ xb, 7);
x8 += xd; x7 = rotl32(x7 ^ x8, 7);
x9 += xe; x4 = rotl32(x4 ^ x9, 7);
}
xor32u(out + 0, le32toh(x0 + this->m[ 0]));
xor32u(out + 1, le32toh(x1 + this->m[ 1]));
xor32u(out + 2, le32toh(x2 + this->m[ 2]));
xor32u(out + 3, le32toh(x3 + this->m[ 3]));
xor32u(out + 4, le32toh(x4 + this->m[ 4]));
xor32u(out + 5, le32toh(x5 + this->m[ 5]));
xor32u(out + 6, le32toh(x6 + this->m[ 6]));
xor32u(out + 7, le32toh(x7 + this->m[ 7]));
xor32u(out + 8, le32toh(x8 + this->m[ 8]));
xor32u(out + 9, le32toh(x9 + this->m[ 9]));
xor32u(out + 10, le32toh(xa + this->m[10]));
xor32u(out + 11, le32toh(xb + this->m[11]));
xor32u(out + 12, le32toh(xc + this->m[12]));
xor32u(out + 13, le32toh(xd + this->m[13]));
xor32u(out + 14, le32toh(xe + this->m[14]));
xor32u(out + 15, le32toh(xf + this->m[15]));
this->m[CHACHA_BLOCKCOUNT]++;
}
METHOD(chapoly_drv_t, set_key, bool,
private_chapoly_drv_portable_t *this, u_char *constant, u_char *key,
u_char *salt)
{
this->m[ 0] = uletoh32(constant + 0);
this->m[ 1] = uletoh32(constant + 4);
this->m[ 2] = uletoh32(constant + 8);
this->m[ 3] = uletoh32(constant + 12);
this->m[ 4] = uletoh32(key + 0);
this->m[ 5] = uletoh32(key + 4);
this->m[ 6] = uletoh32(key + 8);
this->m[ 7] = uletoh32(key + 12);
this->m[ 8] = uletoh32(key + 16);
this->m[ 9] = uletoh32(key + 20);
this->m[10] = uletoh32(key + 24);
this->m[11] = uletoh32(key + 28);
this->m[CHACHA_NONCE1] = uletoh32(salt);
return TRUE;
}
METHOD(chapoly_drv_t, init, bool,
private_chapoly_drv_portable_t *this, u_char *iv)
{
u_char key[CHACHA_BLOCK_SIZE];
this->m[CHACHA_BLOCKCOUNT] = 0;
this->m[CHACHA_NONCE2] = uletoh32(iv + 0);
this->m[CHACHA_NONCE3] = uletoh32(iv + 4);
memset(key, 0, CHACHA_BLOCK_SIZE);
chacha_block_xor(this, key);
/* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
this->r[0] = (uletoh32(key + 0) >> 0) & 0x3ffffff;
this->r[1] = (uletoh32(key + 3) >> 2) & 0x3ffff03;
this->r[2] = (uletoh32(key + 6) >> 4) & 0x3ffc0ff;
this->r[3] = (uletoh32(key + 9) >> 6) & 0x3f03fff;
this->r[4] = (uletoh32(key + 12) >> 8) & 0x00fffff;
/* h = 0 */
memwipe(this->h, sizeof(this->h));
this->s[0] = uletoh32(key + 16);
this->s[1] = uletoh32(key + 20);
this->s[2] = uletoh32(key + 24);
this->s[3] = uletoh32(key + 28);
return TRUE;
}
METHOD(chapoly_drv_t, poly, bool,
private_chapoly_drv_portable_t *this, u_char *data, u_int blocks)
{
u_int32_t r0, r1, r2, r3, r4;
u_int32_t s1, s2, s3, s4;
u_int32_t h0, h1, h2, h3, h4;
u_int64_t d0, d1, d2, d3, d4;
u_int i;
r0 = this->r[0];
r1 = this->r[1];
r2 = this->r[2];
r3 = this->r[3];
r4 = this->r[4];
s1 = r1 * 5;
s2 = r2 * 5;
s3 = r3 * 5;
s4 = r4 * 5;
h0 = this->h[0];
h1 = this->h[1];
h2 = this->h[2];
h3 = this->h[3];
h4 = this->h[4];
for (i = 0; i < blocks; i++)
{
/* h += m[i] */
h0 += (uletoh32(data + 0) >> 0) & 0x3ffffff;
h1 += (uletoh32(data + 3) >> 2) & 0x3ffffff;
h2 += (uletoh32(data + 6) >> 4) & 0x3ffffff;
h3 += (uletoh32(data + 9) >> 6) & 0x3ffffff;
h4 += (uletoh32(data + 12) >> 8) | (1 << 24);
/* h *= r */
d0 = mlt(h0, r0) + mlt(h1, s4) + mlt(h2, s3) + mlt(h3, s2) + mlt(h4, s1);
d1 = mlt(h0, r1) + mlt(h1, r0) + mlt(h2, s4) + mlt(h3, s3) + mlt(h4, s2);
d2 = mlt(h0, r2) + mlt(h1, r1) + mlt(h2, r0) + mlt(h3, s4) + mlt(h4, s3);
d3 = mlt(h0, r3) + mlt(h1, r2) + mlt(h2, r1) + mlt(h3, r0) + mlt(h4, s4);
d4 = mlt(h0, r4) + mlt(h1, r3) + mlt(h2, r2) + mlt(h3, r1) + mlt(h4, r0);
/* (partial) h %= p */
d1 += sr(d0, 26); h0 = and(d0, 0x3ffffff);
d2 += sr(d1, 26); h1 = and(d1, 0x3ffffff);
d3 += sr(d2, 26); h2 = and(d2, 0x3ffffff);
d4 += sr(d3, 26); h3 = and(d3, 0x3ffffff);
h0 += sr(d4, 26) * 5; h4 = and(d4, 0x3ffffff);
h1 += h0 >> 26; h0 = h0 & 0x3ffffff;
data += POLY_BLOCK_SIZE;
}
this->h[0] = h0;
this->h[1] = h1;
this->h[2] = h2;
this->h[3] = h3;
this->h[4] = h4;
return TRUE;
}
METHOD(chapoly_drv_t, chacha, bool,
private_chapoly_drv_portable_t *this, u_char *stream)
{
memset(stream, 0, CHACHA_BLOCK_SIZE);
chacha_block_xor(this, stream);
return TRUE;
}
METHOD(chapoly_drv_t, encrypt, bool,
private_chapoly_drv_portable_t *this, u_char *data, u_int blocks)
{
u_int i;
for (i = 0; i < blocks; i++)
{
chacha_block_xor(this, data);
poly(this, data, 4);
data += CHACHA_BLOCK_SIZE;
}
return TRUE;
}
METHOD(chapoly_drv_t, decrypt, bool,
private_chapoly_drv_portable_t *this, u_char *data, u_int blocks)
{
u_int i;
for (i = 0; i < blocks; i++)
{
poly(this, data, 4);
chacha_block_xor(this, data);
data += CHACHA_BLOCK_SIZE;
}
return TRUE;
}
METHOD(chapoly_drv_t, finish, bool,
private_chapoly_drv_portable_t *this, u_char *mac)
{
u_int32_t h0, h1, h2, h3, h4;
u_int32_t g0, g1, g2, g3, g4;
u_int32_t mask;
u_int64_t f = 0;
/* fully carry h */
h0 = this->h[0];
h1 = this->h[1];
h2 = this->h[2];
h3 = this->h[3];
h4 = this->h[4];
h2 += (h1 >> 26); h1 = h1 & 0x3ffffff;
h3 += (h2 >> 26); h2 = h2 & 0x3ffffff;
h4 += (h3 >> 26); h3 = h3 & 0x3ffffff;
h0 += (h4 >> 26) * 5; h4 = h4 & 0x3ffffff;
h1 += (h0 >> 26); h0 = h0 & 0x3ffffff;
/* compute h + -p */
g0 = h0 + 5;
g1 = h1 + (g0 >> 26); g0 &= 0x3ffffff;
g2 = h2 + (g1 >> 26); g1 &= 0x3ffffff;
g3 = h3 + (g2 >> 26); g2 &= 0x3ffffff;
g4 = h4 + (g3 >> 26) - (1 << 26); g3 &= 0x3ffffff;
/* select h if h < p, or h + -p if h >= p */
mask = (g4 >> ((sizeof(u_int32_t) * 8) - 1)) - 1;
g0 &= mask;
g1 &= mask;
g2 &= mask;
g3 &= mask;
g4 &= mask;
mask = ~mask;
h0 = (h0 & mask) | g0;
h1 = (h1 & mask) | g1;
h2 = (h2 & mask) | g2;
h3 = (h3 & mask) | g3;
h4 = (h4 & mask) | g4;
/* h = h % (2^128) */
h0 = (h0 >> 0) | (h1 << 26);
h1 = (h1 >> 6) | (h2 << 20);
h2 = (h2 >> 12) | (h3 << 14);
h3 = (h3 >> 18) | (h4 << 8);
/* mac = (h + s) % (2^128) */
f = (f >> 32) + h0 + this->s[0]; htoule32(mac + 0, f);
f = (f >> 32) + h1 + this->s[1]; htoule32(mac + 4, f);
f = (f >> 32) + h2 + this->s[2]; htoule32(mac + 8, f);
f = (f >> 32) + h3 + this->s[3]; htoule32(mac + 12, f);
return TRUE;
}
METHOD(chapoly_drv_t, destroy, void,
private_chapoly_drv_portable_t *this)
{
memwipe(this->m, sizeof(this->m));
memwipe(this->h, sizeof(this->h));
memwipe(this->r, sizeof(this->r));
memwipe(this->s, sizeof(this->s));
free(this);
}
/**
* See header
*/
chapoly_drv_t *chapoly_drv_portable_create()
{
private_chapoly_drv_portable_t *this;
INIT(this,
.public = {
.set_key = _set_key,
.init = _init,
.poly = _poly,
.chacha = _chacha,
.encrypt = _encrypt,
.decrypt = _decrypt,
.finish = _finish,
.destroy = _destroy,
},
);
return &this->public;
}
src/libstrongswan/plugins/chapoly/chapoly_drv_portable.h
+31
View File
@@ -0,0 +1,31 @@
/*
* Copyright (C) 2015 Martin Willi
* Copyright (C) 2015 revosec AG
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
/**
* @defgroup chapoly_drv_portable chapoly_drv_portable
* @{ @ingroup chapoly
*/
#include "chapoly_drv.h"
#ifndef CHAPOLY_DRV_PORTABLE_H_
#define CHAPOLY_DRV_PORTABLE_H_
/**
* Create a chapoly_drv_portable instance.
*/
chapoly_drv_t *chapoly_drv_portable_create();
#endif /** CHAPOLY_drv_PORTABLE_H_ @}*/
src/libstrongswan/plugins/chapoly/chapoly_drv_ssse3.c
+867
View File
@@ -0,0 +1,867 @@
/*
* Copyright (C) 2015 Martin Willi
* Copyright (C) 2015 revosec AG
*
* Based on public domain code by Andrew Moon and Daniel J. Bernstein.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#include "chapoly_drv_ssse3.h"
#ifdef __SSSE3__
#include <utils/cpu_feature.h>
#include <tmmintrin.h>
#define CHACHA_DOUBLEROUNDS 10
typedef struct private_chapoly_drv_ssse3_t private_chapoly_drv_ssse3_t;
/**
* Private data of an chapoly_drv_ssse3_t object.
*/
struct private_chapoly_drv_ssse3_t {
/**
* Public chapoly_drv_ssse3_t interface.
*/
chapoly_drv_t public;
/**
* ChaCha20 state matrix, as 128-bit vectors
*/
__m128i m[4];
/**
* Poly1305 update key
*/
u_int32_t r[5];
/**
* Poly1305 update key r^2
*/
u_int32_t u[5];
/**
* Poly1305 state
*/
u_int32_t h[5];
/**
* Poly1305 finalize key
*/
u_int32_t s[4];
};
/**
* Read a 32-bit integer from an unaligned address
*/
static inline u_int32_t ru32(void *p)
{
u_int32_t ret;
memcpy(&ret, p, sizeof(ret));
return ret;
}
/**
* Write a 32-bit word to an unaligned address
*/
static inline void wu32(void *p, u_int32_t v)
{
memcpy(p, &v, sizeof(v));
}
/**
* Shift a 64-bit unsigned integer v right by n bits, clamp to 32 bit
*/
static inline u_int32_t sr(u_int64_t v, u_char n)
{
return v >> n;
}
/**
* AND two values, using a native integer size >= sizeof(u_int32_t)
*/
static inline u_long and(u_long v, u_long mask)
{
return v & mask;
}
/**
* r = shuffle(a ^ b, s)
*/
static inline __m128i sfflxor32(__m128i a, __m128i b, __m128i s)
{
return _mm_shuffle_epi8(_mm_xor_si128(a, b), s);
}
/**
* r = rotl32(a ^ b, r)
*/
static inline __m128i rotlxor32(__m128i a, __m128i b, u_char r)
{
a = _mm_xor_si128(a, b);
return _mm_or_si128(_mm_slli_epi32(a, r), _mm_srli_epi32(a, 32 - r));
}
/**
* XOR a Chacha20 keystream block into data, increment counter
*/
static void chacha_block_xor(private_chapoly_drv_ssse3_t *this, void *data)
{
__m128i x0, x1, x2, x3, r8, r16, *out = data;
u_int i;
r8 = _mm_set_epi8(14, 13, 12, 15, 10, 9, 8, 11, 6, 5, 4, 7, 2, 1, 0, 3);
r16 = _mm_set_epi8(13, 12, 15, 14, 9, 8, 11, 10, 5, 4, 7, 6, 1, 0, 3, 2);
x0 = this->m[0];
x1 = this->m[1];
x2 = this->m[2];
x3 = this->m[3];
for (i = 0 ; i < CHACHA_DOUBLEROUNDS; i++)
{
x0 = _mm_add_epi32(x0, x1);
x3 = sfflxor32(x3, x0, r16);
x2 = _mm_add_epi32(x2, x3);
x1 = rotlxor32(x1, x2, 12);
x0 = _mm_add_epi32(x0, x1);
x3 = sfflxor32(x3, x0, r8);
x2 = _mm_add_epi32(x2, x3);
x1 = rotlxor32(x1, x2, 7);
x1 = _mm_shuffle_epi32(x1, _MM_SHUFFLE(0, 3, 2, 1));
x2 = _mm_shuffle_epi32(x2, _MM_SHUFFLE(1, 0, 3, 2));
x3 = _mm_shuffle_epi32(x3, _MM_SHUFFLE(2, 1, 0, 3));
x0 = _mm_add_epi32(x0, x1);
x3 = sfflxor32(x3, x0, r16);
x2 = _mm_add_epi32(x2, x3);
x1 = rotlxor32(x1, x2, 12);
x0 = _mm_add_epi32(x0, x1);
x3 = sfflxor32(x3, x0, r8);
x2 = _mm_add_epi32(x2, x3);
x1 = rotlxor32(x1, x2, 7);
x1 = _mm_shuffle_epi32(x1, _MM_SHUFFLE(2, 1, 0, 3));
x2 = _mm_shuffle_epi32(x2, _MM_SHUFFLE(1, 0, 3, 2));
x3 = _mm_shuffle_epi32(x3, _MM_SHUFFLE(0, 3, 2, 1));
}
x0 = _mm_add_epi32(x0, this->m[0]);
x1 = _mm_add_epi32(x1, this->m[1]);
x2 = _mm_add_epi32(x2, this->m[2]);
x3 = _mm_add_epi32(x3, this->m[3]);
x0 = _mm_xor_si128(x0, _mm_loadu_si128(out + 0));
x1 = _mm_xor_si128(x1, _mm_loadu_si128(out + 1));
x2 = _mm_xor_si128(x2, _mm_loadu_si128(out + 2));
x3 = _mm_xor_si128(x3, _mm_loadu_si128(out + 3));
_mm_storeu_si128(out + 0, x0);
_mm_storeu_si128(out + 1, x1);
_mm_storeu_si128(out + 2, x2);
_mm_storeu_si128(out + 3, x3);
this->m[3] = _mm_add_epi32(this->m[3], _mm_set_epi32(0, 0, 0, 1));
}
/**
* XOR four Chacha20 keystream blocks into data, increment counter
*/
static void chacha_4block_xor(private_chapoly_drv_ssse3_t *this, void *data)
{
__m128i x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, xa, xb, xc, xd, xe, xf;
__m128i r8, r16, ctrinc, t, *out = data;
u_int32_t *m = (u_int32_t*)this->m;
u_int i;
r8 = _mm_set_epi8(14, 13, 12, 15, 10, 9, 8, 11, 6, 5, 4, 7, 2, 1, 0, 3);
r16 = _mm_set_epi8(13, 12, 15, 14, 9, 8, 11, 10, 5, 4, 7, 6, 1, 0, 3, 2);
ctrinc = _mm_set_epi32(3, 2, 1, 0);
x0 = _mm_set1_epi32(m[ 0]);
x1 = _mm_set1_epi32(m[ 1]);
x2 = _mm_set1_epi32(m[ 2]);
x3 = _mm_set1_epi32(m[ 3]);
x4 = _mm_set1_epi32(m[ 4]);
x5 = _mm_set1_epi32(m[ 5]);
x6 = _mm_set1_epi32(m[ 6]);
x7 = _mm_set1_epi32(m[ 7]);
x8 = _mm_set1_epi32(m[ 8]);
x9 = _mm_set1_epi32(m[ 9]);
xa = _mm_set1_epi32(m[10]);
xb = _mm_set1_epi32(m[11]);
xc = _mm_set1_epi32(m[12]);
xd = _mm_set1_epi32(m[13]);
xe = _mm_set1_epi32(m[14]);
xf = _mm_set1_epi32(m[15]);
xc = _mm_add_epi32(xc, ctrinc);
for (i = 0 ; i < CHACHA_DOUBLEROUNDS; i++)
{
x0 = _mm_add_epi32(x0, x4); xc = sfflxor32(xc, x0, r16);
x1 = _mm_add_epi32(x1, x5); xd = sfflxor32(xd, x1, r16);
x2 = _mm_add_epi32(x2, x6); xe = sfflxor32(xe, x2, r16);
x3 = _mm_add_epi32(x3, x7); xf = sfflxor32(xf, x3, r16);
x8 = _mm_add_epi32(x8, xc); x4 = rotlxor32(x4, x8, 12);
x9 = _mm_add_epi32(x9, xd); x5 = rotlxor32(x5, x9, 12);
xa = _mm_add_epi32(xa, xe); x6 = rotlxor32(x6, xa, 12);
xb = _mm_add_epi32(xb, xf); x7 = rotlxor32(x7, xb, 12);
x0 = _mm_add_epi32(x0, x4); xc = sfflxor32(xc, x0, r8);
x1 = _mm_add_epi32(x1, x5); xd = sfflxor32(xd, x1, r8);
x2 = _mm_add_epi32(x2, x6); xe = sfflxor32(xe, x2, r8);
x3 = _mm_add_epi32(x3, x7); xf = sfflxor32(xf, x3, r8);
x8 = _mm_add_epi32(x8, xc); x4 = rotlxor32(x4, x8, 7);
x9 = _mm_add_epi32(x9, xd); x5 = rotlxor32(x5, x9, 7);
xa = _mm_add_epi32(xa, xe); x6 = rotlxor32(x6, xa, 7);
xb = _mm_add_epi32(xb, xf); x7 = rotlxor32(x7, xb, 7);
x0 = _mm_add_epi32(x0, x5); xf = sfflxor32(xf, x0, r16);
x1 = _mm_add_epi32(x1, x6); xc = sfflxor32(xc, x1, r16);
x2 = _mm_add_epi32(x2, x7); xd = sfflxor32(xd, x2, r16);
x3 = _mm_add_epi32(x3, x4); xe = sfflxor32(xe, x3, r16);
xa = _mm_add_epi32(xa, xf); x5 = rotlxor32(x5, xa, 12);
xb = _mm_add_epi32(xb, xc); x6 = rotlxor32(x6, xb, 12);
x8 = _mm_add_epi32(x8, xd); x7 = rotlxor32(x7, x8, 12);
x9 = _mm_add_epi32(x9, xe); x4 = rotlxor32(x4, x9, 12);
x0 = _mm_add_epi32(x0, x5); xf = sfflxor32(xf, x0, r8);
x1 = _mm_add_epi32(x1, x6); xc = sfflxor32(xc, x1, r8);
x2 = _mm_add_epi32(x2, x7); xd = sfflxor32(xd, x2, r8);
x3 = _mm_add_epi32(x3, x4); xe = sfflxor32(xe, x3, r8);
xa = _mm_add_epi32(xa, xf); x5 = rotlxor32(x5, xa, 7);
xb = _mm_add_epi32(xb, xc); x6 = rotlxor32(x6, xb, 7);
x8 = _mm_add_epi32(x8, xd); x7 = rotlxor32(x7, x8, 7);
x9 = _mm_add_epi32(x9, xe); x4 = rotlxor32(x4, x9, 7);
}
x0 = _mm_add_epi32(x0, _mm_set1_epi32(m[ 0]));
x1 = _mm_add_epi32(x1, _mm_set1_epi32(m[ 1]));
x2 = _mm_add_epi32(x2, _mm_set1_epi32(m[ 2]));
x3 = _mm_add_epi32(x3, _mm_set1_epi32(m[ 3]));
x4 = _mm_add_epi32(x4, _mm_set1_epi32(m[ 4]));
x5 = _mm_add_epi32(x5, _mm_set1_epi32(m[ 5]));
x6 = _mm_add_epi32(x6, _mm_set1_epi32(m[ 6]));
x7 = _mm_add_epi32(x7, _mm_set1_epi32(m[ 7]));
x8 = _mm_add_epi32(x8, _mm_set1_epi32(m[ 8]));
x9 = _mm_add_epi32(x9, _mm_set1_epi32(m[ 9]));
xa = _mm_add_epi32(xa, _mm_set1_epi32(m[10]));
xb = _mm_add_epi32(xb, _mm_set1_epi32(m[11]));
xc = _mm_add_epi32(xc, _mm_set1_epi32(m[12]));
xd = _mm_add_epi32(xd, _mm_set1_epi32(m[13]));
xe = _mm_add_epi32(xe, _mm_set1_epi32(m[14]));
xf = _mm_add_epi32(xf, _mm_set1_epi32(m[15]));
xc = _mm_add_epi32(xc, ctrinc);
/* transpose state matrix by interleaving 32-, then 64-bit words */
t = x0; x0 = _mm_unpacklo_epi32(t, x1);
x1 = _mm_unpackhi_epi32(t, x1);
t = x2; x2 = _mm_unpacklo_epi32(t, x3);
x3 = _mm_unpackhi_epi32(t, x3);
t = x4; x4 = _mm_unpacklo_epi32(t, x5);
x5 = _mm_unpackhi_epi32(t, x5);
t = x6; x6 = _mm_unpacklo_epi32(t, x7);
x7 = _mm_unpackhi_epi32(t, x7);
t = x8; x8 = _mm_unpacklo_epi32(t, x9);
x9 = _mm_unpackhi_epi32(t, x9);
t = xa; xa = _mm_unpacklo_epi32(t, xb);
xb = _mm_unpackhi_epi32(t, xb);
t = xc; xc = _mm_unpacklo_epi32(t, xd);
xd = _mm_unpackhi_epi32(t, xd);
t = xe; xe = _mm_unpacklo_epi32(t, xf);
xf = _mm_unpackhi_epi32(t, xf);
t = x0; x0 = _mm_unpacklo_epi64(t, x2);
x2 = _mm_unpackhi_epi64(t, x2);
t = x1; x1 = _mm_unpacklo_epi64(t, x3);
x3 = _mm_unpackhi_epi64(t, x3);
t = x4; x4 = _mm_unpacklo_epi64(t, x6);
x6 = _mm_unpackhi_epi64(t, x6);
t = x5; x5 = _mm_unpacklo_epi64(t, x7);
x7 = _mm_unpackhi_epi64(t, x7);
t = x8; x8 = _mm_unpacklo_epi64(t, xa);
xa = _mm_unpackhi_epi64(t, xa);
t = x9; x9 = _mm_unpacklo_epi64(t, xb);
xb = _mm_unpackhi_epi64(t, xb);
t = xc; xc = _mm_unpacklo_epi64(t, xe);
xe = _mm_unpackhi_epi64(t, xe);
t = xd; xd = _mm_unpacklo_epi64(t, xf);
xf = _mm_unpackhi_epi64(t, xf);
x0 = _mm_xor_si128(_mm_loadu_si128(out + 0), x0);
x1 = _mm_xor_si128(_mm_loadu_si128(out + 8), x1);
x2 = _mm_xor_si128(_mm_loadu_si128(out + 4), x2);
x3 = _mm_xor_si128(_mm_loadu_si128(out + 12), x3);
x4 = _mm_xor_si128(_mm_loadu_si128(out + 1), x4);
x5 = _mm_xor_si128(_mm_loadu_si128(out + 9), x5);
x6 = _mm_xor_si128(_mm_loadu_si128(out + 5), x6);
x7 = _mm_xor_si128(_mm_loadu_si128(out + 13), x7);
x8 = _mm_xor_si128(_mm_loadu_si128(out + 2), x8);
x9 = _mm_xor_si128(_mm_loadu_si128(out + 10), x9);
xa = _mm_xor_si128(_mm_loadu_si128(out + 6), xa);
xb = _mm_xor_si128(_mm_loadu_si128(out + 14), xb);
xc = _mm_xor_si128(_mm_loadu_si128(out + 3), xc);
xd = _mm_xor_si128(_mm_loadu_si128(out + 11), xd);
xe = _mm_xor_si128(_mm_loadu_si128(out + 7), xe);
xf = _mm_xor_si128(_mm_loadu_si128(out + 15), xf);
_mm_storeu_si128(out + 0, x0);
_mm_storeu_si128(out + 8, x1);
_mm_storeu_si128(out + 4, x2);
_mm_storeu_si128(out + 12, x3);
_mm_storeu_si128(out + 1, x4);
_mm_storeu_si128(out + 9, x5);
_mm_storeu_si128(out + 5, x6);
_mm_storeu_si128(out + 13, x7);
_mm_storeu_si128(out + 2, x8);
_mm_storeu_si128(out + 10, x9);
_mm_storeu_si128(out + 6, xa);
_mm_storeu_si128(out + 14, xb);
_mm_storeu_si128(out + 3, xc);
_mm_storeu_si128(out + 11, xd);
_mm_storeu_si128(out + 7, xe);
_mm_storeu_si128(out + 15, xf);
this->m[3] = _mm_add_epi32(this->m[3], _mm_set_epi32(0, 0, 0, 4));
}
METHOD(chapoly_drv_t, set_key, bool,
private_chapoly_drv_ssse3_t *this, u_char *constant, u_char *key,
u_char *salt)
{
this->m[0] = _mm_loadu_si128((__m128i*)constant);
this->m[1] = _mm_loadu_si128((__m128i*)key + 0);
this->m[2] = _mm_loadu_si128((__m128i*)key + 1);
this->m[3] = _mm_set_epi32(0, 0, ru32(salt), 0);
return TRUE;
}
/**
* r[127:64] = h[95:64] * a, r[63:0] = h[31:0] * b
*/
static inline __m128i mul2(__m128i h, u_int32_t a, u_int32_t b)
{
return _mm_mul_epu32(h, _mm_set_epi32(0, a, 0, b));
}
/**
* c = a[127:64] + a[63:0] + b[127:64] + b[63:0]
* z = x[127:64] + x[63:0] + y[127:64] + y[63:0]
*/
static inline void sum2(__m128i a, __m128i b, __m128i x, __m128i y,
u_int64_t *c, u_int64_t *z)
{
__m128i r, s;
a = _mm_add_epi64(a, b);
x = _mm_add_epi64(x, y);
r = _mm_unpacklo_epi64(x, a);
s = _mm_unpackhi_epi64(x, a);
r = _mm_add_epi64(r, s);
_mm_storel_epi64((__m128i*)z, r);
_mm_storel_epi64((__m128i*)c, _mm_srli_si128(r, 8));
}
/**
* r = a[127:64] + b[127:64] + c[127:64] + d[127:64] + e[127:64]
* + a[63:0] + b[63:0] + c[63:0] + d[63:0] + e[63:0]
*/
static inline u_int64_t sum5(__m128i a, __m128i b, __m128i c,
__m128i d, __m128i e)
{
u_int64_t r;
a = _mm_add_epi64(a, b);
c = _mm_add_epi64(c, d);
a = _mm_add_epi64(a, e);
a = _mm_add_epi64(a, c);
a = _mm_add_epi64(a, _mm_srli_si128(a, 8));
_mm_storel_epi64((__m128i*)&r, a);
return r;
}
/**
* Make second Poly1305 key u = r^2
*/
static void make_u(private_chapoly_drv_ssse3_t *this)
{
__m128i r01, r23, r44, x0, x1, y0, y1, z0;
u_int32_t r0, r1, r2, r3, r4;
u_int32_t u0, u1, u2, u3, u4;
u_int32_t s1, s2, s3, s4;
u_int64_t d0, d1, d2, d3, d4;
r0 = this->r[0];
r1 = this->r[1];
r2 = this->r[2];
r3 = this->r[3];
r4 = this->r[4];
s1 = r1 * 5;
s2 = r2 * 5;
s3 = r3 * 5;
s4 = r4 * 5;
r01 = _mm_set_epi32(0, r0, 0, r1);
r23 = _mm_set_epi32(0, r2, 0, r3);
r44 = _mm_set_epi32(0, r4, 0, r4);
/* u = r^2 */
x0 = mul2(r01, r0, s4);
x1 = mul2(r01, r1, r0);
y0 = mul2(r23, s3, s2);
y1 = mul2(r23, s4, s3);
z0 = mul2(r44, s1, s2);
y0 = _mm_add_epi64(y0, _mm_srli_si128(z0, 8));
y1 = _mm_add_epi64(y1, _mm_slli_si128(z0, 8));
sum2(x0, y0, x1, y1, &d0, &d1);
x0 = mul2(r01, r2, r1);
x1 = mul2(r01, r3, r2);
y0 = mul2(r23, r0, s4);
y1 = mul2(r23, r1, r0);
z0 = mul2(r44, s3, s4);
y0 = _mm_add_epi64(y0, _mm_srli_si128(z0, 8));
y1 = _mm_add_epi64(y1, _mm_slli_si128(z0, 8));
sum2(x0, y0, x1, y1, &d2, &d3);
x0 = mul2(r01, r4, r3);
y0 = mul2(r23, r2, r1);
z0 = mul2(r44, r0, 0);
y0 = _mm_add_epi64(y0, z0);
x0 = _mm_add_epi64(x0, y0);
x0 = _mm_add_epi64(x0, _mm_srli_si128(x0, 8));
_mm_storel_epi64((__m128i*)&d4, x0);
/* (partial) r %= p */
d1 += sr(d0, 26); u0 = and(d0, 0x3ffffff);
d2 += sr(d1, 26); u1 = and(d1, 0x3ffffff);
d3 += sr(d2, 26); u2 = and(d2, 0x3ffffff);
d4 += sr(d3, 26); u3 = and(d3, 0x3ffffff);
u0 += sr(d4, 26) * 5; u4 = and(d4, 0x3ffffff);
u1 += u0 >> 26; u0 &= 0x3ffffff;
this->u[0] = u0;
this->u[1] = u1;
this->u[2] = u2;
this->u[3] = u3;
this->u[4] = u4;
}
METHOD(chapoly_drv_t, init, bool,
private_chapoly_drv_ssse3_t *this, u_char *iv)
{
u_char key[CHACHA_BLOCK_SIZE];
this->m[3] = _mm_or_si128(
_mm_set_epi32(ru32(iv + 4), ru32(iv + 0), 0, 0),
_mm_and_si128(this->m[3], _mm_set_epi32(0, 0, ~0, 0)));
memset(key, 0, CHACHA_BLOCK_SIZE);
chacha_block_xor(this, key);
/* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
this->r[0] = (ru32(key + 0) >> 0) & 0x3ffffff;
this->r[1] = (ru32(key + 3) >> 2) & 0x3ffff03;
this->r[2] = (ru32(key + 6) >> 4) & 0x3ffc0ff;
this->r[3] = (ru32(key + 9) >> 6) & 0x3f03fff;
this->r[4] = (ru32(key + 12) >> 8) & 0x00fffff;
make_u(this);
/* h = 0 */
memwipe(this->h, sizeof(this->h));
this->s[0] = ru32(key + 16);
this->s[1] = ru32(key + 20);
this->s[2] = ru32(key + 24);
this->s[3] = ru32(key + 28);
return TRUE;
}
/**
* Update Poly1305 for a multiple of two blocks
*/
static void poly2(private_chapoly_drv_ssse3_t *this, u_char *data, u_int dblks)
{
u_int32_t r0, r1, r2, r3, r4, u0, u1, u2, u3, u4;
u_int32_t s1, s2, s3, s4, v1, v2, v3, v4;
__m128i hc0, hc1, hc2, hc3, hc4;
u_int32_t h0, h1, h2, h3, h4;
u_int32_t c0, c1, c2, c3, c4;
u_int64_t d0, d1, d2, d3, d4;
u_int i;
r0 = this->r[0];
r1 = this->r[1];
r2 = this->r[2];
r3 = this->r[3];
r4 = this->r[4];
s1 = r1 * 5;
s2 = r2 * 5;
s3 = r3 * 5;
s4 = r4 * 5;
u0 = this->u[0];
u1 = this->u[1];
u2 = this->u[2];
u3 = this->u[3];
u4 = this->u[4];
v1 = u1 * 5;
v2 = u2 * 5;
v3 = u3 * 5;
v4 = u4 * 5;
h0 = this->h[0];
h1 = this->h[1];
h2 = this->h[2];
h3 = this->h[3];
h4 = this->h[4];
/* h = (h + c1) * r^2 + c2 * r */
for (i = 0; i < dblks; i++)
{
/* h += m[i] */
h0 += (ru32(data + 0) >> 0) & 0x3ffffff;
h1 += (ru32(data + 3) >> 2) & 0x3ffffff;
h2 += (ru32(data + 6) >> 4) & 0x3ffffff;
h3 += (ru32(data + 9) >> 6) & 0x3ffffff;
h4 += (ru32(data + 12) >> 8) | (1 << 24);
data += POLY_BLOCK_SIZE;
/* c = m[i + 1] */
c0 = (ru32(data + 0) >> 0) & 0x3ffffff;
c1 = (ru32(data + 3) >> 2) & 0x3ffffff;
c2 = (ru32(data + 6) >> 4) & 0x3ffffff;
c3 = (ru32(data + 9) >> 6) & 0x3ffffff;
c4 = (ru32(data + 12) >> 8) | (1 << 24);
data += POLY_BLOCK_SIZE;
hc0 = _mm_set_epi32(0, h0, 0, c0);
hc1 = _mm_set_epi32(0, h1, 0, c1);
hc2 = _mm_set_epi32(0, h2, 0, c2);
hc3 = _mm_set_epi32(0, h3, 0, c3);
hc4 = _mm_set_epi32(0, h4, 0, c4);
/* h = h * r^2 + c * r */
d0 = sum5(mul2(hc0, u0, r0),
mul2(hc1, v4, s4),
mul2(hc2, v3, s3),
mul2(hc3, v2, s2),
mul2(hc4, v1, s1));
d1 = sum5(mul2(hc0, u1, r1),
mul2(hc1, u0, r0),
mul2(hc2, v4, s4),
mul2(hc3, v3, s3),
mul2(hc4, v2, s2));
d2 = sum5(mul2(hc0, u2, r2),
mul2(hc1, u1, r1),
mul2(hc2, u0, r0),
mul2(hc3, v4, s4),
mul2(hc4, v3, s3));
d3 = sum5(mul2(hc0, u3, r3),
mul2(hc1, u2, r2),
mul2(hc2, u1, r1),
mul2(hc3, u0, r0),
mul2(hc4, v4, s4));
d4 = sum5(mul2(hc0, u4, r4),
mul2(hc1, u3, r3),
mul2(hc2, u2, r2),
mul2(hc3, u1, r1),
mul2(hc4, u0, r0));
/* (partial) h %= p */
d1 += sr(d0, 26); h0 = and(d0, 0x3ffffff);
d2 += sr(d1, 26); h1 = and(d1, 0x3ffffff);
d3 += sr(d2, 26); h2 = and(d2, 0x3ffffff);
d4 += sr(d3, 26); h3 = and(d3, 0x3ffffff);
h0 += sr(d4, 26) * 5; h4 = and(d4, 0x3ffffff);
h1 += h0 >> 26; h0 = h0 & 0x3ffffff;
}
this->h[0] = h0;
this->h[1] = h1;
this->h[2] = h2;
this->h[3] = h3;
this->h[4] = h4;
}
/**
* Update Poly1305 for a single block
*/
static void poly1(private_chapoly_drv_ssse3_t *this, u_char *data)
{
u_int32_t r0, r1, r2, r3, r4;
u_int32_t s1, s2, s3, s4;
u_int32_t h0, h1, h2, h3, h4;
u_int64_t d0, d1, d2, d3, d4;
__m128i h01, h23, h44;
__m128i x0, x1, y0, y1, z0;
u_int32_t t0, t1;
r0 = this->r[0];
r1 = this->r[1];
r2 = this->r[2];
r3 = this->r[3];
r4 = this->r[4];
s1 = r1 * 5;
s2 = r2 * 5;
s3 = r3 * 5;
s4 = r4 * 5;
h0 = this->h[0];
h1 = this->h[1];
h2 = this->h[2];
h3 = this->h[3];
h4 = this->h[4];
h01 = _mm_set_epi32(0, h0, 0, h1);
h23 = _mm_set_epi32(0, h2, 0, h3);
h44 = _mm_set_epi32(0, h4, 0, h4);
/* h += m[i] */
t0 = (ru32(data + 0) >> 0) & 0x3ffffff;
t1 = (ru32(data + 3) >> 2) & 0x3ffffff;
h01 = _mm_add_epi32(h01, _mm_set_epi32(0, t0, 0, t1));
t0 = (ru32(data + 6) >> 4) & 0x3ffffff;
t1 = (ru32(data + 9) >> 6) & 0x3ffffff;
h23 = _mm_add_epi32(h23, _mm_set_epi32(0, t0, 0, t1));
t0 = (ru32(data + 12) >> 8) | (1 << 24);
h44 = _mm_add_epi32(h44, _mm_set_epi32(0, t0, 0, t0));
/* h *= r */
x0 = mul2(h01, r0, s4);
x1 = mul2(h01, r1, r0);
y0 = mul2(h23, s3, s2);
y1 = mul2(h23, s4, s3);
z0 = mul2(h44, s1, s2);
y0 = _mm_add_epi64(y0, _mm_srli_si128(z0, 8));
y1 = _mm_add_epi64(y1, _mm_slli_si128(z0, 8));
sum2(x0, y0, x1, y1, &d0, &d1);
x0 = mul2(h01, r2, r1);
x1 = mul2(h01, r3, r2);
y0 = mul2(h23, r0, s4);
y1 = mul2(h23, r1, r0);
z0 = mul2(h44, s3, s4);
y0 = _mm_add_epi64(y0, _mm_srli_si128(z0, 8));
y1 = _mm_add_epi64(y1, _mm_slli_si128(z0, 8));
sum2(x0, y0, x1, y1, &d2, &d3);
x0 = mul2(h01, r4, r3);
y0 = mul2(h23, r2, r1);
z0 = mul2(h44, r0, 0);
y0 = _mm_add_epi64(y0, z0);
x0 = _mm_add_epi64(x0, y0);
x0 = _mm_add_epi64(x0, _mm_srli_si128(x0, 8));
_mm_storel_epi64((__m128i*)&d4, x0);
/* (partial) h %= p */
d1 += sr(d0, 26); h0 = and(d0, 0x3ffffff);
d2 += sr(d1, 26); h1 = and(d1, 0x3ffffff);
d3 += sr(d2, 26); h2 = and(d2, 0x3ffffff);
d4 += sr(d3, 26); h3 = and(d3, 0x3ffffff);
h0 += sr(d4, 26) * 5; h4 = and(d4, 0x3ffffff);
h1 += h0 >> 26; h0 = h0 & 0x3ffffff;
this->h[0] = h0;
this->h[1] = h1;
this->h[2] = h2;
this->h[3] = h3;
this->h[4] = h4;
}
METHOD(chapoly_drv_t, poly, bool,
private_chapoly_drv_ssse3_t *this, u_char *data, u_int blocks)
{
poly2(this, data, blocks / 2);
if (blocks-- % 2)
{
poly1(this, data + POLY_BLOCK_SIZE * blocks);
}
return TRUE;
}
METHOD(chapoly_drv_t, chacha, bool,
private_chapoly_drv_ssse3_t *this, u_char *stream)
{
memset(stream, 0, CHACHA_BLOCK_SIZE);
chacha_block_xor(this, stream);
return TRUE;
}
METHOD(chapoly_drv_t, encrypt, bool,
private_chapoly_drv_ssse3_t *this, u_char *data, u_int blocks)
{
while (blocks >= 4)
{
chacha_4block_xor(this, data);
poly2(this, data, 8);
data += CHACHA_BLOCK_SIZE * 4;
blocks -= 4;
}
while (blocks--)
{
chacha_block_xor(this, data);
poly2(this, data, 2);
data += CHACHA_BLOCK_SIZE;
}
return TRUE;
}
METHOD(chapoly_drv_t, decrypt, bool,
private_chapoly_drv_ssse3_t *this, u_char *data, u_int blocks)
{
while (blocks >= 4)
{
poly2(this, data, 8);
chacha_4block_xor(this, data);
data += CHACHA_BLOCK_SIZE * 4;
blocks -= 4;
}
while (blocks--)
{
poly2(this, data, 2);
chacha_block_xor(this, data);
data += CHACHA_BLOCK_SIZE;
}
return TRUE;
}
METHOD(chapoly_drv_t, finish, bool,
private_chapoly_drv_ssse3_t *this, u_char *mac)
{
u_int32_t h0, h1, h2, h3, h4;
u_int32_t g0, g1, g2, g3, g4;
u_int32_t mask;
u_int64_t f = 0;
/* fully carry h */
h0 = this->h[0];
h1 = this->h[1];
h2 = this->h[2];
h3 = this->h[3];
h4 = this->h[4];
h2 += (h1 >> 26); h1 = h1 & 0x3ffffff;
h3 += (h2 >> 26); h2 = h2 & 0x3ffffff;
h4 += (h3 >> 26); h3 = h3 & 0x3ffffff;
h0 += (h4 >> 26) * 5; h4 = h4 & 0x3ffffff;
h1 += (h0 >> 26); h0 = h0 & 0x3ffffff;
/* compute h + -p */
g0 = h0 + 5;
g1 = h1 + (g0 >> 26); g0 &= 0x3ffffff;
g2 = h2 + (g1 >> 26); g1 &= 0x3ffffff;
g3 = h3 + (g2 >> 26); g2 &= 0x3ffffff;
g4 = h4 + (g3 >> 26) - (1 << 26); g3 &= 0x3ffffff;
/* select h if h < p, or h + -p if h >= p */
mask = (g4 >> ((sizeof(u_int32_t) * 8) - 1)) - 1;
g0 &= mask;
g1 &= mask;
g2 &= mask;
g3 &= mask;
g4 &= mask;
mask = ~mask;
h0 = (h0 & mask) | g0;
h1 = (h1 & mask) | g1;
h2 = (h2 & mask) | g2;
h3 = (h3 & mask) | g3;
h4 = (h4 & mask) | g4;
/* h = h % (2^128) */
h0 = (h0 >> 0) | (h1 << 26);
h1 = (h1 >> 6) | (h2 << 20);
h2 = (h2 >> 12) | (h3 << 14);
h3 = (h3 >> 18) | (h4 << 8);
/* mac = (h + s) % (2^128) */
f = (f >> 32) + h0 + this->s[0]; wu32(mac + 0, f);
f = (f >> 32) + h1 + this->s[1]; wu32(mac + 4, f);
f = (f >> 32) + h2 + this->s[2]; wu32(mac + 8, f);
f = (f >> 32) + h3 + this->s[3]; wu32(mac + 12, f);
return TRUE;
}
METHOD(chapoly_drv_t, destroy, void,
private_chapoly_drv_ssse3_t *this)
{
memwipe(this->m, sizeof(this->m));
memwipe(this->h, sizeof(this->h));
memwipe(this->r, sizeof(this->r));
memwipe(this->u, sizeof(this->u));
memwipe(this->s, sizeof(this->s));
free_align(this);
}
/**
* See header
*/
chapoly_drv_t *chapoly_drv_ssse3_create()
{
private_chapoly_drv_ssse3_t *this;
if (!cpu_feature_available(CPU_FEATURE_SSSE3))
{
return FALSE;
}
INIT_ALIGN(this, sizeof(__m128i),
.public = {
.set_key = _set_key,
.init = _init,
.poly = _poly,
.chacha = _chacha,
.encrypt = _encrypt,
.decrypt = _decrypt,
.finish = _finish,
.destroy = _destroy,
},
);
return &this->public;
}
#else /* !__SSSE3__ */
chapoly_drv_t *chapoly_drv_ssse3_create()
{
return NULL;
}
#endif /* !__SSSE3__ */
src/libstrongswan/plugins/chapoly/chapoly_drv_ssse3.h
+31
View File
@@ -0,0 +1,31 @@
/*
* Copyright (C) 2015 Martin Willi
* Copyright (C) 2015 revosec AG
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
/**
* @defgroup chapoly_drv_ssse3 chapoly_drv_ssse3
* @{ @ingroup chapoly
*/
#include "chapoly_drv.h"
#ifndef CHAPOLY_DRV_SSSE3_H_
#define CHAPOLY_DRV_SSSE3_H_
/**
* Create a chapoly_drv_ssse3 instance.
*/
chapoly_drv_t *chapoly_drv_ssse3_create();
#endif /** CHAPOLY_DRV_SSSE3_H_ @}*/
src/libstrongswan/plugins/chapoly/chapoly_plugin.c
+75
View File
@@ -0,0 +1,75 @@
/*
* Copyright (C) 2015 Martin Willi
* Copyright (C) 2015 revosec AG
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#include "chapoly_plugin.h"
#include "chapoly_aead.h"
#include <library.h>
typedef struct private_chapoly_plugin_t private_chapoly_plugin_t;
/**
* Private data of chapoly_plugin
*/
struct private_chapoly_plugin_t {
/**
* Public functions
*/
chapoly_plugin_t public;
};
METHOD(plugin_t, get_name, char*,
private_chapoly_plugin_t *this)
{
return "chapoly";
}
METHOD(plugin_t, get_features, int,
private_chapoly_plugin_t *this, plugin_feature_t *features[])
{
static plugin_feature_t f[] = {
PLUGIN_REGISTER(AEAD, chapoly_aead_create),
PLUGIN_PROVIDE(AEAD, ENCR_CHACHA20_POLY1305, 32),
};
*features = f;
return countof(f);
}
METHOD(plugin_t, destroy, void,
private_chapoly_plugin_t *this)
{
free(this);
}
/*
* see header file
*/
plugin_t *chapoly_plugin_create()
{
private_chapoly_plugin_t *this;
INIT(this,
.public = {
.plugin = {
.get_name = _get_name,
.get_features = _get_features,
.destroy = _destroy,
},
},
);
return &this->public.plugin;
}
src/libstrongswan/plugins/chapoly/chapoly_plugin.h
+42
View File
@@ -0,0 +1,42 @@
/*
* Copyright (C) 2015 Martin Willi
* Copyright (C) 2015 revosec AG
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
/**
* @defgroup chapoly chapoly
* @ingroup plugins
*
* @defgroup chapoly_plugin chapoly_plugin
* @{ @ingroup chapoly
*/
#ifndef CHAPOLY_PLUGIN_H_
#define CHAPOLY_PLUGIN_H_
#include <plugins/plugin.h>
typedef struct chapoly_plugin_t chapoly_plugin_t;
/**
* Plugin providing a ChaCha20/Poly1305 AEAD.
*/
struct chapoly_plugin_t {
/**
* Implements plugin interface.
*/
plugin_t plugin;
};
#endif /** CHAPOLY_PLUGIN_H_ @}*/
src/libstrongswan/plugins/test_vectors/Makefile.am
+1
View File
@@ -19,6 +19,7 @@ libstrongswan_test_vectors_la_SOURCES = \
test_vectors/aes_cmac.c \
test_vectors/aes_ccm.c \
test_vectors/aes_gcm.c \
test_vectors/chacha20poly1305.c \
test_vectors/blowfish.c \
test_vectors/camellia_cbc.c \
test_vectors/camellia_ctr.c \
src/libstrongswan/plugins/test_vectors/test_vectors.h
+4
View File
@@ -113,6 +113,10 @@ TEST_VECTOR_AEAD(aes_gcm21)
TEST_VECTOR_AEAD(aes_gcm22)
TEST_VECTOR_AEAD(aes_gcm23)
TEST_VECTOR_AEAD(chacha20poly1305_1)
TEST_VECTOR_AEAD(chacha20poly1305_2)
TEST_VECTOR_AEAD(chacha20poly1305_3)
TEST_VECTOR_SIGNER(aes_xcbc_s1)
TEST_VECTOR_SIGNER(aes_xcbc_s2)
TEST_VECTOR_SIGNER(aes_xcbc_s3)
src/libstrongswan/plugins/test_vectors/test_vectors/chacha20poly1305.c
+107
View File
@@ -0,0 +1,107 @@
/*
* Copyright (C) 2015 Martin Willi
* Copyright (C) 2015 revosec AG
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the Licenseor (at your
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
*
* This program is distributed in the hope that it will be usefulbut
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*/
#include <crypto/crypto_tester.h>
/**
* From draft-irtf-cfrg-chacha20-poly1305
*/
aead_test_vector_t chacha20poly1305_1 = {
.alg = ENCR_CHACHA20_POLY1305, .key_size = 32, .salt_size = 4,
.len = 265, .alen = 12,
.key = "\x1c\x92\x40\xa5\xeb\x55\xd3\x8a\xf3\x33\x88\x86\x04\xf6\xb5\xf0"
"\x47\x39\x17\xc1\x40\x2b\x80\x09\x9d\xca\x5c\xbc\x20\x70\x75\xc0"
"\x00\x00\x00\x00",
.iv = "\x01\x02\x03\x04\x05\x06\x07\x08",
.adata = "\xf3\x33\x88\x86\x00\x00\x00\x00\x00\x00\x4e\x91",
.plain = "\x49\x6e\x74\x65\x72\x6e\x65\x74\x2d\x44\x72\x61\x66\x74\x73\x20"
"\x61\x72\x65\x20\x64\x72\x61\x66\x74\x20\x64\x6f\x63\x75\x6d\x65"
"\x6e\x74\x73\x20\x76\x61\x6c\x69\x64\x20\x66\x6f\x72\x20\x61\x20"
"\x6d\x61\x78\x69\x6d\x75\x6d\x20\x6f\x66\x20\x73\x69\x78\x20\x6d"
"\x6f\x6e\x74\x68\x73\x20\x61\x6e\x64\x20\x6d\x61\x79\x20\x62\x65"
"\x20\x75\x70\x64\x61\x74\x65\x64\x2c\x20\x72\x65\x70\x6c\x61\x63"
"\x65\x64\x2c\x20\x6f\x72\x20\x6f\x62\x73\x6f\x6c\x65\x74\x65\x64"
"\x20\x62\x79\x20\x6f\x74\x68\x65\x72\x20\x64\x6f\x63\x75\x6d\x65"
"\x6e\x74\x73\x20\x61\x74\x20\x61\x6e\x79\x20\x74\x69\x6d\x65\x2e"
"\x20\x49\x74\x20\x69\x73\x20\x69\x6e\x61\x70\x70\x72\x6f\x70\x72"
"\x69\x61\x74\x65\x20\x74\x6f\x20\x75\x73\x65\x20\x49\x6e\x74\x65"
"\x72\x6e\x65\x74\x2d\x44\x72\x61\x66\x74\x73\x20\x61\x73\x20\x72"
"\x65\x66\x65\x72\x65\x6e\x63\x65\x20\x6d\x61\x74\x65\x72\x69\x61"
"\x6c\x20\x6f\x72\x20\x74\x6f\x20\x63\x69\x74\x65\x20\x74\x68\x65"
"\x6d\x20\x6f\x74\x68\x65\x72\x20\x74\x68\x61\x6e\x20\x61\x73\x20"
"\x2f\xe2\x80\x9c\x77\x6f\x72\x6b\x20\x69\x6e\x20\x70\x72\x6f\x67"
"\x72\x65\x73\x73\x2e\x2f\xe2\x80\x9d",
.cipher = "\x64\xa0\x86\x15\x75\x86\x1a\xf4\x60\xf0\x62\xc7\x9b\xe6\x43\xbd"
"\x5e\x80\x5c\xfd\x34\x5c\xf3\x89\xf1\x08\x67\x0a\xc7\x6c\x8c\xb2"
"\x4c\x6c\xfc\x18\x75\x5d\x43\xee\xa0\x9e\xe9\x4e\x38\x2d\x26\xb0"
"\xbd\xb7\xb7\x3c\x32\x1b\x01\x00\xd4\xf0\x3b\x7f\x35\x58\x94\xcf"
"\x33\x2f\x83\x0e\x71\x0b\x97\xce\x98\xc8\xa8\x4a\xbd\x0b\x94\x81"
"\x14\xad\x17\x6e\x00\x8d\x33\xbd\x60\xf9\x82\xb1\xff\x37\xc8\x55"
"\x97\x97\xa0\x6e\xf4\xf0\xef\x61\xc1\x86\x32\x4e\x2b\x35\x06\x38"
"\x36\x06\x90\x7b\x6a\x7c\x02\xb0\xf9\xf6\x15\x7b\x53\xc8\x67\xe4"
"\xb9\x16\x6c\x76\x7b\x80\x4d\x46\xa5\x9b\x52\x16\xcd\xe7\xa4\xe9"
"\x90\x40\xc5\xa4\x04\x33\x22\x5e\xe2\x82\xa1\xb0\xa0\x6c\x52\x3e"
"\xaf\x45\x34\xd7\xf8\x3f\xa1\x15\x5b\x00\x47\x71\x8c\xbc\x54\x6a"
"\x0d\x07\x2b\x04\xb3\x56\x4e\xea\x1b\x42\x22\x73\xf5\x48\x27\x1a"
"\x0b\xb2\x31\x60\x53\xfa\x76\x99\x19\x55\xeb\xd6\x31\x59\x43\x4e"
"\xce\xbb\x4e\x46\x6d\xae\x5a\x10\x73\xa6\x72\x76\x27\x09\x7a\x10"
"\x49\xe6\x17\xd9\x1d\x36\x10\x94\xfa\x68\xf0\xff\x77\x98\x71\x30"
"\x30\x5b\xea\xba\x2e\xda\x04\xdf\x99\x7b\x71\x4d\x6c\x6f\x2c\x29"
"\xa6\xad\x5c\xb4\x02\x2b\x02\x70\x9b\xee\xad\x9d\x67\x89\x0c\xbb"
"\x22\x39\x23\x36\xfe\xa1\x85\x1f\x38",
};
/**
* ESP example from draft-ietf-ipsecme-chacha20-poly1305-06
*/
aead_test_vector_t chacha20poly1305_2 = {
.alg = ENCR_CHACHA20_POLY1305, .key_size = 32, .salt_size = 4,
.len = 88, .alen = 8,
.key = "\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"
"\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"
"\xa0\xa1\xa2\xa3",
.iv = "\x10\x11\x12\x13\x14\x15\x16\x17",
.adata = "\x01\x02\x03\x04\x00\x00\x00\x05",
.plain = "\x45\x00\x00\x54\xa6\xf2\x00\x00\x40\x01\xe7\x78\xc6\x33\x64\x05"
"\xc0\x00\x02\x05\x08\x00\x5b\x7a\x3a\x08\x00\x00\x55\x3b\xec\x10"
"\x00\x07\x36\x27\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13"
"\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20\x21\x22\x23"
"\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f\x30\x31\x32\x33"
"\x34\x35\x36\x37\x01\x02\x02\x04",
.cipher = "\x24\x03\x94\x28\xb9\x7f\x41\x7e\x3c\x13\x75\x3a\x4f\x05\x08\x7b"
"\x67\xc3\x52\xe6\xa7\xfa\xb1\xb9\x82\xd4\x66\xef\x40\x7a\xe5\xc6"
"\x14\xee\x80\x99\xd5\x28\x44\xeb\x61\xaa\x95\xdf\xab\x4c\x02\xf7"
"\x2a\xa7\x1e\x7c\x4c\x4f\x64\xc9\xbe\xfe\x2f\xac\xc6\x38\xe8\xf3"
"\xcb\xec\x16\x3f\xac\x46\x9b\x50\x27\x73\xf6\xfb\x94\xe6\x64\xda"
"\x91\x65\xb8\x28\x29\xf6\x41\xe0\x76\xaa\xa8\x26\x6b\x7f\xb0\xf7"
"\xb1\x1b\x36\x99\x07\xe1\xad\x43",
};
/**
* IKEv2 example from draft-ietf-ipsecme-chacha20-poly1305-06
*/
aead_test_vector_t chacha20poly1305_3 = {
.alg = ENCR_CHACHA20_POLY1305, .key_size = 32, .salt_size = 4,
.len = 13, .alen = 32,
.key = "\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"
"\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"
"\xa0\xa1\xa2\xa3",
.iv = "\x10\x11\x12\x13\x14\x15\x16\x17",
.adata = "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"
"\x2e\x20\x25\x00\x00\x00\x00\x09\x00\x00\x00\x45\x29\x00\x00\x29",
.plain = "\x00\x00\x00\x0c\x00\x00\x40\x01\x00\x00\x00\x0a\x00",
.cipher = "\x61\x03\x94\x70\x1f\x8d\x01\x7f\x7c\x12\x92\x48\x89\x6b\x71\xbf"
"\xe2\x52\x36\xef\xd7\xcd\xc6\x70\x66\x90\x63\x15\xb2",
};
src/libstrongswan/tests/test_runner.c
+1 -1
View File
@@ -265,7 +265,7 @@ static bool pre_test(test_runner_init_t init, char *cfg)
*/
typedef struct {
char *name;
char msg[512 - sizeof(char*) - 2 * sizeof(int)];
char msg[4096 - sizeof(char*) - 2 * sizeof(int)];
const char *file;
int line;
int i;
src/libstrongswan/tests/test_suite.c
+1 -1
View File
@@ -27,7 +27,7 @@
/**
* Failure message buf
*/
static char failure_buf[512];
static char failure_buf[4096];
/**
* Source file failure occurred
src/libstrongswan/tests/tests.c
+2 -2
View File
@@ -25,8 +25,8 @@
static test_configuration_t tests[] = {
#define TEST_SUITE(x) \
{ .suite = x, },
#define TEST_SUITE_DEPEND(x, type, args) \
{ .suite = x, .feature = PLUGIN_DEPENDS(type, args) },
#define TEST_SUITE_DEPEND(x, type, ...) \
{ .suite = x, .feature = PLUGIN_DEPENDS(type, __VA_ARGS__) },
#include "tests.h"
{ .suite = NULL, }
};
src/libtls/tests/tls_tests.c
+2 -2
View File
@@ -25,8 +25,8 @@
static test_configuration_t tests[] = {
#define TEST_SUITE(x) \
{ .suite = x, },
#define TEST_SUITE_DEPEND(x, type, args) \
{ .suite = x, .feature = PLUGIN_DEPENDS(type, args) },
#define TEST_SUITE_DEPEND(x, type, ...) \
{ .suite = x, .feature = PLUGIN_DEPENDS(type, __VA_ARGS__) },
#include "tls_tests.h"
{ .suite = NULL, }
};
testing/config/kvm/moon.xml
+5
View File
@@ -10,6 +10,11 @@
<cmdline>root=/dev/vda1 loglevel=1 console=hvc0</cmdline>
<boot dev='hd'/>
</os>
<cpu>
<model fallback='allow'>core2duo</model>
<feature policy='optional' name='aes'/>
<feature policy='optional' name='pclmuldq'/>
</cpu>
<features>
<acpi/>
<apic/>
testing/config/kvm/sun.xml
+5
View File
@@ -10,6 +10,11 @@
<cmdline>root=/dev/vda1 loglevel=1 console=hvc0</cmdline>
<boot dev='hd'/>
</os>
<cpu>
<model fallback='allow'>core2duo</model>
<feature policy='optional' name='aes'/>
<feature policy='optional' name='pclmuldq'/>
</cpu>
<features>
<acpi/>
<apic/>
testing/scripts/build-guestkernel
+15 -9
View File
@@ -26,21 +26,27 @@ then
execute "wget -q $url"
fi
log_action "Unpacking kernel"
execute "tar xJf $KERNELTARBALL"
KERNELDIR=$BUILDDIR/$KERNEL
cd $KERNELDIR
if [ $KERNELPATCH ]
if [ ! -d "$KERNELDIR" ]
then
log_action "Applying kernel patch"
bzcat ../$KERNELPATCH | patch -p1 >>$LOGFILE 2>&1
log_status $?
[ $? -eq 0 ] || exit 1
log_action "Unpacking kernel"
execute "tar xJf $KERNELTARBALL"
if [ $KERNELPATCH ]
then
log_action "Applying kernel patch"
bzcat ../$KERNELPATCH | patch -p1 >>$LOGFILE 2>&1
log_status $?
[ $? -eq 0 ] || exit 1
fi
fi
execute "cp $KERNELCONFIG .config" 0
if [ ! -f .config ]
then
execute "cp $KERNELCONFIG .config" 0
fi
echo "Creating kernel configuration, you might get prompted for new parameters"
make oldconfig 2>&1 | tee -a $LOGFILE
testing/scripts/recipes/013_strongswan.mk
+1
View File
@@ -77,6 +77,7 @@ CONFIG_OPTS = \
--enable-ccm \
--enable-gcm \
--enable-cmac \
--enable-chapoly \
--enable-ha \
--enable-af-alg \
--enable-whitelist \