e_aes.c: fix aes_cfb1_cipher.

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

diff --git a/crypto/evp/p_seal.c b/crypto/evp/p_seal.c
index 09a408de35b072d80c5fe506026f799247072e32..e5919b0fbf982320c13672c6ca886c82f2b3f414 100644 (file)
--- a/crypto/evp/p_seal.c
+++ b/crypto/evp/p_seal.c
@@ -58,35 +58,36 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "rand.h"
-#include "rsa.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
+#include <openssl/rand.h>
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
+#endif
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
 
-int EVP_SealInit(ctx,type,ek,ekl,iv,pubk,npubk)
-EVP_CIPHER_CTX *ctx;
-EVP_CIPHER *type;
-unsigned char **ek;
-int *ekl;
-unsigned char *iv;
-EVP_PKEY **pubk;
-int npubk;
+int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, unsigned char **ek,
+            int *ekl, unsigned char *iv, EVP_PKEY **pubk, int npubk)
        {
        unsigned char key[EVP_MAX_KEY_LENGTH];
        int i;
        
-       if (npubk <= 0) return(0);
-       RAND_bytes(key,EVP_MAX_KEY_LENGTH);
-       if (type->iv_len > 0)
-               RAND_bytes(iv,type->iv_len);
+       if(type) {
+               EVP_CIPHER_CTX_init(ctx);
+               if(!EVP_EncryptInit_ex(ctx,type,NULL,NULL,NULL)) return 0;
+       }
+       if ((npubk <= 0) || !pubk)
+               return 1;
+       if (EVP_CIPHER_CTX_rand_key(ctx, key) <= 0)
+               return 0;
+       if (EVP_CIPHER_CTX_iv_length(ctx))
+               RAND_pseudo_bytes(iv,EVP_CIPHER_CTX_iv_length(ctx));
 
-       EVP_CIPHER_CTX_init(ctx);
-       EVP_EncryptInit(ctx,type,key,iv);
+       if(!EVP_EncryptInit_ex(ctx,NULL,NULL,key,iv)) return 0;
 
        for (i=0; i<npubk; i++)
                {
-               ekl[i]=EVP_PKEY_encrypt(ek[i],key,EVP_CIPHER_key_length(type),
+               ekl[i]=EVP_PKEY_encrypt_old(ek[i],key,EVP_CIPHER_CTX_key_length(ctx),
                        pubk[i]);
                if (ekl[i] <= 0) return(-1);
                }
@@ -105,11 +106,11 @@ int inl;
        }
 */
 
-void EVP_SealFinal(ctx,out,outl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-int *outl;
+int EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
        {
-       EVP_EncryptFinal(ctx,out,outl);
-       EVP_EncryptInit(ctx,NULL,NULL,NULL);
+       int i;
+       i = EVP_EncryptFinal_ex(ctx,out,outl);
+       if (i) 
+               i = EVP_EncryptInit_ex(ctx,NULL,NULL,NULL,NULL);
+       return i;
        }