Run util/openssl-format-source -v -c .

[thirdparty/openssl.git] / crypto / pkcs7 / pk7_mime.c

diff --git a/crypto/pkcs7/pk7_mime.c b/crypto/pkcs7/pk7_mime.c
index 831b47d230b7708d46d4c93d75c5e01bb57e629a..2eca5ea9817d1a03ae89e6cb304c2dcca882f962 100644 (file)
--- a/crypto/pkcs7/pk7_mime.c
+++ b/crypto/pkcs7/pk7_mime.c
@@ -1,5 +1,6 @@
 /* pk7_mime.c */
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+/*
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
 /* ====================================================================
@@ -10,7 +11,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
@@ -62,64 +63,61 @@
 /* PKCS#7 wrappers round generalised MIME routines */
 
 PKCS7 *SMIME_read_PKCS7(BIO *bio, BIO **bcont)
-       {
-       return (PKCS7 *)SMIME_read_ASN1(bio, bcont, ASN1_ITEM_rptr(PKCS7));
-       }
+{
+    return (PKCS7 *)SMIME_read_ASN1(bio, bcont, ASN1_ITEM_rptr(PKCS7));
+}
 
 /* Callback for int_smime_write_ASN1 */
 
 static int pk7_output_data(BIO *out, BIO *data, ASN1_VALUE *val, int flags,
-                                       const ASN1_ITEM *it)
-       {
-       PKCS7 *p7 = (PKCS7 *)val;
-       BIO *tmpbio, *p7bio;
+                           const ASN1_ITEM *it)
+{
+    PKCS7 *p7 = (PKCS7 *)val;
+    BIO *tmpbio, *p7bio;
 
-       if (!(flags & SMIME_DETACHED))
-               {
-               SMIME_crlf_copy(data, out, flags);
-               return 1;
-               }
+    if (!(flags & SMIME_DETACHED)) {
+        SMIME_crlf_copy(data, out, flags);
+        return 1;
+    }
 
-       /* Let PKCS7 code prepend any needed BIOs */
+    /* Let PKCS7 code prepend any needed BIOs */
 
-       p7bio = PKCS7_dataInit(p7, out);
+    p7bio = PKCS7_dataInit(p7, out);
 
-       if (!p7bio)
-               return 0;
+    if (!p7bio)
+        return 0;
 
-       /* Copy data across, passing through filter BIOs for processing */
-       SMIME_crlf_copy(data, p7bio, flags);
+    /* Copy data across, passing through filter BIOs for processing */
+    SMIME_crlf_copy(data, p7bio, flags);
 
-       /* Finalize structure */
-       if (PKCS7_dataFinal(p7, p7bio) <= 0)
-               goto err;
+    /* Finalize structure */
+    if (PKCS7_dataFinal(p7, p7bio) <= 0)
+        goto err;
 
-       err:
+ err:
 
-       /* Now remove any digests prepended to the BIO */
+    /* Now remove any digests prepended to the BIO */
 
-       while (p7bio != out)
-               {
-               tmpbio = BIO_pop(p7bio);
-               BIO_free(p7bio);
-               p7bio = tmpbio;
-               }
+    while (p7bio != out) {
+        tmpbio = BIO_pop(p7bio);
+        BIO_free(p7bio);
+        p7bio = tmpbio;
+    }
 
-       return 1;
+    return 1;
 
-       }
+}
 
 int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags)
-       {
-       STACK_OF(X509_ALGOR) *mdalgs;
-       int ctype_nid = OBJ_obj2nid(p7->type);
-       if (ctype_nid == NID_pkcs7_signed)
-               mdalgs = p7->d.sign->md_algs;
-       else
-               mdalgs = NULL;
-
-       return int_smime_write_ASN1(bio, (ASN1_VALUE *)p7, data, flags,
-                                       ctype_nid, NID_undef, mdalgs,
-                                       pk7_output_data,
-                                       ASN1_ITEM_rptr(PKCS7)); 
-       }
+{
+    STACK_OF(X509_ALGOR) *mdalgs;
+    int ctype_nid = OBJ_obj2nid(p7->type);
+    if (ctype_nid == NID_pkcs7_signed)
+        mdalgs = p7->d.sign->md_algs;
+    else
+        mdalgs = NULL;
+
+    return int_smime_write_ASN1(bio, (ASN1_VALUE *)p7, data, flags,
+                                ctype_nid, NID_undef, mdalgs,
+                                pk7_output_data, ASN1_ITEM_rptr(PKCS7));
+}