diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2000-05-30 18:26:22 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2000-05-30 18:26:22 +0000 |
| commit | 49528751b878a8198f628dff6651e4547818a2cf (patch) | |
| tree | a73b437572c1052cc8337746602b501bebdbbaee /crypto/evp/p_open.c | |
| parent | 547bf7f9838285a111c50959a2363221971ab863 (diff) | |
More EVP cipher revision.
Change EVP_SealInit() and EVP_OpenInit() to
handle cipher parameters.
Make it possible to set RC2 and RC5 params.
Make RC2 ASN1 code use the effective key bits
and not the key length.
TODO: document how new API works.
Diffstat (limited to 'crypto/evp/p_open.c')
| -rw-r--r-- | crypto/evp/p_open.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/crypto/evp/p_open.c b/crypto/evp/p_open.c index b9ca7892c2..6dbccceafa 100644 --- a/crypto/evp/p_open.c +++ b/crypto/evp/p_open.c @@ -76,6 +76,11 @@ int EVP_OpenInit(EVP_CIPHER_CTX *ctx, EVP_CIPHER *type, unsigned char *ek, goto err; } + if(type) { + EVP_CIPHER_CTX_init(ctx); + EVP_DecryptInit(ctx,type,NULL,NULL); + } + size=RSA_size(priv->pkey.rsa); key=(unsigned char *)Malloc(size+2); if (key == NULL) @@ -87,14 +92,13 @@ int EVP_OpenInit(EVP_CIPHER_CTX *ctx, EVP_CIPHER *type, unsigned char *ek, } i=EVP_PKEY_decrypt(key,ek,ekl,priv); - if (i != type->key_len) + if ((i <= 0) || !EVP_CIPHER_CTX_set_key_length(ctx, i)) { /* ERROR */ goto err; } + if(!EVP_DecryptInit(ctx,NULL,key,iv)) goto err; - EVP_CIPHER_CTX_init(ctx); - EVP_DecryptInit(ctx,type,key,iv); ret=1; err: if (key != NULL) memset(key,0,size); |