Commit 1d7d7f97 authored by Niels Möller's avatar Niels Möller
Browse files

(crypto_aes128_cbc_algorithm): New algorithm.

(crypto_aes128_ctr_algorithm): Likewise.

Rev: src/crypto.c:1.42
Rev: src/crypto.h:1.40
parent fbdce667
...@@ -161,14 +161,9 @@ make_aes_cbc_instance(struct crypto_algorithm *algorithm, int mode, ...@@ -161,14 +161,9 @@ make_aes_cbc_instance(struct crypto_algorithm *algorithm, int mode,
return(&self->super); return(&self->super);
} }
#if 0
struct crypto_algorithm crypto_aes128_cbc_algorithm = struct crypto_algorithm crypto_aes128_cbc_algorithm =
{ STATIC_HEADER, AES_BLOCK_SIZE, 16, AES_BLOCK_SIZE, make_aes_cbc_instance}; { STATIC_HEADER, AES_BLOCK_SIZE, 16, AES_BLOCK_SIZE, make_aes_cbc_instance};
struct crypto_algorithm crypto_aes192_cbc_algorithm =
{ STATIC_HEADER, AES_BLOCK_SIZE, 24, AES_BLOCK_SIZE, make_aes_cbc_instance};
#endif
struct crypto_algorithm crypto_aes256_cbc_algorithm = struct crypto_algorithm crypto_aes256_cbc_algorithm =
{ STATIC_HEADER, AES_BLOCK_SIZE, 32, AES_BLOCK_SIZE, make_aes_cbc_instance}; { STATIC_HEADER, AES_BLOCK_SIZE, 32, AES_BLOCK_SIZE, make_aes_cbc_instance};
...@@ -210,6 +205,9 @@ make_aes_ctr_instance(struct crypto_algorithm *algorithm, int mode UNUSED, ...@@ -210,6 +205,9 @@ make_aes_ctr_instance(struct crypto_algorithm *algorithm, int mode UNUSED,
return(&self->super); return(&self->super);
} }
struct crypto_algorithm crypto_aes128_ctr_algorithm =
{ STATIC_HEADER, AES_BLOCK_SIZE, 16, AES_BLOCK_SIZE, make_aes_ctr_instance};
struct crypto_algorithm crypto_aes256_ctr_algorithm = struct crypto_algorithm crypto_aes256_ctr_algorithm =
{ STATIC_HEADER, AES_BLOCK_SIZE, 32, AES_BLOCK_SIZE, make_aes_ctr_instance}; { STATIC_HEADER, AES_BLOCK_SIZE, 32, AES_BLOCK_SIZE, make_aes_ctr_instance};
......
...@@ -77,6 +77,8 @@ struct kexinit_state; ...@@ -77,6 +77,8 @@ struct kexinit_state;
#define MAKE_DECRYPT(crypto, key, iv) \ #define MAKE_DECRYPT(crypto, key, iv) \
MAKE_CRYPT((crypto), CRYPTO_DECRYPT, (key), (iv)) MAKE_CRYPT((crypto), CRYPTO_DECRYPT, (key), (iv))
extern struct crypto_algorithm crypto_aes128_cbc_algorithm;
extern struct crypto_algorithm crypto_aes128_ctr_algorithm;
extern struct crypto_algorithm crypto_aes256_cbc_algorithm; extern struct crypto_algorithm crypto_aes256_cbc_algorithm;
extern struct crypto_algorithm crypto_aes256_ctr_algorithm; extern struct crypto_algorithm crypto_aes256_ctr_algorithm;
extern struct crypto_algorithm crypto_arcfour_algorithm; extern struct crypto_algorithm crypto_arcfour_algorithm;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment