projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "RT3425: constant-time evp_enc"
[oweals/openssl.git]
/
crypto
/
evp
/
p_dec.c
diff --git
a/crypto/evp/p_dec.c
b/crypto/evp/p_dec.c
index 57b5daa4538e46b2ab94402e071e764b5eb807e8..4201dcbad99e1e800616ac8091f5642ec1924cc0 100644
(file)
--- a/
crypto/evp/p_dec.c
+++ b/
crypto/evp/p_dec.c
@@
-59,24
+59,24
@@
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/rand.h>
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/rand.h>
-#ifndef NO_RSA
+#ifndef
OPENSSL_
NO_RSA
#include <openssl/rsa.h>
#endif
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
#include <openssl/rsa.h>
#endif
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
-int EVP_PKEY_decrypt
(unsigned char *key,
unsigned char *ek, int ekl,
+int EVP_PKEY_decrypt
_old(unsigned char *key, const
unsigned char *ek, int ekl,
EVP_PKEY *priv)
{
int ret= -1;
EVP_PKEY *priv)
{
int ret= -1;
-#ifndef NO_RSA
+#ifndef
OPENSSL_
NO_RSA
if (priv->type != EVP_PKEY_RSA)
{
#endif
if (priv->type != EVP_PKEY_RSA)
{
#endif
- EVPerr(EVP_F_EVP_PKEY_DECRYPT,EVP_R_PUBLIC_KEY_NOT_RSA);
-#ifndef NO_RSA
+ EVPerr(EVP_F_EVP_PKEY_DECRYPT
_OLD
,EVP_R_PUBLIC_KEY_NOT_RSA);
+#ifndef
OPENSSL_
NO_RSA
goto err;
}
goto err;
}