projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Due to an increasing number of clashes between modern OpenSSL and
[oweals/openssl.git]
/
crypto
/
evp
/
p_open.c
diff --git
a/crypto/evp/p_open.c
b/crypto/evp/p_open.c
index c0a50b9cd6b25e6543f04b520acb9829f88c2a11..6976f2a867ddbe3f275a60b9a5d558781cdbaa6e 100644
(file)
--- a/
crypto/evp/p_open.c
+++ b/
crypto/evp/p_open.c
@@
-71,7
+71,7
@@
int EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, unsigned char *ek,
if(type) {
EVP_CIPHER_CTX_init(ctx);
if(type) {
EVP_CIPHER_CTX_init(ctx);
- if(!EVP_DecryptInit
(ctx,type,
NULL,NULL)) return 0;
+ if(!EVP_DecryptInit
_ex(ctx,type,NULL,
NULL,NULL)) return 0;
}
if(!priv) return 1;
}
if(!priv) return 1;
@@
-97,7
+97,7
@@
int EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, unsigned char *ek,
/* ERROR */
goto err;
}
/* ERROR */
goto err;
}
- if(!EVP_DecryptInit
(ctx
,NULL,key,iv)) goto err;
+ if(!EVP_DecryptInit
_ex(ctx,NULL
,NULL,key,iv)) goto err;
ret=1;
err:
ret=1;
err:
@@
-110,8
+110,8
@@
int EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
{
int i;
{
int i;
- i=EVP_DecryptFinal(ctx,out,outl);
- EVP_DecryptInit
(ctx
,NULL,NULL,NULL);
+ i=EVP_DecryptFinal
_ex
(ctx,out,outl);
+ EVP_DecryptInit
_ex(ctx,NULL
,NULL,NULL,NULL);
return(i);
}
#else /* !OPENSSL_NO_RSA */
return(i);
}
#else /* !OPENSSL_NO_RSA */