diff options
Diffstat (limited to 'src/crypto/aes')
| -rw-r--r-- | src/crypto/aes/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/crypto/aes/aes_test.cc | 102 | ||||
| -rwxr-xr-x | src/crypto/aes/asm/aes-586.pl | 6 | ||||
| -rw-r--r-- | src/crypto/aes/asm/aes-armv4.pl | 2 | ||||
| -rw-r--r-- | src/crypto/aes/asm/aesv8-armx.pl | 2 | ||||
| -rw-r--r-- | src/crypto/aes/asm/bsaes-armv7.pl | 2 |
6 files changed, 7 insertions, 118 deletions
diff --git a/src/crypto/aes/CMakeLists.txt b/src/crypto/aes/CMakeLists.txt index c82d99a..490f40a 100644 --- a/src/crypto/aes/CMakeLists.txt +++ b/src/crypto/aes/CMakeLists.txt @@ -1,4 +1,4 @@ -include_directories(../../include) +include_directories(. .. ../../include) if (${ARCH} STREQUAL "x86_64") set( @@ -60,12 +60,3 @@ perlasm(aesni-x86.${ASM_EXT} asm/aesni-x86.pl) perlasm(aes-armv4.${ASM_EXT} asm/aes-armv4.pl) perlasm(bsaes-armv7.${ASM_EXT} asm/bsaes-armv7.pl) perlasm(aesv8-armx.${ASM_EXT} asm/aesv8-armx.pl) - -add_executable( - aes_test - - aes_test.cc - $<TARGET_OBJECTS:test_support> -) - -target_link_libraries(aes_test crypto) diff --git a/src/crypto/aes/aes_test.cc b/src/crypto/aes/aes_test.cc deleted file mode 100644 index e488d81..0000000 --- a/src/crypto/aes/aes_test.cc +++ /dev/null @@ -1,102 +0,0 @@ -/* Copyright (c) 2015, Google Inc. - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - -#include <stdio.h> -#include <string.h> - -#include <openssl/aes.h> -#include <openssl/crypto.h> - - -static bool TestAES(const uint8_t *key, size_t key_len, - const uint8_t plaintext[AES_BLOCK_SIZE], - const uint8_t ciphertext[AES_BLOCK_SIZE]) { - AES_KEY aes_key; - if (AES_set_encrypt_key(key, key_len * 8, &aes_key) != 0) { - fprintf(stderr, "AES_set_encrypt_key failed\n"); - return false; - } - - // Test encryption. - uint8_t block[AES_BLOCK_SIZE]; - AES_encrypt(plaintext, block, &aes_key); - if (memcmp(block, ciphertext, AES_BLOCK_SIZE) != 0) { - fprintf(stderr, "AES_encrypt gave the wrong output\n"); - return false; - } - - // Test in-place encryption. - memcpy(block, plaintext, AES_BLOCK_SIZE); - AES_encrypt(block, block, &aes_key); - if (memcmp(block, ciphertext, AES_BLOCK_SIZE) != 0) { - fprintf(stderr, "AES_encrypt gave the wrong output\n"); - return false; - } - - if (AES_set_decrypt_key(key, key_len * 8, &aes_key) != 0) { - fprintf(stderr, "AES_set_decrypt_key failed\n"); - return false; - } - - // Test decryption. - AES_decrypt(ciphertext, block, &aes_key); - if (memcmp(block, plaintext, AES_BLOCK_SIZE) != 0) { - fprintf(stderr, "AES_decrypt gave the wrong output\n"); - return false; - } - - // Test in-place decryption. - memcpy(block, ciphertext, AES_BLOCK_SIZE); - AES_decrypt(block, block, &aes_key); - if (memcmp(block, plaintext, AES_BLOCK_SIZE) != 0) { - fprintf(stderr, "AES_decrypt gave the wrong output\n"); - return false; - } - return true; -} - -int main() { - CRYPTO_library_init(); - - // Test vectors from FIPS-197, Appendix C. - if (!TestAES((const uint8_t *)"\x00\x01\x02\x03\x04\x05\x06\x07" - "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f", - 128 / 8, - (const uint8_t *)"\x00\x11\x22\x33\x44\x55\x66\x77" - "\x88\x99\xaa\xbb\xcc\xdd\xee\xff", - (const uint8_t *)"\x69\xc4\xe0\xd8\x6a\x7b\x04\x30" - "\xd8\xcd\xb7\x80\x70\xb4\xc5\x5a") || - !TestAES((const uint8_t *)"\x00\x01\x02\x03\x04\x05\x06\x07" - "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f" - "\x10\x11\x12\x13\x14\x15\x16\x17", - 192 / 8, - (const uint8_t *)"\x00\x11\x22\x33\x44\x55\x66\x77" - "\x88\x99\xaa\xbb\xcc\xdd\xee\xff", - (const uint8_t *)"\xdd\xa9\x7c\xa4\x86\x4c\xdf\xe0" - "\x6e\xaf\x70\xa0\xec\x0d\x71\x91") || - !TestAES((const uint8_t *)"\x00\x01\x02\x03\x04\x05\x06\x07" - "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f" - "\x10\x11\x12\x13\x14\x15\x16\x17" - "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f", - 256 / 8, - (const uint8_t *)"\x00\x11\x22\x33\x44\x55\x66\x77" - "\x88\x99\xaa\xbb\xcc\xdd\xee\xff", - (const uint8_t *)"\x8e\xa2\xb7\xca\x51\x67\x45\xbf" - "\xea\xfc\x49\x90\x4b\x49\x60\x89")) { - return false; - } - - printf("PASS\n"); - return 0; -} diff --git a/src/crypto/aes/asm/aes-586.pl b/src/crypto/aes/asm/aes-586.pl index 6e8a6a8..07fb94c 100755 --- a/src/crypto/aes/asm/aes-586.pl +++ b/src/crypto/aes/asm/aes-586.pl @@ -45,7 +45,7 @@ # the undertaken effort was that it appeared that in tight IA-32 # register window little-endian flavor could achieve slightly higher # Instruction Level Parallelism, and it indeed resulted in up to 15% -# better performance on most recent µ-archs... +# better performance on most recent µ-archs... # # Third version adds AES_cbc_encrypt implementation, which resulted in # up to 40% performance imrovement of CBC benchmark results. 40% was @@ -224,7 +224,7 @@ sub _data_word() { my $i; while(defined($i=shift)) { &data_word($i,$i); } } $speed_limit=512; # chunks smaller than $speed_limit are # processed with compact routine in CBC mode $small_footprint=1; # $small_footprint=1 code is ~5% slower [on - # recent µ-archs], but ~5 times smaller! + # recent µ-archs], but ~5 times smaller! # I favor compact code to minimize cache # contention and in hope to "collect" 5% back # in real-life applications... @@ -565,7 +565,7 @@ sub enctransform() # Performance is not actually extraordinary in comparison to pure # x86 code. In particular encrypt performance is virtually the same. # Decrypt performance on the other hand is 15-20% better on newer -# µ-archs [but we're thankful for *any* improvement here], and ~50% +# µ-archs [but we're thankful for *any* improvement here], and ~50% # better on PIII:-) And additionally on the pros side this code # eliminates redundant references to stack and thus relieves/ # minimizes the pressure on the memory bus. diff --git a/src/crypto/aes/asm/aes-armv4.pl b/src/crypto/aes/asm/aes-armv4.pl index 882017a..36cd3b6 100644 --- a/src/crypto/aes/asm/aes-armv4.pl +++ b/src/crypto/aes/asm/aes-armv4.pl @@ -65,7 +65,7 @@ $rounds="r12"; $code=<<___; #if defined(__arm__) #ifndef __KERNEL__ -# include <openssl/arm_arch.h> +# include "arm_arch.h" #else # define __ARM_ARCH__ __LINUX_ARM_ARCH__ #endif diff --git a/src/crypto/aes/asm/aesv8-armx.pl b/src/crypto/aes/asm/aesv8-armx.pl index 121154a..b0916f6 100644 --- a/src/crypto/aes/asm/aesv8-armx.pl +++ b/src/crypto/aes/asm/aesv8-armx.pl @@ -45,7 +45,7 @@ open OUT,"| \"$^X\" $xlate $flavour $output"; $prefix="aes_v8"; $code=<<___; -#include <openssl/arm_arch.h> +#include "arm_arch.h" #if __ARM_MAX_ARCH__>=7 .text diff --git a/src/crypto/aes/asm/bsaes-armv7.pl b/src/crypto/aes/asm/bsaes-armv7.pl index 7fe349a..273f0b9 100644 --- a/src/crypto/aes/asm/bsaes-armv7.pl +++ b/src/crypto/aes/asm/bsaes-armv7.pl @@ -703,7 +703,7 @@ ___ $code.=<<___; #if defined(__arm__) #ifndef __KERNEL__ -# include <openssl/arm_arch.h> +# include "arm_arch.h" # define VFP_ABI_PUSH vstmdb sp!,{d8-d15} # define VFP_ABI_POP vldmia sp!,{d8-d15} |