diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-12-18 17:00:46 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-01-12 13:52:22 +0100 |
| commit | 135727abe0bfbb6ff85b92244fd67e3e831a6ee3 (patch) | |
| tree | a2af34e16ade6906f4917f99446186a4380191e3 | |
| parent | e79f877333dcdc2ca51442d8339253e29c31a0d6 (diff) | |
| download | openssl-new-135727abe0bfbb6ff85b92244fd67e3e831a6ee3.tar.gz | |
Adapt the internal EVP routines to opaque EVP_CIPHER
Reviewed-by: Rich Salz <rsalz@openssl.org>
| -rw-r--r-- | crypto/evp/evp_enc.c | 1 | ||||
| -rw-r--r-- | crypto/evp/evp_key.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 3bac1091fe..32e124e650 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -64,6 +64,7 @@ #ifndef OPENSSL_NO_ENGINE # include <openssl/engine.h> #endif +#include "internal/evp_int.h" #include "evp_locl.h" int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c) diff --git a/crypto/evp/evp_key.c b/crypto/evp/evp_key.c index 65f038138e..d2e6d8c669 100644 --- a/crypto/evp/evp_key.c +++ b/crypto/evp/evp_key.c @@ -128,8 +128,8 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md, int niv, nkey, addmd = 0; unsigned int mds = 0, i; int rv = 0; - nkey = type->key_len; - niv = type->iv_len; + nkey = EVP_CIPHER_key_length(type); + niv = EVP_CIPHER_iv_length(type); OPENSSL_assert(nkey <= EVP_MAX_KEY_LENGTH); OPENSSL_assert(niv <= EVP_MAX_IV_LENGTH); @@ -189,7 +189,7 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md, if ((nkey == 0) && (niv == 0)) break; } - rv = type->key_len; + rv = EVP_CIPHER_key_length(type); err: EVP_MD_CTX_free(c); OPENSSL_cleanse(md_buf, sizeof(md_buf)); |