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

Adapt the internal EVP routines to opaque EVP_CIPHER_CTX

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2015-12-13 21:36:33 +01:00
parent 83b0634702
commit c0ca39bdd6
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/evp/evp_enc.c
View File

@ -104,8 +104,7 @@ void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx)
int EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, int EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
const unsigned char *key, const unsigned char *iv, int enc) const unsigned char *key, const unsigned char *iv, int enc)
{ {
if (cipher) EVP_CIPHER_CTX_reset(ctx);
EVP_CIPHER_CTX_init(ctx);
return EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, enc); return EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, enc);
} }
@ -139,7 +138,7 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
*/ */
if (ctx->cipher) { if (ctx->cipher) {
unsigned long flags = ctx->flags; unsigned long flags = ctx->flags;
EVP_CIPHER_CTX_cleanup(ctx); EVP_CIPHER_CTX_reset(ctx);
/* Restore encrypt and flags */ /* Restore encrypt and flags */
ctx->encrypt = enc; ctx->encrypt = enc;
ctx->flags = flags; ctx->flags = flags;
@ -605,7 +604,7 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in)
} }
#endif #endif
EVP_CIPHER_CTX_cleanup(out); EVP_CIPHER_CTX_reset(out);
memcpy(out, in, sizeof(*out)); memcpy(out, in, sizeof(*out));
if (in->cipher_data && in->cipher->ctx_size) { if (in->cipher_data && in->cipher->ctx_size) {