X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=demos%2Fcms%2Fcms_dec.c;h=22181c25ffd90d6cd2f2b9c340e682c99a211925;hb=03b672deca60ab1fb272f1a1e206769da969bc9a;hp=29de15dfd62a69a8949e12ab079027462f1dca58;hpb=3b28bc9910e12a8c34fb4643788e94b5c3bd184d;p=oweals%2Fopenssl.git

diff --git a/demos/cms/cms_dec.c b/demos/cms/cms_dec.c
index 29de15dfd6..22181c25ff 100644
--- a/demos/cms/cms_dec.c
+++ b/demos/cms/cms_dec.c
@@ -1,83 +1,69 @@
-/* Simple S/MIME signing example */
+/* Simple S/MIME decryption example */
 #include <openssl/pem.h>
 #include <openssl/cms.h>
 #include <openssl/err.h>
 
 int main(int argc, char **argv)
-	{
-	BIO *in = NULL, *out = NULL, *tbio = NULL;
-	X509 *rcert = NULL;
-	EVP_PKEY *rkey = NULL;
-	CMS_ContentInfo *cms = NULL;
-	int ret = 1;
+{
+    BIO *in = NULL, *out = NULL, *tbio = NULL;
+    X509 *rcert = NULL;
+    EVP_PKEY *rkey = NULL;
+    CMS_ContentInfo *cms = NULL;
+    int ret = 1;
 
-	OpenSSL_add_all_algorithms();
-	ERR_load_crypto_strings();
+    OpenSSL_add_all_algorithms();
+    ERR_load_crypto_strings();
 
-	/* Read in recipient certificate and private key */
-	tbio = BIO_new_file("signer.pem", "r");
+    /* Read in recipient certificate and private key */
+    tbio = BIO_new_file("signer.pem", "r");
 
-	if (!tbio)
-		goto err;
+    if (!tbio)
+        goto err;
 
-	rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL);
+    rcert = PEM_read_bio_X509(tbio, NULL, 0, NULL);
 
-	BIO_reset(tbio);
+    BIO_reset(tbio);
 
-	rkey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL);
+    rkey = PEM_read_bio_PrivateKey(tbio, NULL, 0, NULL);
 
-	if (!rcert || !rkey)
-		goto err;
+    if (!rcert || !rkey)
+        goto err;
 
-	/* Open content being signed */
+    /* Open S/MIME message to decrypt */
 
-	in = BIO_new_file("smencr.txt", "r");
+    in = BIO_new_file("smencr.txt", "r");
 
-	if (!in)
-		goto err;
+    if (!in)
+        goto err;
 
-	/* Sign content */
-	cms = SMIME_read_CMS(in, NULL);
+    /* Parse message */
+    cms = SMIME_read_CMS(in, NULL);
 
-	if (!cms)
-		goto err;
+    if (!cms)
+        goto err;
 
-	out = BIO_new_file("encrout.txt", "w");
-	if (!out)
-		goto err;
+    out = BIO_new_file("decout.txt", "w");
+    if (!out)
+        goto err;
 
-	/* Decrypt S/MIME message */
-	if (!CMS_decrypt(cms, rkey, rcert, out, NULL, 0))
-		goto err;
-
-	ret = 0;
-
-	err:
-
-	if (ret)
-		{
-		fprintf(stderr, "Error Signing Data\n");
-		ERR_print_errors_fp(stderr);
-		}
-
-	if (cms)
-		CMS_ContentInfo_free(cms);
-	if (rcert)
-		X509_free(rcert);
-	if (rkey)
-		EVP_PKEY_free(rkey);
-
-	if (in)
-		BIO_free(in);
-	if (out)
-		BIO_free(out);
-	if (tbio)
-		BIO_free(tbio);
-
-	return ret;
-
-	}
+    /* Decrypt S/MIME message */
+    if (!CMS_decrypt(cms, rkey, rcert, NULL, out, 0))
+        goto err;
 
+    ret = 0;
 
+ err:
 
+    if (ret) {
+        fprintf(stderr, "Error Decrypting Data\n");
+        ERR_print_errors_fp(stderr);
+    }
 
+    CMS_ContentInfo_free(cms);
+    X509_free(rcert);
+    EVP_PKEY_free(rkey);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
+    return ret;
+}