[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  c58f3e4293cc0d00b19f48d61e77f6312a37375a (commit)
      from  984d6c6052169bcae8010de33f7796e455536d61 (commit)


- Log -----------------------------------------------------------------
commit c58f3e4293cc0d00b19f48d61e77f6312a37375a
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Sep 29 16:43:27 2015 +0100

    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 at gmail.com>
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/cms/cms_sd.c      | 2 ++
 crypto/pkcs7/pk7_smime.c | 2 ++
 2 files changed, 4 insertions(+)

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)
diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c
index 16df4ea..ea5eb1b 100644
--- a/crypto/pkcs7/pk7_smime.c
+++ b/crypto/pkcs7/pk7_smime.c
@@ -189,6 +189,8 @@ PKCS7_SIGNER_INFO *PKCS7_sign_add_signer(PKCS7 *p7, X509 *signcert,
                 goto err;
             }
             if (!add_cipher_smcap(smcap, NID_aes_256_cbc, -1)
+                || !add_digest_smcap(smcap, NID_id_GostR3411_2012_256, -1)
+                || !add_digest_smcap(smcap, NID_id_GostR3411_2012_512, -1)
                 || !add_digest_smcap(smcap, NID_id_GostR3411_94, -1)
                 || !add_cipher_smcap(smcap, NID_id_Gost28147_89, -1)
                 || !add_cipher_smcap(smcap, NID_aes_192_cbc, -1)