Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

[linux-2.6] / crypto / ctr.c

diff --git a/crypto/ctr.c b/crypto/ctr.c
index 1052b318aed2b7c45b28981c80ade33378d58a22..2d7425f0e7b816d9c236aae7bc635ab8f9145888 100644 (file)
--- a/crypto/ctr.c
+++ b/crypto/ctr.c
@@ -361,6 +361,8 @@ static struct crypto_instance *crypto_rfc3686_alloc(struct rtattr **tb)
        inst->alg.cra_blkcipher.max_keysize = alg->cra_blkcipher.max_keysize
                                              + CTR_RFC3686_NONCE_SIZE;
 
+       inst->alg.cra_blkcipher.geniv = "seqiv";
+
        inst->alg.cra_ctxsize = sizeof(struct crypto_rfc3686_ctx);
 
        inst->alg.cra_init = crypto_rfc3686_init_tfm;