1 files changed, 32 insertions, 27 deletions

diff --git a/src/lib/libcrypto/evp/p_seal.c b/src/lib/libcrypto/evp/p_seal.c
index e5919b0fbf..6147447290 100644
--- a/src/lib/libcrypto/evp/p_seal.c
+++ b/src/lib/libcrypto/evp/p_seal.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -66,33 +66,36 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 
-int EVP_SealInit(EVP_CIPHER_CTX *ctx, const 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(type) {
+
+        if (type) {
                 EVP_CIPHER_CTX_init(ctx);
-                if(!EVP_EncryptInit_ex(ctx,type,NULL,NULL,NULL)) return 0;
+                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));
+                RAND_pseudo_bytes(iv, EVP_CIPHER_CTX_iv_length(ctx));
 
-        if(!EVP_EncryptInit_ex(ctx,NULL,NULL,key,iv)) return 0;
+        if (!EVP_EncryptInit_ex(ctx, NULL, NULL, key, iv))
+                return 0;
 
-        for (i=0; i<npubk; i++)
-                {
-                ekl[i]=EVP_PKEY_encrypt_old(ek[i],key,EVP_CIPHER_CTX_key_length(ctx),
-                        pubk[i]);
-                if (ekl[i] <= 0) return(-1);
-                }
-        return(npubk);
+        for (i = 0; i < npubk; i++) {
+                ekl[i] = EVP_PKEY_encrypt_old(ek[i], key,
+                    EVP_CIPHER_CTX_key_length(ctx), pubk[i]);
+                if (ekl[i] <= 0)
+                        return (-1);
         }
+        return (npubk);
+}
 
 /* MACRO
 void EVP_SealUpdate(ctx,out,outl,in,inl)
@@ -106,11 +109,13 @@ int inl;
         }
 */
 
-int EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
-        {
+int
+EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
+{
         int i;
-        i = EVP_EncryptFinal_ex(ctx,out,outl);
-        if (i) 
-                i = EVP_EncryptInit_ex(ctx,NULL,NULL,NULL,NULL);
+
+        i = EVP_EncryptFinal_ex(ctx, out, outl);
+        if (i)
+                i = EVP_EncryptInit_ex(ctx, NULL, NULL, NULL, NULL);
         return i;
-        }
+}