projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5ff73fb
)
Use default ASN.1 for SEED.
author
Dr. Stephen Henson
<steve@openssl.org>
Thu, 5 May 2016 21:17:05 +0000
(22:17 +0100)
committer
Dr. Stephen Henson
<steve@openssl.org>
Thu, 5 May 2016 22:59:01 +0000
(23:59 +0100)
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>
crypto/evp/e_seed.c
patch
|
blob
|
history
diff --git
a/crypto/evp/e_seed.c
b/crypto/evp/e_seed.c
index 6964b1e5b63ddb36ef7c9ca7fe676a6fe8a8d9d3..3df73eeee647edf15e26a76e5c8e0cc304dc0927 100644
(file)
--- 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)