diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2013-10-23 18:36:10 +0300 |
|---|---|---|
| committer | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2013-10-23 18:36:10 +0300 |
| commit | 2fd83faa876d0be91ab7884b1a9eaa7793559eb9 (patch) | |
| tree | bb0111c6e9c86ad003aac73764a726b406629265 /cipher/camellia-glue.c | |
| parent | 0b39fce7e3ce6761d6bd5195d093ec6857edb7c2 (diff) | |
| download | libgcrypt-2fd83faa876d0be91ab7884b1a9eaa7793559eb9.tar.gz | |
Enable assembler optimizations on earlier ARM cores
* cipher/blowfish-armv6.S => cipher/blowfish-arm.S: adapt to pre-armv6 CPUs.
* cipher/blowfish.c: enable assembly on armv4/armv5 little-endian CPUs.
* cipher/camellia-armv6.S => cipher/camellia-arm.S: adapt to pre-armv6 CPUs.
* cipher/camellia.c, cipher-camellia-glue.c: enable assembly on armv4/armv5
little-endian CPUs.
* cipher/cast5-armv6.S => cipher/cast5-arm.S: adapt to pre-armv6 CPUs.
* cipher/cast5.c: enable assembly on armv4/armv5 little-endian CPUs.
* cipher/rijndael-armv6.S => cipher/rijndael-arm.S: adapt to pre-armv6 CPUs.
* cipher/rijndael.c: enable assembly on armv4/armv5 little-endian CPUs.
* cipher/twofish-armv6.S => cipher/twofish-arm.S: adapt to pre-armv6 CPUs.
* cipher/twofish.c: enable assembly on armv4/armv5 little-endian CPUs.
--
Our ARMv6 assembly optimized code can be easily adapted to earlier CPUs.
The only incompatible place is rev instruction used to do byte swapping.
Replace it on <= ARMv6 with a series of 4 instructions.
Compare:
ECB/Stream CBC CFB OFB CTR
--------------- --------------- --------------- --------------- ---------------
AES 620ms 610ms 650ms 680ms 620ms 630ms 660ms 660ms 630ms 630ms
CAMELLIA128 720ms 720ms 780ms 790ms 770ms 760ms 780ms 780ms 770ms 760ms
CAMELLIA256 910ms 910ms 970ms 970ms 960ms 950ms 970ms 970ms 960ms 950ms
CAST5 820ms 820ms 930ms 920ms 890ms 860ms 930ms 920ms 880ms 890ms
BLOWFISH 550ms 560ms 650ms 660ms 630ms 600ms 660ms 650ms 610ms 620ms
ECB/Stream CBC CFB OFB CTR
--------------- --------------- --------------- --------------- ---------------
AES 130ms 140ms 180ms 200ms 160ms 170ms 190ms 200ms 170ms 170ms
CAMELLIA128 150ms 160ms 210ms 220ms 200ms 190ms 210ms 220ms 190ms 190ms
CAMELLIA256 180ms 180ms 260ms 240ms 240ms 230ms 250ms 250ms 230ms 230ms
CAST5 170ms 160ms 270ms 120ms 240ms 130ms 260ms 270ms 130ms 120ms
BLOWFISH 160ms 150ms 260ms 110ms 230ms 120ms 250ms 260ms 110ms 120ms
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
[ jk: in camellia.h and twofish.c, USE_ARMV6_ASM => USE_ARM_ASM ]
[ jk: fix blowfish-arm.S when __ARM_FEATURE_UNALIGNED defined ]
[ jk: in twofish.S remove defined(HAVE_ARM_ARCH_V6) ]
[ jk: ARMv6 => ARM in comments ]
Diffstat (limited to 'cipher/camellia-glue.c')
| -rw-r--r-- | cipher/camellia-glue.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cipher/camellia-glue.c b/cipher/camellia-glue.c index 29cb7a55..e6d40298 100644 --- a/cipher/camellia-glue.c +++ b/cipher/camellia-glue.c @@ -193,14 +193,14 @@ camellia_setkey(void *c, const byte *key, unsigned keylen) return 0; } -#ifdef USE_ARMV6_ASM +#ifdef USE_ARM_ASM /* Assembly implementations of CAST5. */ -extern void _gcry_camellia_armv6_encrypt_block(const KEY_TABLE_TYPE keyTable, +extern void _gcry_camellia_arm_encrypt_block(const KEY_TABLE_TYPE keyTable, byte *outbuf, const byte *inbuf, const int keybits); -extern void _gcry_camellia_armv6_decrypt_block(const KEY_TABLE_TYPE keyTable, +extern void _gcry_camellia_arm_decrypt_block(const KEY_TABLE_TYPE keyTable, byte *outbuf, const byte *inbuf, const int keybits); @@ -209,7 +209,7 @@ static void Camellia_EncryptBlock(const int keyBitLength, const KEY_TABLE_TYPE keyTable, unsigned char *cipherText) { - _gcry_camellia_armv6_encrypt_block(keyTable, cipherText, plaintext, + _gcry_camellia_arm_encrypt_block(keyTable, cipherText, plaintext, keyBitLength); } @@ -218,7 +218,7 @@ static void Camellia_DecryptBlock(const int keyBitLength, const KEY_TABLE_TYPE keyTable, unsigned char *plaintext) { - _gcry_camellia_armv6_decrypt_block(keyTable, plaintext, cipherText, + _gcry_camellia_arm_decrypt_block(keyTable, plaintext, cipherText, keyBitLength); } @@ -240,7 +240,7 @@ camellia_decrypt(void *c, byte *outbuf, const byte *inbuf) return /*burn_stack*/ (CAMELLIA_decrypt_stack_burn_size); } -#else /*USE_ARMV6_ASM*/ +#else /*USE_ARM_ASM*/ static unsigned int camellia_encrypt(void *c, byte *outbuf, const byte *inbuf) @@ -276,7 +276,7 @@ camellia_decrypt(void *c, byte *outbuf, const byte *inbuf) return /*burn_stack*/ (CAMELLIA_decrypt_stack_burn_size); } -#endif /*!USE_ARMV6_ASM*/ +#endif /*!USE_ARM_ASM*/ /* Bulk encryption of complete blocks in CTR mode. This function is only intended for the bulk encryption feature of cipher.c. CTR is expected to be |