summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2016-05-05 22:17:05 +0100
committerDr. Stephen Henson <steve@openssl.org>2016-05-05 23:59:01 +0100
commitc0aa8c274843c5b8a70d70fc05d71fa3dfd510db (patch)
treeeff1b8fb7ec494759f383c13ad5f61e068b780d0
parent5ff73fb230f2ffa2d00564572b3be1c42f90ed40 (diff)
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>
-rw-r--r--crypto/evp/e_seed.c3
1 files changed, 2 insertions, 1 deletions
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)