From 462f18c7b25fe3e467f837647d07ab0a78aa8d2b Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 22 Feb 2015 21:39:56 +0100 Subject: Merged origin/release (checked in because wanted to merge new stuff) --- openssl/demos/smime/smdec.c | 107 +++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 56 deletions(-) (limited to 'openssl/demos/smime/smdec.c') diff --git a/openssl/demos/smime/smdec.c b/openssl/demos/smime/smdec.c index 8b1a8545a..6814d5199 100644 --- a/openssl/demos/smime/smdec.c +++ b/openssl/demos/smime/smdec.c @@ -4,80 +4,75 @@ #include int main(int argc, char **argv) - { - BIO *in = NULL, *out = NULL, *tbio = NULL; - X509 *rcert = NULL; - EVP_PKEY *rkey = NULL; - PKCS7 *p7 = NULL; - int ret = 1; +{ + BIO *in = NULL, *out = NULL, *tbio = NULL; + X509 *rcert = NULL; + EVP_PKEY *rkey = NULL; + PKCS7 *p7 = 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 content being signed */ - in = BIO_new_file("smencr.txt", "r"); + in = BIO_new_file("smencr.txt", "r"); - if (!in) - goto err; + if (!in) + goto err; - /* Sign content */ - p7 = SMIME_read_PKCS7(in, NULL); + /* Sign content */ + p7 = SMIME_read_PKCS7(in, NULL); - if (!p7) - goto err; + if (!p7) + goto err; - out = BIO_new_file("encrout.txt", "w"); - if (!out) - goto err; + out = BIO_new_file("encrout.txt", "w"); + if (!out) + goto err; - /* Decrypt S/MIME message */ - if (!PKCS7_decrypt(p7, rkey, rcert, out, 0)) - goto err; + /* Decrypt S/MIME message */ + if (!PKCS7_decrypt(p7, rkey, rcert, out, 0)) + goto err; - ret = 0; + ret = 0; - err: + err: - if (ret) - { - fprintf(stderr, "Error Signing Data\n"); - ERR_print_errors_fp(stderr); - } - - if (p7) - PKCS7_free(p7); - 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; - - } + if (ret) { + fprintf(stderr, "Error Signing Data\n"); + ERR_print_errors_fp(stderr); + } + if (p7) + PKCS7_free(p7); + 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; +} -- cgit v1.2.3