Commit c03db40d authored by Bernd Edlinger's avatar Bernd Edlinger
Browse files

Fix some bugs with the cfb1 bitsize handling 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5450)
parent 16a345e5

crypto/evp/e_aes.c

+2 −0
Original line number Diff line number Diff line
@@ -1089,6 +1089,8 @@ static int aes_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, 
        CRYPTO_cfb128_1_encrypt(in, out, MAXBITCHUNK * 8, &dat->ks,

                                ctx->iv, &ctx->num, ctx->encrypt, dat->block);

        len -= MAXBITCHUNK;

        out += MAXBITCHUNK;

        in  += MAXBITCHUNK;

    }

    if (len)

        CRYPTO_cfb128_1_encrypt(in, out, len * 8, &dat->ks,

crypto/evp/e_camellia.c

+2 −0
Original line number Diff line number Diff line
@@ -356,6 +356,8 @@ static int camellia_cfb1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, 
        CRYPTO_cfb128_1_encrypt(in, out, MAXBITCHUNK * 8, &dat->ks,

                                ctx->iv, &ctx->num, ctx->encrypt, dat->block);

        len -= MAXBITCHUNK;

        out += MAXBITCHUNK;

        in  += MAXBITCHUNK;

    }

    if (len)

        CRYPTO_cfb128_1_encrypt(in, out, len * 8, &dat->ks,

crypto/evp/evp_locl.h

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int cname##_cfb##cbits##_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, 
        if (inl<chunk) chunk=inl;\

        while(inl && inl>=chunk)\

            {\

            cprefix##_cfb##cbits##_encrypt(in, out, (long)((cbits==1) && !(ctx->flags & EVP_CIPH_FLAG_LENGTH_BITS) ?inl*8:inl), &((kstruct *)ctx->cipher_data)->ksched, ctx->iv, &ctx->num, ctx->encrypt);\

            cprefix##_cfb##cbits##_encrypt(in, out, (long)((cbits==1) && !(ctx->flags & EVP_CIPH_FLAG_LENGTH_BITS) ?chunk*8:chunk), &((kstruct *)ctx->cipher_data)->ksched, ctx->iv, &ctx->num, ctx->encrypt);\

            inl-=chunk;\

            in +=chunk;\

            out+=chunk;\