diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2010-02-15 19:20:13 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2010-02-15 19:20:13 +0000 |
| commit | 79cfc3ac546565914426ff397a73f2f7ca36ff51 (patch) | |
| tree | fd4cfec534a53dd9746314fdc078f14e57e09226 /crypto/evp/evp_locl.h | |
| parent | 918a5d04e4877af15ed5ffb71f4deba560276c0d (diff) | |
add EVP_CIPH_FLAG_LENGTH_BITS from 0.9.8-stable
Diffstat (limited to 'crypto/evp/evp_locl.h')
| -rw-r--r-- | crypto/evp/evp_locl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/evp/evp_locl.h b/crypto/evp/evp_locl.h index 4cb80fbde0..3f6ac7e65c 100644 --- a/crypto/evp/evp_locl.h +++ b/crypto/evp/evp_locl.h @@ -115,7 +115,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?chunk*8:chunk), &((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) ?inl*8:inl), &((kstruct *)ctx->cipher_data)->ksched, ctx->iv, &ctx->num, ctx->encrypt);\ inl-=chunk;\ in +=chunk;\ out+=chunk;\ |