diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2000-05-27 03:51:35 +0400 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2000-05-27 03:51:35 +0400 |
| commit | 7f0606016cbbec917b1fe094b84b062e87abe7da (patch) | |
| tree | 7238920f63ab28f7babc823ca9e8f18903e25192 /crypto/evp/e_cbc_bf.c | |
| parent | 7b224903f4d4e2c74d1548b6f0ca8b0ba31113ad (diff) | |
Beginnings of EVP cipher overhaul. This should eventually
enhance and tidy up the EVP interface.
This patch adds initial support for variable length ciphers
and changes S/MIME code to use this.
Some other library functions need modifying to support use
of modified cipher parameters.
Also need to change all the cipher functions that should
return error codes, but currenly don't.
And of course it needs extensive testing...
Diffstat (limited to 'crypto/evp/e_cbc_bf.c')
| -rw-r--r-- | crypto/evp/e_cbc_bf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/evp/e_cbc_bf.c b/crypto/evp/e_cbc_bf.c index 9bcba3c516..489e63041d 100644 --- a/crypto/evp/e_cbc_bf.c +++ b/crypto/evp/e_cbc_bf.c @@ -70,6 +70,7 @@ static EVP_CIPHER bfish_cbc_cipher= { NID_bf_cbc, 8,EVP_BLOWFISH_KEY_SIZE,8, + EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH, bf_cbc_init_key, bf_cbc_cipher, NULL, @@ -77,6 +78,7 @@ static EVP_CIPHER bfish_cbc_cipher= sizeof((((EVP_CIPHER_CTX *)NULL)->c.bf_ks)), EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, + NULL }; EVP_CIPHER *EVP_bf_cbc(void) @@ -91,7 +93,7 @@ static void bf_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key, memcpy(&(ctx->oiv[0]),iv,8); memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8); if (key != NULL) - BF_set_key(&(ctx->c.bf_ks),EVP_BLOWFISH_KEY_SIZE,key); + BF_set_key(&(ctx->c.bf_ks),EVP_CIPHER_CTX_key_length(ctx),key); } static void bf_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, |