generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adapt the internal EVP routines to opaque EVP_CIPHER

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2015-12-18 17:00:46 +01:00
parent e79f877333
commit 135727abe0
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crypto/evp/evp_enc.c
View File

@ -64,6 +64,7 @@
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h> # include <openssl/engine.h>
#endif #endif
#include "internal/evp_int.h"
#include "evp_locl.h" #include "evp_locl.h"
int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c) int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c)

6
crypto/evp/evp_key.c
View File

@ -128,8 +128,8 @@ int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
int niv, nkey, addmd = 0; int niv, nkey, addmd = 0;
unsigned int mds = 0, i; unsigned int mds = 0, i;
int rv = 0; int rv = 0;
nkey = type->key_len; nkey = EVP_CIPHER_key_length(type);
niv = type->iv_len; niv = EVP_CIPHER_iv_length(type);
OPENSSL_assert(nkey <= EVP_MAX_KEY_LENGTH); OPENSSL_assert(nkey <= EVP_MAX_KEY_LENGTH);
OPENSSL_assert(niv <= EVP_MAX_IV_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)) if ((nkey == 0) && (niv == 0))
break; break;
} }
rv = type->key_len; rv = EVP_CIPHER_key_length(type);
err: err:
EVP_MD_CTX_free(c); EVP_MD_CTX_free(c);
OPENSSL_cleanse(md_buf, sizeof(md_buf)); OPENSSL_cleanse(md_buf, sizeof(md_buf));