Commit 33826fd0 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add support for '-' as input and output filenames in ocsp utility. 

Recognise verification arguments.
parent 92821996

apps/ocsp.c

+27 −4
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ int MAIN(int argc, char **argv) 
	long nsec = MAX_VALIDITY_PERIOD, maxage = -1;

	char *CAfile = NULL, *CApath = NULL;

	X509_STORE *store = NULL;

	X509_VERIFY_PARAM *vpm = NULL;

	STACK_OF(X509) *sign_other = NULL, *verify_other = NULL, *rother = NULL;

	char *sign_certfile = NULL, *verify_certfile = NULL, *rcertfile = NULL;

	unsigned long sign_flags = 0, verify_flags = 0, rflags = 0;
@@ -356,6 +357,12 @@ int MAIN(int argc, char **argv) 
				}

			else badarg = 1;

			}

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

			{

			if (badarg)

				goto end;

			continue;

			}

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

			{

			if (args[1])
@@ -637,6 +644,9 @@ int MAIN(int argc, char **argv) 


	if (!req && reqin)

		{

		if (!strcmp(reqin, "-"))

			derbio = BIO_new_fp(stdin, BIO_NOCLOSE);

		else

			derbio = BIO_new_file(reqin, "rb");

		if (!derbio)

			{
@@ -739,6 +749,9 @@ int MAIN(int argc, char **argv) 


	if (reqout)

		{

		if (!strcmp(respout, "-"))

			derbio = BIO_new_fp(stdout, BIO_NOCLOSE);

		else

			derbio = BIO_new_file(reqout, "wb");

		if(!derbio)

			{
@@ -782,6 +795,9 @@ int MAIN(int argc, char **argv) 
		}

	else if (respin)

		{

		if (!strcmp(respin, "-"))

			derbio = BIO_new_fp(stdin, BIO_NOCLOSE);

		else

			derbio = BIO_new_file(respin, "rb");

		if (!derbio)

			{
@@ -807,6 +823,9 @@ int MAIN(int argc, char **argv) 


	if (respout)

		{

		if (!strcmp(respout, "-"))

			derbio = BIO_new_fp(stdout, BIO_NOCLOSE);

		else

			derbio = BIO_new_file(respout, "wb");

		if(!derbio)

			{
@@ -854,6 +873,8 @@ int MAIN(int argc, char **argv) 
		store = setup_verify(bio_err, CAfile, CApath);

	if (!store)

		goto end;

	if (vpm)

		X509_STORE_set1_param(store, vpm);

	if (verify_certfile)

		{

		verify_other = load_certs(bio_err, verify_certfile, FORMAT_PEM,
@@ -904,6 +925,8 @@ end: 
	ERR_print_errors(bio_err);

	X509_free(signer);

	X509_STORE_free(store);

	if (vpm)

		X509_VERIFY_PARAM_free(vpm);

	EVP_PKEY_free(key);

	EVP_PKEY_free(rkey);

	X509_free(issuer);