diff options
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 * | |||
340 | AddRoundKey(astate, RoundKey); | 340 | AddRoundKey(astate, RoundKey); |
341 | } | 341 | } |
342 | 342 | ||
343 | #if 0 // UNUSED | 343 | void FAST_FUNC aes_setkey(struct tls_aes *aes, const void *key, unsigned key_len) |
344 | static void aes_encrypt_one_block(unsigned rounds, const uint32_t *RoundKey, const void *data, void *dst) | 344 | { |
345 | aes->rounds = KeyExpansion(aes->key, key, key_len); | ||
346 | } | ||
347 | |||
348 | void FAST_FUNC aes_encrypt_one_block(struct tls_aes *aes, const void *data, void *dst) | ||
345 | { | 349 | { |
346 | unsigned astate[16]; | 350 | unsigned astate[16]; |
347 | unsigned i; | 351 | unsigned i; |
@@ -351,13 +355,12 @@ static void aes_encrypt_one_block(unsigned rounds, const uint32_t *RoundKey, con | |||
351 | 355 | ||
352 | for (i = 0; i < 16; i++) | 356 | for (i = 0; i < 16; i++) |
353 | astate[i] = pt[i]; | 357 | astate[i] = pt[i]; |
354 | aes_encrypt_1(astate, rounds, RoundKey); | 358 | aes_encrypt_1(astate, aes->rounds, aes->key); |
355 | for (i = 0; i < 16; i++) | 359 | for (i = 0; i < 16; i++) |
356 | ct[i] = astate[i]; | 360 | ct[i] = astate[i]; |
357 | } | 361 | } |
358 | #endif | ||
359 | 362 | ||
360 | void aes_cbc_encrypt(const void *key, int klen, void *iv, const void *data, size_t len, void *dst) | 363 | void FAST_FUNC aes_cbc_encrypt(const void *key, int klen, void *iv, const void *data, size_t len, void *dst) |
361 | { | 364 | { |
362 | uint32_t RoundKey[60]; | 365 | uint32_t RoundKey[60]; |
363 | uint8_t iv2[16]; | 366 | uint8_t iv2[16]; |
@@ -420,7 +423,7 @@ static void aes_decrypt_one_block(unsigned rounds, const uint32_t *RoundKey, con | |||
420 | } | 423 | } |
421 | #endif | 424 | #endif |
422 | 425 | ||
423 | void aes_cbc_decrypt(const void *key, int klen, void *iv, const void *data, size_t len, void *dst) | 426 | void FAST_FUNC aes_cbc_decrypt(const void *key, int klen, void *iv, const void *data, size_t len, void *dst) |
424 | { | 427 | { |
425 | uint32_t RoundKey[60]; | 428 | uint32_t RoundKey[60]; |
426 | uint8_t iv2[16]; | 429 | uint8_t iv2[16]; |