X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=crypto%2Fdes.c;h=1df3a714fa47fa5e0b3362281556b0b14a94ed99;hb=03feb0524660bcd890674d11d29a1873ca14d13c;hp=a9d3c235a6af969447848e3832d018f055f8a262;hpb=d7fa2589bbe7ab53fd5eb20e8c7e388d5aff6f16;p=powerpc.git diff --git a/crypto/des.c b/crypto/des.c index a9d3c235a6..1df3a714fa 100644 --- a/crypto/des.c +++ b/crypto/des.c @@ -784,9 +784,10 @@ static void dkey(u32 *pe, const u8 *k) } static int des_setkey(struct crypto_tfm *tfm, const u8 *key, - unsigned int keylen, u32 *flags) + unsigned int keylen) { struct des_ctx *dctx = crypto_tfm_ctx(tfm); + u32 *flags = &tfm->crt_flags; u32 tmp[DES_EXPKEY_WORDS]; int ret; @@ -864,11 +865,12 @@ static void des_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) * */ static int des3_ede_setkey(struct crypto_tfm *tfm, const u8 *key, - unsigned int keylen, u32 *flags) + unsigned int keylen) { const u32 *K = (const u32 *)key; struct des3_ede_ctx *dctx = crypto_tfm_ctx(tfm); u32 *expkey = dctx->expkey; + u32 *flags = &tfm->crt_flags; if (unlikely(!((K[0] ^ K[2]) | (K[1] ^ K[3])) || !((K[2] ^ K[4]) | (K[3] ^ K[5]))))