1 files changed, 95 insertions, 91 deletions

diff --git a/src/lib/libcrypto/pem/pem_seal.c b/src/lib/libcrypto/pem/pem_seal.c
index bac7b16b44..e39de08c9a 100644
--- a/src/lib/libcrypto/pem/pem_seal.c
+++ b/src/lib/libcrypto/pem/pem_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
@@ -67,125 +67,129 @@
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
 
-int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type, EVP_MD *md_type,
-             unsigned char **ek, int *ekl, unsigned char *iv, EVP_PKEY **pubk,
-             int npubk)
-        {
+int
+PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type, EVP_MD *md_type,
+    unsigned char **ek, int *ekl, unsigned char *iv, EVP_PKEY **pubk, int npubk)
+{
         unsigned char key[EVP_MAX_KEY_LENGTH];
-        int ret= -1;
-        int i,j,max=0;
-        char *s=NULL;
-
-        for (i=0; i<npubk; i++)
-                {
-                if (pubk[i]->type != EVP_PKEY_RSA)
-                        {
-                        PEMerr(PEM_F_PEM_SEALINIT,PEM_R_PUBLIC_KEY_NO_RSA);
+        int ret = -1;
+        int i, j, max = 0;
+        char *s = NULL;
+
+        for (i = 0; i < npubk; i++) {
+                if (pubk[i]->type != EVP_PKEY_RSA) {
+                        PEMerr(PEM_F_PEM_SEALINIT, PEM_R_PUBLIC_KEY_NO_RSA);
                         goto err;
-                        }
-                j=RSA_size(pubk[i]->pkey.rsa);
-                if (j > max) max=j;
                 }
-        s=(char *)malloc(max*2);
-        if (s == NULL)
-                {
-                PEMerr(PEM_F_PEM_SEALINIT,ERR_R_MALLOC_FAILURE);
+                j = RSA_size(pubk[i]->pkey.rsa);
+                if (j > max)
+                        max = j;
+        }
+        s = (char *)malloc(max*2);
+        if (s == NULL) {
+                PEMerr(PEM_F_PEM_SEALINIT, ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
+        }
 
         EVP_EncodeInit(&ctx->encode);
 
         EVP_MD_CTX_init(&ctx->md);
-        if (!EVP_SignInit(&ctx->md,md_type))
+        if (!EVP_SignInit(&ctx->md, md_type))
                 goto err;
 
         EVP_CIPHER_CTX_init(&ctx->cipher);
-        ret=EVP_SealInit(&ctx->cipher,type,ek,ekl,iv,pubk,npubk);
-        if (ret <= 0) goto err;
+        ret = EVP_SealInit(&ctx->cipher, type, ek, ekl, iv, pubk, npubk);
+        if (ret <= 0)
+                goto err;
 
         /* base64 encode the keys */
-        for (i=0; i<npubk; i++)
-                {
-                j=EVP_EncodeBlock((unsigned char *)s,ek[i],
-                        RSA_size(pubk[i]->pkey.rsa));
-                ekl[i]=j;
-                memcpy(ek[i],s,j+1);
-                }
-
-        ret=npubk;
-err:
-        if (s != NULL) free(s);
-        OPENSSL_cleanse(key,EVP_MAX_KEY_LENGTH);
-        return(ret);
+        for (i = 0; i < npubk; i++) {
+                j = EVP_EncodeBlock((unsigned char *)s, ek[i],
+                    RSA_size(pubk[i]->pkey.rsa));
+                ekl[i] = j;
+                memcpy(ek[i], s, j + 1);
         }
 
-void PEM_SealUpdate(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *out, int *outl,
-             unsigned char *in, int inl)
-        {
+        ret = npubk;
+
+err:
+        if (s != NULL)
+                free(s);
+        OPENSSL_cleanse(key, EVP_MAX_KEY_LENGTH);
+        return (ret);
+}
+
+void
+PEM_SealUpdate(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *out, int *outl,
+    unsigned char *in, int inl)
+{
         unsigned char buffer[1600];
-        int i,j;
+        int i, j;
 
-        *outl=0;
-        EVP_SignUpdate(&ctx->md,in,inl);
-        for (;;)
-                {
-                if (inl <= 0) break;
+        *outl = 0;
+        EVP_SignUpdate(&ctx->md, in, inl);
+        for (;;) {
+                if (inl <= 0)
+                        break;
                 if (inl > 1200)
-                        i=1200;
+                        i = 1200;
                 else
-                        i=inl;
-                EVP_EncryptUpdate(&ctx->cipher,buffer,&j,in,i);
-                EVP_EncodeUpdate(&ctx->encode,out,&j,buffer,j);
-                *outl+=j;
-                out+=j;
-                in+=i;
-                inl-=i;
-                }
+                        i = inl;
+                EVP_EncryptUpdate(&ctx->cipher, buffer, &j, in, i);
+                EVP_EncodeUpdate(&ctx->encode, out, &j, buffer, j);
+                *outl += j;
+                out += j;
+                in += i;
+                inl -= i;
         }
-
-int PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig, int *sigl,
-             unsigned char *out, int *outl, EVP_PKEY *priv)
-        {
-        unsigned char *s=NULL;
-        int ret=0,j;
+}
+
+int
+PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig, int *sigl,
+    unsigned char *out, int *outl, EVP_PKEY *priv)
+{
+        unsigned char *s = NULL;
+        int ret = 0, j;
         unsigned int i;
 
-        if (priv->type != EVP_PKEY_RSA)
-                {
-                PEMerr(PEM_F_PEM_SEALFINAL,PEM_R_PUBLIC_KEY_NO_RSA);
+        if (priv->type != EVP_PKEY_RSA) {
+                PEMerr(PEM_F_PEM_SEALFINAL, PEM_R_PUBLIC_KEY_NO_RSA);
                 goto err;
-                }
-        i=RSA_size(priv->pkey.rsa);
-        if (i < 100) i=100;
-        s=(unsigned char *)malloc(i*2);
-        if (s == NULL)
-                {
-                PEMerr(PEM_F_PEM_SEALFINAL,ERR_R_MALLOC_FAILURE);
+        }
+        i = RSA_size(priv->pkey.rsa);
+        if (i < 100)
+                i = 100;
+        s = (unsigned char *)malloc(i*2);
+        if (s == NULL) {
+                PEMerr(PEM_F_PEM_SEALFINAL, ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
+        }
 
-        if (!EVP_EncryptFinal_ex(&ctx->cipher,s,(int *)&i))
+        if (!EVP_EncryptFinal_ex(&ctx->cipher, s, (int *)&i))
                 goto err;
-        EVP_EncodeUpdate(&ctx->encode,out,&j,s,i);
-        *outl=j;
-        out+=j;
-        EVP_EncodeFinal(&ctx->encode,out,&j);
-        *outl+=j;
+        EVP_EncodeUpdate(&ctx->encode, out, &j, s, i);
+        *outl = j;
+        out += j;
+        EVP_EncodeFinal(&ctx->encode, out, &j);
+        *outl += j;
 
-        if (!EVP_SignFinal(&ctx->md,s,&i,priv)) goto err;
-        *sigl=EVP_EncodeBlock(sig,s,i);
+        if (!EVP_SignFinal(&ctx->md, s,&i, priv))
+                goto err;
+        *sigl = EVP_EncodeBlock(sig, s, i);
+
+        ret = 1;
 
-        ret=1;
 err:
         EVP_MD_CTX_cleanup(&ctx->md);
         EVP_CIPHER_CTX_cleanup(&ctx->cipher);
-        if (s != NULL) free(s);
-        return(ret);
-        }
+        if (s != NULL)
+                free(s);
+        return (ret);
+}
 #else /* !OPENSSL_NO_RSA */
 
 # if PEDANTIC
-static void *dummy=&dummy;
+static void *dummy = &dummy;
 # endif
 
 #endif