diff options
| author | Matt Caswell <matt@openssl.org> | 2015-09-29 16:43:27 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-09-30 11:39:24 +0100 |
| commit | c58f3e4293cc0d00b19f48d61e77f6312a37375a (patch) | |
| tree | 94dacea444601f2c8a798b38081b8ace58c41262 /crypto/cms | |
| parent | 984d6c6052169bcae8010de33f7796e455536d61 (diff) | |
| download | openssl-c58f3e4293cc0d00b19f48d61e77f6312a37375a.zip openssl-c58f3e4293cc0d00b19f48d61e77f6312a37375a.tar.gz openssl-c58f3e4293cc0d00b19f48d61e77f6312a37375a.tar.bz2 | |
Add GOST12 cms/smime capabilities
Add additional NID references in the CMS/SMIME capabilities code to cater
for GOST12.
Patch supplied by Dmitry Belyavsky <beldmit@gmail.com>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/cms')
| -rw-r--r-- | crypto/cms/cms_sd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c index 8fc407e..50064e2 100644 --- a/crypto/cms/cms_sd.c +++ b/crypto/cms/cms_sd.c @@ -933,6 +933,8 @@ static int cms_add_digest_smcap(STACK_OF(X509_ALGOR) **sk, int nid, int arg) int CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap) { if (!cms_add_cipher_smcap(smcap, NID_aes_256_cbc, -1) + || !cms_add_digest_smcap(smcap, NID_id_GostR3411_2012_256, -1) + || !cms_add_digest_smcap(smcap, NID_id_GostR3411_2012_512, -1) || !cms_add_digest_smcap(smcap, NID_id_GostR3411_94, -1) || !cms_add_cipher_smcap(smcap, NID_id_Gost28147_89, -1) || !cms_add_cipher_smcap(smcap, NID_aes_192_cbc, -1) |