From 010c2cb45635eb7518d248366cd3ed5c5aad6876 Mon Sep 17 00:00:00 2001 From: Jaeden Amero Date: Tue, 29 May 2018 17:00:47 +0100 Subject: [PATCH] gf128mul: Inline instead of making a new module --- include/mbedtls/gf128mul.h | 46 ------------------------ library/CMakeLists.txt | 1 - library/aes.c | 59 +++++++++++++++++++++++++++--- library/gf128mul.c | 73 -------------------------------------- 4 files changed, 55 insertions(+), 124 deletions(-) delete mode 100644 include/mbedtls/gf128mul.h delete mode 100644 library/gf128mul.c diff --git a/include/mbedtls/gf128mul.h b/include/mbedtls/gf128mul.h deleted file mode 100644 index 33d06eaaa..000000000 --- a/include/mbedtls/gf128mul.h +++ /dev/null @@ -1,46 +0,0 @@ -/** - * \file gf128mul.h - * - * \brief Fast multiplication in GF(128) - * - * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved - * SPDX-License-Identifier: Apache-2.0 - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * This file is part of mbed TLS (https://tls.mbed.org) - */ -#ifndef MBEDTLS_GF128MUL_H -#define MBEDTLS_GF128MUL_H - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief Big-Endian definition for 128 bits elements - */ -typedef unsigned char mbedtls_be128[16]; - -/** - * \brief Multiplication in GF(128): - * r = x times x^4 times x^8 in GF(2^128) - * - * \param x the 128-bits number you want to multiply - * \param r result - */ -void mbedtls_gf128mul_x_ble(mbedtls_be128 r, const mbedtls_be128 x); - - - -#endif /* gf128mul.h */ \ No newline at end of file diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 03d3f6c65..60fa7f8f3 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -29,7 +29,6 @@ set(src_crypto entropy_poll.c error.c gcm.c - gf128mul.c havege.c hkdf.c hmac_drbg.c diff --git a/library/aes.c b/library/aes.c index 95386dfb2..c7af22ad8 100644 --- a/library/aes.c +++ b/library/aes.c @@ -44,10 +44,6 @@ #include "mbedtls/aesni.h" #endif -#if defined(MBEDTLS_CIPHER_MODE_XEX) || defined(MBEDTLS_CIPHER_MODE_XTS) -#include "mbedtls/gf128mul.h" -#endif - #if defined(MBEDTLS_SELF_TEST) #if defined(MBEDTLS_PLATFORM_C) #include "mbedtls/platform.h" @@ -1046,6 +1042,61 @@ first: #endif /* MBEDTLS_CIPHER_MODE_XEX */ #if defined(MBEDTLS_CIPHER_MODE_XTS) + +/* Endianess with 64 bits values */ +#ifndef GET_UINT64_LE +#define GET_UINT64_LE(n,b,i) \ +{ \ + (n) = ( (uint64_t) (b)[(i) + 7] << 56 ) \ + | ( (uint64_t) (b)[(i) + 6] << 48 ) \ + | ( (uint64_t) (b)[(i) + 5] << 40 ) \ + | ( (uint64_t) (b)[(i) + 4] << 32 ) \ + | ( (uint64_t) (b)[(i) + 3] << 24 ) \ + | ( (uint64_t) (b)[(i) + 2] << 16 ) \ + | ( (uint64_t) (b)[(i) + 1] << 8 ) \ + | ( (uint64_t) (b)[(i) ] ); \ +} +#endif + +#ifndef PUT_UINT64_LE +#define PUT_UINT64_LE(n,b,i) \ +{ \ + (b)[(i) + 7] = (unsigned char) ( (n) >> 56 ); \ + (b)[(i) + 6] = (unsigned char) ( (n) >> 48 ); \ + (b)[(i) + 5] = (unsigned char) ( (n) >> 40 ); \ + (b)[(i) + 4] = (unsigned char) ( (n) >> 32 ); \ + (b)[(i) + 3] = (unsigned char) ( (n) >> 24 ); \ + (b)[(i) + 2] = (unsigned char) ( (n) >> 16 ); \ + (b)[(i) + 1] = (unsigned char) ( (n) >> 8 ); \ + (b)[(i) ] = (unsigned char) ( (n) ); \ +} +#endif + +typedef unsigned char mbedtls_be128[16]; + +/* + * GF(2^128) multiplication function + * + * This function multiplies a field element by x, by x^4 and by x^8 in the + * polynomial field representation. It uses 64-bit word operations to gain + * speed but compensates for machine endianess and hence works correctly on + * both big and little endian machines. + */ +static void mbedtls_gf128mul_x_ble( unsigned char r[16], + const unsigned char x[16]) +{ + uint64_t a, b, ra, rb; + + GET_UINT64_LE(a, x, 0); + GET_UINT64_LE(b, x, 8); + + ra = (a << 1) ^ 0x0087 >> ( 8 - ( ( b >> 63 ) << 3 ) ); + rb = (a >> 63) | (b << 1); + + PUT_UINT64_LE(ra, r, 0); + PUT_UINT64_LE(rb, r, 8); +} + /* * AES-XTS buffer encryption/decryption */ diff --git a/library/gf128mul.c b/library/gf128mul.c deleted file mode 100644 index 661d0d3cd..000000000 --- a/library/gf128mul.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - * GF(2^128) multiplication functions - * - * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved - * SPDX-License-Identifier: Apache-2.0 - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * This file is part of mbed TLS (https://tls.mbed.org) - */ -#include - -#include "mbedtls/gf128mul.h" - -/* Endianess with 64 bits values */ -#ifndef GET_UINT64_LE -#define GET_UINT64_LE(n,b,i) \ -{ \ - (n) = ( (uint64_t) (b)[(i) + 7] << 56 ) \ - | ( (uint64_t) (b)[(i) + 6] << 48 ) \ - | ( (uint64_t) (b)[(i) + 5] << 40 ) \ - | ( (uint64_t) (b)[(i) + 4] << 32 ) \ - | ( (uint64_t) (b)[(i) + 3] << 24 ) \ - | ( (uint64_t) (b)[(i) + 2] << 16 ) \ - | ( (uint64_t) (b)[(i) + 1] << 8 ) \ - | ( (uint64_t) (b)[(i) ] ); \ -} -#endif - -#ifndef PUT_UINT64_LE -#define PUT_UINT64_LE(n,b,i) \ -{ \ - (b)[(i) + 7] = (unsigned char) ( (n) >> 56 ); \ - (b)[(i) + 6] = (unsigned char) ( (n) >> 48 ); \ - (b)[(i) + 5] = (unsigned char) ( (n) >> 40 ); \ - (b)[(i) + 4] = (unsigned char) ( (n) >> 32 ); \ - (b)[(i) + 3] = (unsigned char) ( (n) >> 24 ); \ - (b)[(i) + 2] = (unsigned char) ( (n) >> 16 ); \ - (b)[(i) + 1] = (unsigned char) ( (n) >> 8 ); \ - (b)[(i) ] = (unsigned char) ( (n) ); \ -} -#endif - -/* - * This function multiply a field element by x, by x^4 and by x^8 - * in the polynomial field representation. It uses 64-bit word operations - * to gain speed but compensates for machine endianess and hence works - * correctly on both styles of machine. - */ -void mbedtls_gf128mul_x_ble(mbedtls_be128 r, const mbedtls_be128 x) -{ - uint64_t a, b, ra, rb; - - GET_UINT64_LE(a, x, 0); - GET_UINT64_LE(b, x, 8); - - ra = (a << 1) ^ 0x0087 >> ( 8 - ( ( b >> 63 ) << 3 ) ); - rb = (a >> 63) | (b << 1); - - PUT_UINT64_LE(ra, r, 0); - PUT_UINT64_LE(rb, r, 8); -} -