The branch OpenSSL_1_0_1-stable has been updated
via b0e1362a9432ccc65b529602e64a59f108ca539d (commit)
from 852034b8b20963594d2f37f8ae8eb83d3e538624 (commit)
- Log -----------------------------------------------------------------
commit b0e1362a9432ccc65b529602e64a59f108ca539d
Author: Dr. Stephen Henson <st...@openssl.org>
Date: Thu May 5 22:17:05 2016 +0100
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 <rs...@openssl.org>
(cherry picked from commit c0aa8c274843c5b8a70d70fc05d71fa3dfd510db)
-----------------------------------------------------------------------
Summary of changes:
crypto/evp/e_seed.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/crypto/evp/e_seed.c b/crypto/evp/e_seed.c
index 7249d1b..3d01eac 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)
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
