From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 5 May 2016 21:17:05 +0000 (+0100)
Subject: Use default ASN.1 for SEED.
X-Git-Tag: OpenSSL_1_1_0-pre6~915
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c0aa8c274843c5b8a70d70fc05d71fa3dfd510db;p=oweals%2Fopenssl.git

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@openssl.org>
---

diff --git a/crypto/evp/e_seed.c b/crypto/evp/e_seed.c
index 6964b1e5b6..3df73eeee6 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)