1 files changed, 50 insertions, 46 deletions

diff --git a/src/lib/libcrypto/asn1/a_sign.c b/src/lib/libcrypto/asn1/a_sign.c
index 046f3b4a99..40c6809669 100644
--- a/src/lib/libcrypto/asn1/a_sign.c
+++ b/src/lib/libcrypto/asn1/a_sign.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
@@ -63,7 +63,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -125,9 +125,9 @@
 #include <openssl/buffer.h>
 #include "asn1_locl.h"
 
-int ASN1_item_sign(const ASN1_ITEM *it, X509_ALGOR *algor1, X509_ALGOR *algor2,
-             ASN1_BIT_STRING *signature, void *asn, EVP_PKEY *pkey,
-             const EVP_MD *type)
+int
+ASN1_item_sign(const ASN1_ITEM *it, X509_ALGOR *algor1, X509_ALGOR *algor2,
+    ASN1_BIT_STRING *signature, void *asn, EVP_PKEY *pkey, const EVP_MD *type)
 {
         EVP_MD_CTX ctx;
         EVP_MD_CTX_init(&ctx);
@@ -137,16 +137,16 @@ int ASN1_item_sign(const ASN1_ITEM *it, X509_ALGOR *algor1, X509_ALGOR *algor2,
         }
         return ASN1_item_sign_ctx(it, algor1, algor2, signature, asn, &ctx);
 }
-                
 
-int ASN1_item_sign_ctx(const ASN1_ITEM *it,
-                X509_ALGOR *algor1, X509_ALGOR *algor2,
-                ASN1_BIT_STRING *signature, void *asn, EVP_MD_CTX *ctx)
+
+int
+ASN1_item_sign_ctx(const ASN1_ITEM *it, X509_ALGOR *algor1, X509_ALGOR *algor2,
+    ASN1_BIT_STRING *signature, void *asn, EVP_MD_CTX *ctx)
 {
         const EVP_MD *type;
         EVP_PKEY *pkey;
-        unsigned char *buf_in=NULL,*buf_out=NULL;
-        size_t inl=0,outl=0,outll=0;
+        unsigned char *buf_in = NULL, *buf_out = NULL;
+        size_t inl = 0, outl = 0, outll = 0;
         int signid, paramtype;
         int rv;
 
@@ -154,13 +154,14 @@ int ASN1_item_sign_ctx(const ASN1_ITEM *it,
         pkey = EVP_PKEY_CTX_get0_pkey(ctx->pctx);
 
         if (!type || !pkey) {
-                ASN1err(ASN1_F_ASN1_ITEM_SIGN_CTX, ASN1_R_CONTEXT_NOT_INITIALISED);
+                ASN1err(ASN1_F_ASN1_ITEM_SIGN_CTX,
+                    ASN1_R_CONTEXT_NOT_INITIALISED);
                 return 0;
         }
 
         if (pkey->ameth->item_sign) {
                 rv = pkey->ameth->item_sign(ctx, it, asn, algor1, algor2,
-                                                signature);
+                    signature);
                 if (rv == 1)
                         outl = signature->length;
                 /* Return value meanings:
@@ -173,22 +174,19 @@ int ASN1_item_sign_ctx(const ASN1_ITEM *it,
                         ASN1err(ASN1_F_ASN1_ITEM_SIGN_CTX, ERR_R_EVP_LIB);
                 if (rv <= 1)
                         goto err;
-        }
-        else
+        } else
                 rv = 2;
 
         if (rv == 2) {
                 if (type->flags & EVP_MD_FLAG_PKEY_METHOD_SIGNATURE) {
                         if (!pkey->ameth ||
-                                !OBJ_find_sigid_by_algs(&signid,
-                                                        EVP_MD_nid(type),
-                                                        pkey->ameth->pkey_id)) {
+                            !OBJ_find_sigid_by_algs(&signid,
+                                EVP_MD_nid(type), pkey->ameth->pkey_id)) {
                                 ASN1err(ASN1_F_ASN1_ITEM_SIGN_CTX,
-                                        ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED);
+                                    ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED);
                                 return 0;
                         }
-                }
-                else
+                } else
                         signid = type->pkey_type;
 
                 if (pkey->ameth->pkey_flags & ASN1_PKEY_SIGPARAM_NULL)
@@ -197,43 +195,49 @@ int ASN1_item_sign_ctx(const ASN1_ITEM *it,
                         paramtype = V_ASN1_UNDEF;
 
                 if (algor1)
-                        X509_ALGOR_set0(algor1, OBJ_nid2obj(signid), paramtype, NULL);
+                        X509_ALGOR_set0(algor1,
+                            OBJ_nid2obj(signid), paramtype, NULL);
                 if (algor2)
-                        X509_ALGOR_set0(algor2, OBJ_nid2obj(signid), paramtype, NULL);
+                        X509_ALGOR_set0(algor2,
+                            OBJ_nid2obj(signid), paramtype, NULL);
 
         }
 
-        inl=ASN1_item_i2d(asn,&buf_in, it);
-        outll=outl=EVP_PKEY_size(pkey);
-        buf_out=malloc((unsigned int)outl);
+        inl = ASN1_item_i2d(asn, &buf_in, it);
+        outll = outl = EVP_PKEY_size(pkey);
+        buf_out = malloc((unsigned int)outl);
         if ((buf_in == NULL) || (buf_out == NULL)) {
-                outl=0;
-                ASN1err(ASN1_F_ASN1_ITEM_SIGN_CTX,ERR_R_MALLOC_FAILURE);
+                outl = 0;
+                ASN1err(ASN1_F_ASN1_ITEM_SIGN_CTX, ERR_R_MALLOC_FAILURE);
                 goto err;
         }
 
-        if (!EVP_DigestSignUpdate(ctx, buf_in, inl)
-                || !EVP_DigestSignFinal(ctx, buf_out, &outl)) {
-                outl=0;
-                ASN1err(ASN1_F_ASN1_ITEM_SIGN_CTX,ERR_R_EVP_LIB);
+        if (!EVP_DigestSignUpdate(ctx, buf_in, inl) ||
+            !EVP_DigestSignFinal(ctx, buf_out, &outl)) {
+                outl = 0;
+                ASN1err(ASN1_F_ASN1_ITEM_SIGN_CTX, ERR_R_EVP_LIB);
                 goto err;
         }
-        if (signature->data != NULL) free(signature->data);
-        signature->data=buf_out;
-        buf_out=NULL;
-        signature->length=outl;
+        if (signature->data != NULL)
+                free(signature->data);
+        signature->data = buf_out;
+        buf_out = NULL;
+        signature->length = outl;
         /* In the interests of compatibility, I'll make sure that
          * the bit string has a 'not-used bits' value of 0
          */
-        signature->flags&= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07);
-        signature->flags|=ASN1_STRING_FLAG_BITS_LEFT;
+        signature->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07);
+        signature->flags |= ASN1_STRING_FLAG_BITS_LEFT;
+
 err:
         EVP_MD_CTX_cleanup(ctx);
         if (buf_in != NULL) {
-                OPENSSL_cleanse((char *)buf_in,(unsigned int)inl); free(buf_in);
+                OPENSSL_cleanse((char *)buf_in, (unsigned int)inl);
+                free(buf_in);
         }
         if (buf_out != NULL) {
-                OPENSSL_cleanse((char *)buf_out,outll); free(buf_out);
+                OPENSSL_cleanse((char *)buf_out, outll);
+                free(buf_out);
         }
-        return(outl);
+        return (outl);
 }