Update openssl to version openssl-1.0.1m

Conflicts:
	openssl/Makefile
	openssl/Makefile.bak
	openssl/crypto/cryptlib.c

1 files changed, 34 insertions, 35 deletions

diff --git a/openssl/demos/cms/cms_uncomp.c b/openssl/demos/cms/cms_uncomp.c
index f15ae2f13..392f4b450 100644
--- a/openssl/demos/cms/cms_uncomp.c
+++ b/openssl/demos/cms/cms_uncomp.c
@@ -4,53 +4,52 @@
 #include <openssl/err.h>
 
 int main(int argc, char **argv)
-	{
-	BIO *in = NULL, *out = NULL;
-	CMS_ContentInfo *cms = NULL;
-	int ret = 1;
+{
+    BIO *in = NULL, *out = NULL;
+    CMS_ContentInfo *cms = NULL;
+    int ret = 1;
 
-	OpenSSL_add_all_algorithms();
-	ERR_load_crypto_strings();
+    OpenSSL_add_all_algorithms();
+    ERR_load_crypto_strings();
 
-	/* Open compressed content */
+    /* Open compressed content */
 
-	in = BIO_new_file("smcomp.txt", "r");
+    in = BIO_new_file("smcomp.txt", "r");
 
-	if (!in)
-		goto err;
+    if (!in)
+        goto err;
 
-	/* Sign content */
-	cms = SMIME_read_CMS(in, NULL);
+    /* Sign content */
+    cms = SMIME_read_CMS(in, NULL);
 
-	if (!cms)
-		goto err;
+    if (!cms)
+        goto err;
 
-	out = BIO_new_file("smuncomp.txt", "w");
-	if (!out)
-		goto err;
+    out = BIO_new_file("smuncomp.txt", "w");
+    if (!out)
+        goto err;
 
-	/* Uncompress S/MIME message */
-	if (!CMS_uncompress(cms, out, NULL, 0))
-		goto err;
+    /* Uncompress S/MIME message */
+    if (!CMS_uncompress(cms, out, NULL, 0))
+        goto err;
 
-	ret = 0;
+    ret = 0;
 
-	err:
+ err:
 
-	if (ret)
-		{
-		fprintf(stderr, "Error Uncompressing Data\n");
-		ERR_print_errors_fp(stderr);
-		}
+    if (ret) {
+        fprintf(stderr, "Error Uncompressing Data\n");
+        ERR_print_errors_fp(stderr);
+    }
 
-	if (cms)
-		CMS_ContentInfo_free(cms);
+    if (cms)
+        CMS_ContentInfo_free(cms);
 
-	if (in)
-		BIO_free(in);
-	if (out)
-		BIO_free(out);
+    if (in)
+        BIO_free(in);
+    if (out)
+        BIO_free(out);
 
-	return ret;
+    return ret;
 
-	}
+}