[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Dr. Stephen Henson]

The branch OpenSSL_1_0_2-stable has been updated
       via  0c4465ede7847227e2958e8a3fbcc0bc98af0e06 (commit)
      from  493d732ab1f0311d925e6b9d56f0003012f93353 (commit)


- Log -----------------------------------------------------------------
commit 0c4465ede7847227e2958e8a3fbcc0bc98af0e06
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>
    (cherry picked from commit c0aa8c274843c5b8a70d70fc05d71fa3dfd510db)

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

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 7249d1b..3d01eac 100644
--- a/crypto/evp/e_seed.c
+++ b/crypto/evp/e_seed.c
@@ -70,7 +70,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)