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:
852034b
)
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 23:03:28 +0000
(
00:03
+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>
(cherry picked from commit
c0aa8c274843c5b8a70d70fc05d71fa3dfd510db
)
crypto/evp/e_seed.c
patch
|
blob
|
history
diff --git
a/crypto/evp/e_seed.c
b/crypto/evp/e_seed.c
index 7249d1b1eecb46cce214ffdc0b858af4cfbf7586..3d01eacac06e7cd4df560aa843a1c3615d13837a 100644
(file)
--- 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)