Constify EVP_SealInit, EVP_OpenInit

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

diff --git a/crypto/evp/p_open.c b/crypto/evp/p_open.c
index 85d5097644a51a1d0f5360c00c58fecf8975d953..c0a50b9cd6b25e6543f04b520acb9829f88c2a11 100644 (file)
--- a/crypto/evp/p_open.c
+++ b/crypto/evp/p_open.c
@@ -56,38 +56,38 @@
  * [including the GNU Public Licence.]
  */
 
  * [including the GNU Public Licence.]
  */
 

-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA

 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 

-int EVP_OpenInit(EVP_CIPHER_CTX *ctx, EVP_CIPHER *type, unsigned char *ek,
+int EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, unsigned char *ek,

             int ekl, unsigned char *iv, EVP_PKEY *priv)
        {
        unsigned char *key=NULL;
        int i,size=0,ret=0;
             int ekl, unsigned char *iv, EVP_PKEY *priv)
        {
        unsigned char *key=NULL;
        int i,size=0,ret=0;

-       
+
+       if(type) {      
+               EVP_CIPHER_CTX_init(ctx);
+               if(!EVP_DecryptInit(ctx,type,NULL,NULL)) return 0;
+       }
+
+       if(!priv) return 1;
+

        if (priv->type != EVP_PKEY_RSA)
                {
                EVPerr(EVP_F_EVP_OPENINIT,EVP_R_PUBLIC_KEY_NOT_RSA);
        if (priv->type != EVP_PKEY_RSA)
                {
                EVPerr(EVP_F_EVP_OPENINIT,EVP_R_PUBLIC_KEY_NOT_RSA);

-               ret= -1;

                goto err;
                 }
 
                goto err;
                 }
 

-       if(type) {      
-               EVP_CIPHER_CTX_init(ctx);
-               EVP_DecryptInit(ctx,type,NULL,NULL);
-       }
-

        size=RSA_size(priv->pkey.rsa);
        key=(unsigned char *)OPENSSL_malloc(size+2);
        if (key == NULL)
                {
                /* ERROR */
                EVPerr(EVP_F_EVP_OPENINIT,ERR_R_MALLOC_FAILURE);
        size=RSA_size(priv->pkey.rsa);
        key=(unsigned char *)OPENSSL_malloc(size+2);
        if (key == NULL)
                {
                /* ERROR */
                EVPerr(EVP_F_EVP_OPENINIT,ERR_R_MALLOC_FAILURE);

-               ret= -1;

                goto err;
                }
 
                goto err;
                }
 


@@ -114,7 +114,7 @@ int EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
        EVP_DecryptInit(ctx,NULL,NULL,NULL);
        return(i);
        }
        EVP_DecryptInit(ctx,NULL,NULL,NULL);
        return(i);
        }

-#else /* !NO_RSA */
+#else /* !OPENSSL_NO_RSA */

 
 # ifdef PEDANTIC
 static void *dummy=&dummy;
 
 # ifdef PEDANTIC
 static void *dummy=&dummy;