[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  c0aa8c274843c5b8a70d70fc05d71fa3dfd510db (commit)
      from  5ff73fb230f2ffa2d00564572b3be1c42f90ed40 (commit)


- Log -----------------------------------------------------------------
commit c0aa8c274843c5b8a70d70fc05d71fa3dfd510db
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Thu May 5 22:17:05 2016 +0100

    Use default ASN.1 for SEED.
    
    The default ASN.1 handling can be used for SEED. This also makes
    CMS work with SEED.
    
    PR#4504
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 crypto/evp/e_seed.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crypto/evp/e_seed.c b/crypto/evp/e_seed.c
index 6964b1e..3df73ee 100644
--- a/crypto/evp/e_seed.c
+++ b/crypto/evp/e_seed.c
@@ -71,7 +71,8 @@ typedef struct {
 } EVP_SEED_KEY;
 
 IMPLEMENT_BLOCK_CIPHER(seed, ks, SEED, EVP_SEED_KEY, NID_seed,
-                       16, 16, 16, 128, 0, seed_init_key, 0, 0, 0, 0)
+                       16, 16, 16, 128, EVP_CIPH_FLAG_DEFAULT_ASN1,
+                       seed_init_key, 0, 0, 0, 0)
 
 static int seed_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
                          const unsigned char *iv, int enc)