diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-11-23 17:21:38 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-11-23 17:48:07 +0100 |
| commit | 83e5c627e1b2c7f34d694696d0c3d5a3ce25dc59 (patch) | |
| tree | 3bdffe7c29ee5213ba4278da9b0ee116c2806d78 /networking/tls_aes.c | |
| parent | 03ad7ae08189ed88dd7e0fcb6c6001fbf3b12efb (diff) | |
tls: add support for TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 cipher
function old new delta
xwrite_encrypted 209 605 +396
GHASH - 395 +395
aes_encrypt_1 - 382 +382
GMULT - 192 +192
tls_xread_record 489 659 +170
aes_encrypt_one_block - 65 +65
aesgcm_setkey - 58 +58
FlattenSzInBits - 52 +52
tls_handshake 1890 1941 +51
xwrite_and_update_handshake_hash 46 81 +35
xorbuf - 24 +24
aes_setkey - 16 +16
psRsaEncryptPub 413 421 +8
stty_main 1221 1227 +6
ssl_client_main 138 143 +5
next_token 841 845 +4
spawn_ssl_client 218 219 +1
volume_id_probe_hfs_hfsplus 564 563 -1
read_package_field 232 230 -2
i2cdetect_main 674 672 -2
fail_hunk 139 136 -3
parse_expr 891 883 -8
curve25519 802 793 -9
aes_cbc_decrypt 971 958 -13
xwrite_handshake_record 43 - -43
aes_cbc_encrypt 644 172 -472
------------------------------------------------------------------------------
(add/remove: 9/1 grow/shrink: 9/8 up/down: 1860/-553) Total: 1307 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/tls_aes.c')
| -rw-r--r-- | networking/tls_aes.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/networking/tls_aes.c b/networking/tls_aes.c index c137442e9..4d2b68975 100644 --- a/networking/tls_aes.c +++ b/networking/tls_aes.c @@ -340,8 +340,12 @@ static void aes_encrypt_1(unsigned astate[16], unsigned rounds, const uint32_t * AddRoundKey(astate, RoundKey); } -#if 0 // UNUSED -static void aes_encrypt_one_block(unsigned rounds, const uint32_t *RoundKey, const void *data, void *dst) +void FAST_FUNC aes_setkey(struct tls_aes *aes, const void *key, unsigned key_len) +{ + aes->rounds = KeyExpansion(aes->key, key, key_len); +} + +void FAST_FUNC aes_encrypt_one_block(struct tls_aes *aes, const void *data, void *dst) { unsigned astate[16]; unsigned i; @@ -351,13 +355,12 @@ static void aes_encrypt_one_block(unsigned rounds, const uint32_t *RoundKey, con for (i = 0; i < 16; i++) astate[i] = pt[i]; - aes_encrypt_1(astate, rounds, RoundKey); + aes_encrypt_1(astate, aes->rounds, aes->key); for (i = 0; i < 16; i++) ct[i] = astate[i]; } -#endif -void aes_cbc_encrypt(const void *key, int klen, void *iv, const void *data, size_t len, void *dst) +void FAST_FUNC aes_cbc_encrypt(const void *key, int klen, void *iv, const void *data, size_t len, void *dst) { uint32_t RoundKey[60]; uint8_t iv2[16]; @@ -420,7 +423,7 @@ static void aes_decrypt_one_block(unsigned rounds, const uint32_t *RoundKey, con } #endif -void aes_cbc_decrypt(const void *key, int klen, void *iv, const void *data, size_t len, void *dst) +void FAST_FUNC aes_cbc_decrypt(const void *key, int klen, void *iv, const void *data, size_t len, void *dst) { uint32_t RoundKey[60]; uint8_t iv2[16]; |