projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use default ASN.1 for SEED.
[openssl.git]
/
crypto
/
evp
/
e_seed.c
diff --git
a/crypto/evp/e_seed.c
b/crypto/evp/e_seed.c
index f8523c38d906a46e6078af94a7e64d3ec3d33dc5..3df73eeee647edf15e26a76e5c8e0cc304dc0927 100644
(file)
--- a/
crypto/evp/e_seed.c
+++ b/
crypto/evp/e_seed.c
@@
-53,7
+53,9
@@
*/
#include <openssl/opensslconf.h>
*/
#include <openssl/opensslconf.h>
-#ifndef OPENSSL_NO_SEED
+#ifdef OPENSSL_NO_SEED
+NON_EMPTY_TRANSLATION_UNIT
+#else
# include <openssl/evp.h>
# include <openssl/err.h>
# include <string.h>
# include <openssl/evp.h>
# include <openssl/err.h>
# include <string.h>
@@
-69,7
+71,8
@@
typedef struct {
} EVP_SEED_KEY;
IMPLEMENT_BLOCK_CIPHER(seed, ks, SEED, EVP_SEED_KEY, NID_seed,
} 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)
static int seed_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
const unsigned char *iv, int enc)