diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-12-17 21:34:32 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2008-01-11 08:16:41 +1100 |
| commit | 5311f248b7764ba8b59e6d477355f766e5609686 (patch) | |
| tree | 228910c68fc3d29a6bfe82cccfdc042e4003ebd2 /crypto/gcm.c | |
| parent | 653ebd9c8510a7d647ed23e66e1338f848ebdbab (diff) | |
| download | linux-3.10-5311f248b7764ba8b59e6d477355f766e5609686.tar.gz linux-3.10-5311f248b7764ba8b59e6d477355f766e5609686.tar.bz2 linux-3.10-5311f248b7764ba8b59e6d477355f766e5609686.zip | |
[CRYPTO] ctr: Refactor into ctr and rfc3686
As discussed previously, this patch moves the basic CTR functionality
into a chainable algorithm called ctr. The IPsec-specific variant of
it is now placed on top with the name rfc3686.
So ctr(aes) gives a chainable cipher with IV size 16 while the IPsec
variant will be called rfc3686(ctr(aes)). This patch also adjusts
gcm accordingly.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/gcm.c')
| -rw-r--r-- | crypto/gcm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crypto/gcm.c b/crypto/gcm.c index 08183171913..c54d478948a 100644 --- a/crypto/gcm.c +++ b/crypto/gcm.c @@ -160,7 +160,7 @@ static void crypto_gcm_ghash_final_xor(struct crypto_gcm_ghash_ctx *ctx, static inline void crypto_gcm_set_counter(u8 *counterblock, u32 value) { - *((u32 *)&counterblock[12]) = cpu_to_be32(value); + *((u32 *)&counterblock[12]) = cpu_to_be32(value + 1); } static int crypto_gcm_encrypt_counter(struct crypto_aead *aead, u8 *block, @@ -400,9 +400,8 @@ static struct crypto_instance *crypto_gcm_alloc(struct rtattr **tb) return inst; inst = ERR_PTR(ENAMETOOLONG); - if (snprintf( - ctr_name, CRYPTO_MAX_ALG_NAME, - "ctr(%s,0,16,4)", cipher->cra_name) >= CRYPTO_MAX_ALG_NAME) + if (snprintf(ctr_name, CRYPTO_MAX_ALG_NAME, "ctr(%s)", + cipher->cra_name) >= CRYPTO_MAX_ALG_NAME) return inst; ctr = crypto_alg_mod_lookup(ctr_name, CRYPTO_ALG_TYPE_BLKCIPHER, |