X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=apps%2Fverify.c;h=b754fe3e0844de86bb95e25eeaf93e1baecaadcf;hp=bcca114efe4557675b6b4ed5c5b0cc483a5070ce;hb=e03c5b59f04684c55a173d1a8ac38df7e4b21c48;hpb=0090a686c0620e5f7d72aef2e74f4a0e01c53e3e;ds=sidebyside

diff --git a/apps/verify.c b/apps/verify.c
index bcca114efe..b754fe3e08 100644
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -72,7 +72,7 @@
 static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx);
 static int check(X509_STORE *ctx, char *file,
 		STACK_OF(X509) *uchain, STACK_OF(X509) *tchain,
-		STACK_OF(X509_CRL) *crls, ENGINE *e);
+		STACK_OF(X509_CRL) *crls, ENGINE *e, int show_chain);
 static int v_verbose=0, vflags = 0;
 
 int MAIN(int, char **);
@@ -88,7 +88,7 @@ int MAIN(int argc, char **argv)
 	X509_STORE *cert_ctx=NULL;
 	X509_LOOKUP *lookup=NULL;
 	X509_VERIFY_PARAM *vpm = NULL;
-	int crl_download = 0;
+	int crl_download = 0, show_chain = 0;
 #ifndef OPENSSL_NO_ENGINE
 	char *engine=NULL;
 #endif
@@ -148,6 +148,8 @@ int MAIN(int argc, char **argv)
 				}
 			else if (strcmp(*argv,"-crl_download") == 0)
 				crl_download = 1;
+			else if (strcmp(*argv,"-show_chain") == 0)
+				show_chain = 1;
 #ifndef OPENSSL_NO_ENGINE
 			else if (strcmp(*argv,"-engine") == 0)
 				{
@@ -228,11 +230,19 @@ int MAIN(int argc, char **argv)
 	if (crl_download)
 		store_setup_crl_download(cert_ctx);
 
-	if (argc < 1) check(cert_ctx, NULL, untrusted, trusted, crls, e);
+	ret=0;
+	if (argc < 1)
+		{ 
+		if (1 != check(cert_ctx, NULL, untrusted, trusted, crls, e, show_chain))
+			ret=-1;
+		}
 	else
+		{
 		for (i=0; i<argc; i++)
-			check(cert_ctx,argv[i], untrusted, trusted, crls, e);
-	ret=0;
+			if (1 != check(cert_ctx,argv[i], untrusted, trusted, crls, e, show_chain))
+				ret=-1;
+		}
+
 end:
 	if (ret == 1) {
 		BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] [-crl_check]");
@@ -267,16 +277,17 @@ end:
 	sk_X509_pop_free(trusted, X509_free);
 	sk_X509_CRL_pop_free(crls, X509_CRL_free);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	OPENSSL_EXIT(ret < 0 ? 2 : ret);
 	}
 
 static int check(X509_STORE *ctx, char *file,
 		STACK_OF(X509) *uchain, STACK_OF(X509) *tchain,
-		STACK_OF(X509_CRL) *crls, ENGINE *e)
+		STACK_OF(X509_CRL) *crls, ENGINE *e, int show_chain)
 	{
 	X509 *x=NULL;
 	int i=0,ret=0;
 	X509_STORE_CTX *csc;
+	STACK_OF(X509) *chain = NULL;
 
 	x = load_cert(bio_err, file, FORMAT_PEM, NULL, e, "certificate file");
 	if (x == NULL)
@@ -299,6 +310,8 @@ static int check(X509_STORE *ctx, char *file,
 	if (crls)
 		X509_STORE_CTX_set0_crls(csc, crls);
 	i=X509_verify_cert(csc);
+	if (i > 0 && show_chain)
+		chain = X509_STORE_CTX_get1_chain(csc);
 	X509_STORE_CTX_free(csc);
 
 	ret=0;
@@ -310,6 +323,20 @@ end:
 		}
 	else
 		ERR_print_errors(bio_err);
+	if (chain)
+		{
+		printf("Chain:\n");
+		for (i = 0; i < sk_X509_num(chain); i++)
+			{
+			X509 *cert = sk_X509_value(chain, i);
+			printf("depth=%d: ", i);
+			X509_NAME_print_ex_fp(stdout,
+				X509_get_subject_name(cert),
+				0, XN_FLAG_ONELINE);
+			printf("\n");
+			}
+		sk_X509_pop_free(chain, X509_free);
+		}
 	if (x != NULL) X509_free(x);
 
 	return(ret);