import openssl-0.9.7-beta1

1 files changed, 28 insertions, 24 deletions

diff --git a/src/lib/libcrypto/evp/p_open.c b/src/lib/libcrypto/evp/p_open.c
index 28a8e02252..6976f2a867 100644
--- a/src/lib/libcrypto/evp/p_open.c
+++ b/src/lib/libcrypto/evp/p_open.c
@@ -56,64 +56,68 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef OPENSSL_NO_RSA
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
 
-int EVP_OpenInit(ctx,type,ek,ekl,iv,priv)
-EVP_CIPHER_CTX *ctx;
-EVP_CIPHER *type;
-unsigned char *ek;
-int ekl;
-unsigned char *iv;
-EVP_PKEY *priv;
+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;
-        
+
+        if(type) {      
+                EVP_CIPHER_CTX_init(ctx);
+                if(!EVP_DecryptInit_ex(ctx,type,NULL, 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);
-                ret= -1;
                 goto err;
                 }
 
         size=RSA_size(priv->pkey.rsa);
-        key=(unsigned char *)Malloc(size+2);
+        key=(unsigned char *)OPENSSL_malloc(size+2);
         if (key == NULL)
                 {
                 /* ERROR */
                 EVPerr(EVP_F_EVP_OPENINIT,ERR_R_MALLOC_FAILURE);
-                ret= -1;
                 goto err;
                 }
 
         i=EVP_PKEY_decrypt(key,ek,ekl,priv);
-        if (i != type->key_len)
+        if ((i <= 0) || !EVP_CIPHER_CTX_set_key_length(ctx, i))
                 {
                 /* ERROR */
                 goto err;
                 }
+        if(!EVP_DecryptInit_ex(ctx,NULL,NULL,key,iv)) goto err;
 
-        EVP_CIPHER_CTX_init(ctx);
-        EVP_DecryptInit(ctx,type,key,iv);
         ret=1;
 err:
         if (key != NULL) memset(key,0,size);
-        Free(key);
+        OPENSSL_free(key);
         return(ret);
         }
 
-int EVP_OpenFinal(ctx,out,outl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-int *outl;
+int EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
         {
         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 */
+
+# ifdef PEDANTIC
+static void *dummy=&dummy;
+# endif
+
+#endif