diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2013-07-17 15:18:01 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-07-17 21:45:01 +0100 |
| commit | 41b920ef01abeb4c4b1c0f11e647370ae6533d02 (patch) | |
| tree | cb7342b33dfb8a333741e4a4ccc7e62b40909600 /crypto/rsa | |
| parent | 88e20b8584a78c803eca7aa9fcf8c46ff0ece4ae (diff) | |
Return correct enveloped data type in ASN1 methods.
For RSA and DSA keys return an appropriate RecipientInfo type. By setting
CMS_RECIPINFO_NONE for DSA keys an appropriate error is returned if
an attempt is made to use DSA with enveloped data.
Diffstat (limited to 'crypto/rsa')
| -rw-r--r-- | crypto/rsa/rsa_ameth.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c index bc6a578634..db926b0e42 100644 --- a/crypto/rsa/rsa_ameth.c +++ b/crypto/rsa/rsa_ameth.c @@ -448,6 +448,10 @@ static int rsa_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2) else if (arg1 == 1) return rsa_cms_decrypt(arg2); break; + + case ASN1_PKEY_CTRL_CMS_RI_TYPE: + *(int *)arg2 = CMS_RECIPINFO_TRANS; + return 1; #endif case ASN1_PKEY_CTRL_DEFAULT_MD_NID: |