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

Ensure EVP_CipherInit() uses the correct encode/decode parameter if

Browse Source 
enc == -1

[Reported by Markus Friedl <markus@openbsd.org>]

Fix typo in dh_lib.c (use of DSAerr instead of DHerr).
This commit is contained in:
Dr. Stephen Henson 2002-03-16 23:20:05 +00:00
parent c46acbacde
commit 3e268d2717
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/dh/dh_lib.c
View File

@ -116,7 +116,7 @@ DH *DH_new_method(ENGINE *engine)
{ {
if (!ENGINE_init(engine)) if (!ENGINE_init(engine))
{ {
DSAerr(DH_F_DH_NEW_METHOD, ERR_R_ENGINE_LIB); DHerr(DH_F_DH_NEW_METHOD, ERR_R_ENGINE_LIB);
OPENSSL_free(ret); OPENSSL_free(ret);
return NULL; return NULL;
} }

10
crypto/evp/evp_enc.c
View File

@ -85,7 +85,14 @@ int EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl,
const unsigned char *key, const unsigned char *iv, int enc) const unsigned char *key, const unsigned char *iv, int enc)
{ {
if(enc && (enc != -1)) enc = 1; if (enc == -1)
enc = ctx->encrypt;
else
{
if (enc)
enc = 1;
ctx->encrypt = enc;
}
/* Whether it's nice or not, "Inits" can be used on "Final"'d contexts /* Whether it's nice or not, "Inits" can be used on "Final"'d contexts
* so this context may already have an ENGINE! Try to avoid releasing * so this context may already have an ENGINE! Try to avoid releasing
* the previous handle, re-querying for an ENGINE, and having a * the previous handle, re-querying for an ENGINE, and having a
@ -184,7 +191,6 @@ skip_to_init:
if(key || (ctx->cipher->flags & EVP_CIPH_ALWAYS_CALL_INIT)) { if(key || (ctx->cipher->flags & EVP_CIPH_ALWAYS_CALL_INIT)) {
if(!ctx->cipher->init(ctx,key,iv,enc)) return 0; if(!ctx->cipher->init(ctx,key,iv,enc)) return 0;
} }
if(enc != -1) ctx->encrypt=enc;
ctx->buf_len=0; ctx->buf_len=0;
ctx->final_used=0; ctx->final_used=0;
ctx->block_mask=ctx->cipher->block_size-1; ctx->block_mask=ctx->cipher->block_size-1;