Commit 4ec3d785 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Reformat smime.c

parent 5d7c222d

apps/smime.c

+331 −167
Original line number Diff line number Diff line
@@ -119,18 +119,26 @@ int MAIN(int argc, char **argv) 
	apps_startup();



	if (bio_err == NULL)

		{

		if ((bio_err = BIO_new(BIO_s_file())) != NULL)

			BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT);

		}



	if (!load_config(bio_err, NULL))

		goto end;



	while (!badarg && *args && *args[0] == '-') {

		if (!strcmp (*args, "-encrypt")) operation = SMIME_ENCRYPT;

		else if (!strcmp (*args, "-decrypt")) operation = SMIME_DECRYPT;

		else if (!strcmp (*args, "-sign")) operation = SMIME_SIGN;

		else if (!strcmp (*args, "-verify")) operation = SMIME_VERIFY;

		else if (!strcmp (*args, "-pk7out")) operation = SMIME_PK7OUT;

	while (!badarg && *args && *args[0] == '-')

		{

		if (!strcmp (*args, "-encrypt"))

			operation = SMIME_ENCRYPT;

		else if (!strcmp (*args, "-decrypt"))

			operation = SMIME_DECRYPT;

		else if (!strcmp (*args, "-sign"))

			operation = SMIME_SIGN;

		else if (!strcmp (*args, "-verify"))

			operation = SMIME_VERIFY;

		else if (!strcmp (*args, "-pk7out"))

			operation = SMIME_PK7OUT;

#ifndef OPENSSL_NO_DES

		else if (!strcmp (*args, "-des3")) 

				cipher = EVP_des_ede3_cbc();
@@ -177,100 +185,187 @@ int MAIN(int argc, char **argv) 
				flags |= PKCS7_NOOLDMIMETYPE;

		else if (!strcmp (*args, "-crlfeol"))

				flags |= PKCS7_CRLFEOL;

		else if (!strcmp(*args,"-rand")) {

			if (args[1]) {

		else if (!strcmp(*args,"-rand"))

			{

			if (args[1])

				{

				args++;

				inrand = *args;

			} else badarg = 1;

				}

			else

				badarg = 1;

			need_rand = 1;

			}

#ifndef OPENSSL_NO_ENGINE

		} else if (!strcmp(*args,"-engine")) {

			if (args[1]) {

		else if (!strcmp(*args,"-engine"))

			{

			if (args[1])

				{

				args++;

				engine = *args;

			} else badarg = 1;

				}

			else badarg = 1;

			}

#endif

		} else if (!strcmp(*args,"-passin")) {

			if (args[1]) {

		else if (!strcmp(*args,"-passin"))

			{

			if (args[1])

				{

				args++;

				passargin = *args;

			} else badarg = 1;

		} else if (!strcmp (*args, "-to")) {

			if (args[1]) {

				}

			else

				badarg = 1;

			}

		else if (!strcmp (*args, "-to"))

			{

			if (args[1])

				{

				args++;

				to = *args;

			} else badarg = 1;

		} else if (!strcmp (*args, "-from")) {

			if (args[1]) {

				}

			else

				badarg = 1;

			}

		else if (!strcmp (*args, "-from"))

			{

			if (args[1])

				{

				args++;

				from = *args;

			} else badarg = 1;

		} else if (!strcmp (*args, "-subject")) {

			if (args[1]) {

				}

			else badarg = 1;

			}

		else if (!strcmp (*args, "-subject"))

			{

			if (args[1])

				{

				args++;

				subject = *args;

			} else badarg = 1;

		} else if (!strcmp (*args, "-signer")) {

			if (args[1]) {

				}

			else

				badarg = 1;

			}

		else if (!strcmp (*args, "-signer"))

			{

			if (args[1])

				{

				args++;

				signerfile = *args;

			} else badarg = 1;

		} else if (!strcmp (*args, "-recip")) {

			if (args[1]) {

				}

			else

				badarg = 1;

			}

		else if (!strcmp (*args, "-recip"))

			{

			if (args[1])

				{

				args++;

				recipfile = *args;

			} else badarg = 1;

		} else if (!strcmp (*args, "-inkey")) {

			if (args[1]) {

				}

			else badarg = 1;

			}

		else if (!strcmp (*args, "-inkey"))

			{

			if (args[1])

				{

				args++;

				keyfile = *args;

			} else badarg = 1;

		} else if (!strcmp (*args, "-keyform")) {

			if (args[1]) {

				}

			else

				badarg = 1;

		}

		else if (!strcmp (*args, "-keyform"))

			{

			if (args[1])

				{

				args++;

				keyform = str2fmt(*args);

			} else badarg = 1;

		} else if (!strcmp (*args, "-certfile")) {

			if (args[1]) {

				}

			else

				badarg = 1;

			}

		else if (!strcmp (*args, "-certfile"))

			{

			if (args[1])

				{

				args++;

				certfile = *args;

			} else badarg = 1;

		} else if (!strcmp (*args, "-CAfile")) {

			if (args[1]) {

				}

			else

				badarg = 1;

			}

		else if (!strcmp (*args, "-CAfile"))

			{

			if (args[1])

				{

				args++;

				CAfile = *args;

			} else badarg = 1;

		} else if (!strcmp (*args, "-CApath")) {

			if (args[1]) {

				}

			else

				badarg = 1;

			}

		else if (!strcmp (*args, "-CApath"))

			{

			if (args[1])

				{

				args++;

				CApath = *args;

			} else badarg = 1;

		} else if (!strcmp (*args, "-in")) {

			if (args[1]) {

				}

			else

				badarg = 1;

			}

		else if (!strcmp (*args, "-in"))

			{

			if (args[1])

				{

				args++;

				infile = *args;

			} else badarg = 1;

		} else if (!strcmp (*args, "-inform")) {

			if (args[1]) {

				}

			else

				badarg = 1;

			}

		else if (!strcmp (*args, "-inform"))

			{

			if (args[1])

				{

				args++;

				informat = str2fmt(*args);

			} else badarg = 1;

		} else if (!strcmp (*args, "-outform")) {

			if (args[1]) {

				}

			else

				badarg = 1;

			}

		else if (!strcmp (*args, "-outform"))

			{

			if (args[1])

				{

				args++;

				outformat = str2fmt(*args);

			} else badarg = 1;

		} else if (!strcmp (*args, "-out")) {

			if (args[1]) {

				}

			else

				badarg = 1;

			}

		else if (!strcmp (*args, "-out"))

			{

			if (args[1])

				{

				args++;

				outfile = *args;

			} else badarg = 1;

		} else if (!strcmp (*args, "-content")) {

			if (args[1]) {

				}

			else

				badarg = 1;

			}

		else if (!strcmp (*args, "-content"))

			{

			if (args[1])

				{

				args++;

				contfile = *args;

			} else badarg = 1;

		} else if (args_verify(&args, &badarg, bio_err, &vpm))

				}

			else

				badarg = 1;

			}

		else if (args_verify(&args, &badarg, bio_err, &vpm))

			continue;

		else

			badarg = 1;
@@ -278,26 +373,37 @@ int MAIN(int argc, char **argv) 
		}





	if(operation == SMIME_SIGN) {

		if(!signerfile) {

	if (operation == SMIME_SIGN)

		{

		if (!signerfile)

			{

			BIO_printf(bio_err, "No signer certificate specified\n");

			badarg = 1;

			}

		need_rand = 1;

	} else if(operation == SMIME_DECRYPT) {

		if(!recipfile) {

		}

	else if (operation == SMIME_DECRYPT)

		{

		if (!recipfile)

			{

			BIO_printf(bio_err, "No recipient certificate and key specified\n");

			badarg = 1;

			}

	} else if(operation == SMIME_ENCRYPT) {

		if(!*args) {

		}

	else if (operation == SMIME_ENCRYPT)

		{

		if (!*args)

			{

			BIO_printf(bio_err, "No recipient(s) certificate(s) specified\n");

			badarg = 1;

			}

		need_rand = 1;

	} else if(!operation) badarg = 1;

		}

	else if (!operation)

		badarg = 1;



	if (badarg) {

	if (badarg)

		{

		BIO_printf (bio_err, "Usage smime [options] cert.pem ...\n");

		BIO_printf (bio_err, "where options are\n");

		BIO_printf (bio_err, "-encrypt       encrypt message\n");
@@ -358,12 +464,14 @@ int MAIN(int argc, char **argv) 
        e = setup_engine(bio_err, engine, 0);

#endif



	if(!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {

	if (!app_passwd(bio_err, passargin, NULL, &passin, NULL))

		{

		BIO_printf(bio_err, "Error getting password\n");

		goto end;

		}



	if (need_rand) {

	if (need_rand)

		{

		app_RAND_load_file(NULL, bio_err, (inrand != NULL));

		if (inrand != NULL)

			BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
@@ -372,18 +480,28 @@ int MAIN(int argc, char **argv) 


	ret = 2;



	if(operation != SMIME_SIGN) flags &= ~PKCS7_DETACHED;

	if (operation != SMIME_SIGN)

		flags &= ~PKCS7_DETACHED;



	if(operation & SMIME_OP) {

		if(flags & PKCS7_BINARY) inmode = "rb";

		if(outformat == FORMAT_ASN1) outmode = "wb";

	} else {

		if(flags & PKCS7_BINARY) outmode = "wb";

		if(informat == FORMAT_ASN1) inmode = "rb";

	if (operation & SMIME_OP)

		{

		if (flags & PKCS7_BINARY)

			inmode = "rb";

		if (outformat == FORMAT_ASN1)

			outmode = "wb";

		}

	else

		{

		if (flags & PKCS7_BINARY)

			outmode = "wb";

		if (informat == FORMAT_ASN1)

			inmode = "rb";

		}



	if(operation == SMIME_ENCRYPT) {

		if (!cipher) {

	if (operation == SMIME_ENCRYPT)

		{

		if (!cipher)

			{

#ifndef OPENSSL_NO_RC2			

			cipher = EVP_rc2_40_cbc();

#else
@@ -392,9 +510,11 @@ int MAIN(int argc, char **argv) 
#endif

			}

		encerts = sk_X509_new_null();

		while (*args) {

		while (*args)

			{

			if (!(cert = load_cert(bio_err,*args,FORMAT_PEM,

				NULL, e, "recipient certificate file"))) {

				NULL, e, "recipient certificate file")))

				{

#if 0				/* An appropriate message is already printed */

				BIO_printf(bio_err, "Can't read recipient certificate file %s\n", *args);

#endif
@@ -406,9 +526,11 @@ int MAIN(int argc, char **argv) 
			}

		}



	if(signerfile && (operation == SMIME_SIGN)) {

	if (signerfile && (operation == SMIME_SIGN))

		{

		if (!(signer = load_cert(bio_err,signerfile,FORMAT_PEM, NULL,

			e, "signer certificate"))) {

			e, "signer certificate")))

			{

#if 0			/* An appropri message has already been printed */

			BIO_printf(bio_err, "Can't read signer certificate file %s\n", signerfile);

#endif
@@ -416,9 +538,11 @@ int MAIN(int argc, char **argv) 
			}

		}



	if(certfile) {

	if (certfile)

		{

		if (!(other = load_certs(bio_err,certfile,FORMAT_PEM, NULL,

			e, "certificate file"))) {

			e, "certificate file")))

			{

#if 0			/* An appropriate message has already been printed */

			BIO_printf(bio_err, "Can't read certificate file %s\n", certfile);

#endif
@@ -427,9 +551,11 @@ int MAIN(int argc, char **argv) 
			}

		}



	if(recipfile && (operation == SMIME_DECRYPT)) {

	if (recipfile && (operation == SMIME_DECRYPT))

		{

		if (!(recip = load_cert(bio_err,recipfile,FORMAT_PEM,NULL,

			e, "recipient certificate file"))) {

			e, "recipient certificate file")))

			{

#if 0			/* An appropriate message has alrady been printed */

			BIO_printf(bio_err, "Can't read recipient certificate file %s\n", recipfile);

#endif
@@ -438,35 +564,49 @@ int MAIN(int argc, char **argv) 
			}

		}



	if(operation == SMIME_DECRYPT) {

		if(!keyfile) keyfile = recipfile;

	} else if(operation == SMIME_SIGN) {

		if(!keyfile) keyfile = signerfile;

	} else keyfile = NULL;

	if (operation == SMIME_DECRYPT)

		{

		if (!keyfile)

			keyfile = recipfile;

		}

	else if (operation == SMIME_SIGN)

		{

		if (!keyfile)

			keyfile = signerfile;

		}

	else keyfile = NULL;



	if(keyfile) {

	if (keyfile)

		{

		key = load_key(bio_err, keyfile, keyform, 0, passin, e,

			       "signing key file");

		if (!key) {

		if (!key)

			goto end;

		}

	}



	if (infile) {

		if (!(in = BIO_new_file(infile, inmode))) {

	if (infile)

		{

		if (!(in = BIO_new_file(infile, inmode)))

			{

			BIO_printf (bio_err,

				 "Can't open input file %s\n", infile);

			goto end;

			}

	} else in = BIO_new_fp(stdin, BIO_NOCLOSE);

		}

	else

		in = BIO_new_fp(stdin, BIO_NOCLOSE);



	if (outfile) {

		if (!(out = BIO_new_file(outfile, outmode))) {

	if (outfile)

		{

		if (!(out = BIO_new_file(outfile, outmode)))

			{

			BIO_printf (bio_err,

				 "Can't open output file %s\n", outfile);

			goto end;

			}

	} else {

		}

	else

		{

		out = BIO_new_fp(stdout, BIO_NOCLOSE);

#ifdef OPENSSL_SYS_VMS

		{
@@ -476,8 +616,10 @@ int MAIN(int argc, char **argv) 
#endif

		}



	if(operation == SMIME_VERIFY) {

		if(!(store = setup_verify(bio_err, CAfile, CApath))) goto end;

	if (operation == SMIME_VERIFY)

		{

		if (!(store = setup_verify(bio_err, CAfile, CApath)))

			goto end;

		X509_STORE_set_verify_cb_func(store, smime_cb);

		if (vpm)

			X509_STORE_set1_param(store, vpm);
@@ -486,9 +628,10 @@ int MAIN(int argc, char **argv) 


	ret = 3;



	if(operation == SMIME_ENCRYPT) {

	if (operation == SMIME_ENCRYPT)

		p7 = PKCS7_encrypt(encerts, in, cipher, flags);

	} else if(operation == SMIME_SIGN) {

	else if (operation == SMIME_SIGN)

		{

		/* If detached data and SMIME output enable partial

		 * signing.

		 */
@@ -496,75 +639,95 @@ int MAIN(int argc, char **argv) 
			flags |= PKCS7_STREAM;

		p7 = PKCS7_sign(signer, key, other, in, flags);

		/* Don't need to rewind for partial signing */

		if (!(flags & PKCS7_STREAM) && (BIO_reset(in) != 0)) {

		if (!(flags & PKCS7_STREAM) && (BIO_reset(in) != 0))

			{

			BIO_printf(bio_err, "Can't rewind input file\n");

			goto end;

			}

	} else {

		}

	else

		{

		if (informat == FORMAT_SMIME) 

			p7 = SMIME_read_PKCS7(in, &indata);

		else if (informat == FORMAT_PEM) 

			p7 = PEM_read_bio_PKCS7(in, NULL, NULL, NULL);

		else if (informat == FORMAT_ASN1) 

			p7 = d2i_PKCS7_bio(in, NULL);

		else {

		else

			{

			BIO_printf(bio_err, "Bad input format for PKCS#7 file\n");

			goto end;

			}



		if(!p7) {

		if (!p7)

			{

			BIO_printf(bio_err, "Error reading S/MIME message\n");

			goto end;

			}

		if(contfile) {

		if (contfile)

			{

			BIO_free(indata);

			if(!(indata = BIO_new_file(contfile, "rb"))) {

			if (!(indata = BIO_new_file(contfile, "rb")))

				{

				BIO_printf(bio_err, "Can't read content file %s\n", contfile);

				goto end;

				}

			}

		}



	if(!p7) {

	if (!p7)

		{

		BIO_printf(bio_err, "Error creating PKCS#7 structure\n");

		goto end;

		}



	ret = 4;

	if(operation == SMIME_DECRYPT) {

		if(!PKCS7_decrypt(p7, key, recip, out, flags)) {

	if (operation == SMIME_DECRYPT)

		{

		if (!PKCS7_decrypt(p7, key, recip, out, flags))

			{

			BIO_printf(bio_err, "Error decrypting PKCS#7 structure\n");

			goto end;

			}

	} else if(operation == SMIME_VERIFY) {

		}

	else if (operation == SMIME_VERIFY)

		{

		STACK_OF(X509) *signers;

		if(PKCS7_verify(p7, other, store, indata, out, flags)) {

		if (PKCS7_verify(p7, other, store, indata, out, flags))

			BIO_printf(bio_err, "Verification successful\n");

		} else {

		else

			{

			BIO_printf(bio_err, "Verification failure\n");

			goto end;

			}

		signers = PKCS7_get0_signers(p7, other, flags);

		if(!save_certs(signerfile, signers)) {

		if (!save_certs(signerfile, signers))

			{

			BIO_printf(bio_err, "Error writing signers to %s\n",

								signerfile);

			ret = 5;

			goto end;

			}

		sk_X509_free(signers);

	} else if(operation == SMIME_PK7OUT) {

		}

	else if (operation == SMIME_PK7OUT)

		PEM_write_bio_PKCS7(out, p7);

	} else {

		if(to) BIO_printf(out, "To: %s\n", to);

		if(from) BIO_printf(out, "From: %s\n", from);

		if(subject) BIO_printf(out, "Subject: %s\n", subject);

	else

		{

		if (to)

			BIO_printf(out, "To: %s\n", to);

		if (from)

			BIO_printf(out, "From: %s\n", from);

		if (subject)

			BIO_printf(out, "Subject: %s\n", subject);

		if (outformat == FORMAT_SMIME) 

			SMIME_write_PKCS7(out, p7, in, flags);

		else if (outformat == FORMAT_PEM) 

			PEM_write_bio_PKCS7(out,p7);

		else if (outformat == FORMAT_ASN1) 

			i2d_PKCS7_bio(out,p7);

		else {

		else

			{

			BIO_printf(bio_err, "Bad output format for PKCS#7 file\n");

			goto end;

			}
@@ -595,7 +758,8 @@ static int save_certs(char *signerfile, STACK_OF(X509) *signers) 
	{

	int i;

	BIO *tmp;

	if(!signerfile) return 1;

	if (!signerfile)

		return 1;

	tmp = BIO_new_file(signerfile, "w");

	if (!tmp) return 0;

	for(i = 0; i < sk_X509_num(signers); i++)