X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fevp%2Fe_seed.c;h=3df73eeee647edf15e26a76e5c8e0cc304dc0927;hp=7249d1b1eecb46cce214ffdc0b858af4cfbf7586;hb=c0aa8c274843c5b8a70d70fc05d71fa3dfd510db;hpb=31384753c770b2d77dd9d54a19145d25498cf859 diff --git a/crypto/evp/e_seed.c b/crypto/evp/e_seed.c index 7249d1b1ee..3df73eeee6 100644 --- 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. * @@ -54,13 +53,15 @@ */ #include -#ifndef OPENSSL_NO_SEED +#ifdef OPENSSL_NO_SEED +NON_EMPTY_TRANSLATION_UNIT +#else # include # include # include # include # include -# 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); @@ -70,12 +71,13 @@ 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) { - SEED_set_key(key, ctx->cipher_data); + SEED_set_key(key, &EVP_C_DATA(EVP_SEED_KEY,ctx)->ks); return 1; }