Make crypto/buildinf.h depend on configdata.pm rather than Makefile

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

diff --git a/crypto/pkcs7/pk7_mime.c b/crypto/pkcs7/pk7_mime.c
index 938f79a646cb256f3df10ac45189f7f7e407144c..19130eefc7edb07478cc7d13bd6bffd3d87e1455 100644 (file)
--- a/crypto/pkcs7/pk7_mime.c
+++ b/crypto/pkcs7/pk7_mime.c
@@ -1,5 +1,5 @@
-/* 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 +10,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
@@ -54,7 +54,7 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#include "cryptlib.h"
+#include "internal/cryptlib.h"
 #include <openssl/rand.h>
 #include <openssl/x509.h>
 #include <openssl/asn1.h>
@@ -62,36 +62,34 @@
 /* PKCS#7 wrappers round generalised stream and MIME routines */
 
 int i2d_PKCS7_bio_stream(BIO *out, PKCS7 *p7, BIO *in, int flags)
-       {
-       return i2d_ASN1_bio_stream(out, (ASN1_VALUE *)p7, in, flags,
-                                       ASN1_ITEM_rptr(PKCS7));
-       }
+{
+    return i2d_ASN1_bio_stream(out, (ASN1_VALUE *)p7, in, flags,
+                               ASN1_ITEM_rptr(PKCS7));
+}
 
 int PEM_write_bio_PKCS7_stream(BIO *out, PKCS7 *p7, BIO *in, int flags)
-       {
-       return PEM_write_bio_ASN1_stream(out, (ASN1_VALUE *) p7, in, flags,
-                                               "PKCS7",
-                                               ASN1_ITEM_rptr(PKCS7));
-       }
+{
+    return PEM_write_bio_ASN1_stream(out, (ASN1_VALUE *)p7, in, flags,
+                                     "PKCS7", ASN1_ITEM_rptr(PKCS7));
+}
 
 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;
+{
+    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;
 
-       flags ^= SMIME_OLDMIME;
+    flags ^= SMIME_OLDMIME;
 
-
-       return SMIME_write_ASN1(bio, (ASN1_VALUE *)p7, data, flags,
-                                       ctype_nid, NID_undef, mdalgs,
-                                       ASN1_ITEM_rptr(PKCS7)); 
-       }
+    return SMIME_write_ASN1(bio, (ASN1_VALUE *)p7, data, flags,
+                            ctype_nid, NID_undef, mdalgs,
+                            ASN1_ITEM_rptr(PKCS7));
+}
 
 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));
+}