From 462f18c7b25fe3e467f837647d07ab0a78aa8d2b Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 22 Feb 2015 21:39:56 +0100
Subject: Merged origin/release (checked in because wanted to merge new stuff)

---
 openssl/demos/smime/smver.c | 110 ++++++++++++++++++++++----------------------
 1 file changed, 54 insertions(+), 56 deletions(-)

(limited to 'openssl/demos/smime/smver.c')

diff --git a/openssl/demos/smime/smver.c b/openssl/demos/smime/smver.c
index 9d360c273..21937df30 100644
--- a/openssl/demos/smime/smver.c
+++ b/openssl/demos/smime/smver.c
@@ -4,84 +4,82 @@
 #include <openssl/err.h>
 
 int main(int argc, char **argv)
-	{
-	BIO *in = NULL, *out = NULL, *tbio = NULL, *cont = NULL;
-	X509_STORE *st = NULL;
-	X509 *cacert = NULL;
-	PKCS7 *p7 = NULL;
+{
+    BIO *in = NULL, *out = NULL, *tbio = NULL, *cont = NULL;
+    X509_STORE *st = NULL;
+    X509 *cacert = NULL;
+    PKCS7 *p7 = NULL;
 
-	int ret = 1;
+    int ret = 1;
 
-	OpenSSL_add_all_algorithms();
-	ERR_load_crypto_strings();
+    OpenSSL_add_all_algorithms();
+    ERR_load_crypto_strings();
 
-	/* Set up trusted CA certificate store */
+    /* Set up trusted CA certificate store */
 
-	st = X509_STORE_new();
+    st = X509_STORE_new();
 
-	/* Read in signer certificate and private key */
-	tbio = BIO_new_file("cacert.pem", "r");
+    /* Read in signer certificate and private key */
+    tbio = BIO_new_file("cacert.pem", "r");
 
-	if (!tbio)
-		goto err;
+    if (!tbio)
+        goto err;
 
-	cacert = PEM_read_bio_X509(tbio, NULL, 0, NULL);
+    cacert = PEM_read_bio_X509(tbio, NULL, 0, NULL);
 
-	if (!cacert)
-		goto err;
+    if (!cacert)
+        goto err;
 
-	if (!X509_STORE_add_cert(st, cacert))
-		goto err;
+    if (!X509_STORE_add_cert(st, cacert))
+        goto err;
 
-	/* Open content being signed */
+    /* Open content being signed */
 
-	in = BIO_new_file("smout.txt", "r");
+    in = BIO_new_file("smout.txt", "r");
 
-	if (!in)
-		goto err;
+    if (!in)
+        goto err;
 
-	/* Sign content */
-	p7 = SMIME_read_PKCS7(in, &cont);
+    /* Sign content */
+    p7 = SMIME_read_PKCS7(in, &cont);
 
-	if (!p7)
-		goto err;
+    if (!p7)
+        goto err;
 
-	/* File to output verified content to */
-	out = BIO_new_file("smver.txt", "w");
-	if (!out)
-		goto err;
+    /* File to output verified content to */
+    out = BIO_new_file("smver.txt", "w");
+    if (!out)
+        goto err;
 
-	if (!PKCS7_verify(p7, NULL, st, cont, out, 0))
-		{
-		fprintf(stderr, "Verification Failure\n");
-		goto err;
-		}
+    if (!PKCS7_verify(p7, NULL, st, cont, out, 0)) {
+        fprintf(stderr, "Verification Failure\n");
+        goto err;
+    }
 
-	fprintf(stderr, "Verification Successful\n");
+    fprintf(stderr, "Verification Successful\n");
 
-	ret = 0;
+    ret = 0;
 
-	err:
+ err:
 
-	if (ret)
-		{
-		fprintf(stderr, "Error Verifying Data\n");
-		ERR_print_errors_fp(stderr);
-		}
+    if (ret) {
+        fprintf(stderr, "Error Verifying Data\n");
+        ERR_print_errors_fp(stderr);
+    }
 
-	if (p7)
-		PKCS7_free(p7);
+    if (p7)
+        PKCS7_free(p7);
 
-	if (cacert)
-		X509_free(cacert);
+    if (cacert)
+        X509_free(cacert);
 
-	if (in)
-		BIO_free(in);
-	if (out)
-		BIO_free(out);
-	if (tbio)
-		BIO_free(tbio);
+    if (in)
+        BIO_free(in);
+    if (out)
+        BIO_free(out);
+    if (tbio)
+        BIO_free(tbio);
 
-	return ret;
+    return ret;
 
-	}
+}
-- 
cgit v1.2.3