Declare the CFB and OFB modes for AES, and prepare for a declaration

[openssl.git] / crypto / evp / p_dec.c

diff --git a/crypto/evp/p_dec.c b/crypto/evp/p_dec.c
index 0533a8490774cab414c420f24db27c7ee4f776fe..8af620400e281c323e61643b8a8c13a3b75b30e9 100644 (file)
--- a/crypto/evp/p_dec.c
+++ b/crypto/evp/p_dec.c
@@ -58,25 +58,25 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "rand.h"
-#ifndef NO_RSA
-#include "rsa.h"
+#include <openssl/rand.h>
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
 #endif
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
 
 int EVP_PKEY_decrypt(unsigned char *key, unsigned char *ek, int ekl,
             EVP_PKEY *priv)
        {
        int ret= -1;
        
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
        if (priv->type != EVP_PKEY_RSA)
                {
 #endif
                EVPerr(EVP_F_EVP_PKEY_DECRYPT,EVP_R_PUBLIC_KEY_NOT_RSA);
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
                goto err;
                 }