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 7249d1b1eecb46cce214ffdc0b858af4cfbf7586..3df73eeee647edf15e26a76e5c8e0cc304dc0927 100644
(file)
--- a/
crypto/evp/e_seed.c
+++ b/
crypto/evp/e_seed.c
@@
-1,4
+1,3
@@
-/* crypto/evp/e_seed.c */
/* ====================================================================
* Copyright (c) 2007 The OpenSSL Project. All rights reserved.
*
/* ====================================================================
* Copyright (c) 2007 The OpenSSL Project. All rights reserved.
*
@@
-54,13
+53,15
@@
*/
#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 <assert.h>
# include <openssl/seed.h>
# include <openssl/evp.h>
# include <openssl/err.h>
# include <string.h>
# include <assert.h>
# include <openssl/seed.h>
-# include "
evp_locl
.h"
+# include "
internal/evp_int
.h"
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);
@@
-70,12
+71,13
@@
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)
{
- SEED_set_key(key,
ctx->cipher_data
);
+ SEED_set_key(key,
&EVP_C_DATA(EVP_SEED_KEY,ctx)->ks
);
return 1;
}
return 1;
}