diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-05-05 22:17:05 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-05-06 00:03:02 +0100 |
| commit | 0c4465ede7847227e2958e8a3fbcc0bc98af0e06 (patch) | |
| tree | cbeab83a0edfb2cf0662e230a20db8506a95d4d8 /crypto/evp | |
| parent | 493d732ab1f0311d925e6b9d56f0003012f93353 (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>
(cherry picked from commit c0aa8c274843c5b8a70d70fc05d71fa3dfd510db)
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/e_seed.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/evp/e_seed.c b/crypto/evp/e_seed.c index 7249d1b1ee..3d01eacac0 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) |