Workaround for some CMS signature formats.
[openssl.git] / apps / verify.c
index abb6ab3..b754fe3 100644 (file)
@@ -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, time_t at_time);
+               STACK_OF(X509_CRL) *crls, ENGINE *e, int show_chain);
 static int v_verbose=0, vflags = 0;
 
 int MAIN(int, char **);
@@ -83,14 +83,12 @@ int MAIN(int argc, char **argv)
        int i,ret=1, badarg = 0;
        char *CApath=NULL,*CAfile=NULL;
        char *untfile = NULL, *trustfile = NULL, *crlfile = NULL;
-       char *checktime_string = NULL;
-       long int timestamp;
-       time_t t = 0;
        STACK_OF(X509) *untrusted = NULL, *trusted = NULL;
        STACK_OF(X509_CRL) *crls = NULL;
        X509_STORE *cert_ctx=NULL;
        X509_LOOKUP *lookup=NULL;
        X509_VERIFY_PARAM *vpm = NULL;
+       int crl_download = 0, show_chain = 0;
 #ifndef OPENSSL_NO_ENGINE
        char *engine=NULL;
 #endif
@@ -148,11 +146,10 @@ int MAIN(int argc, char **argv)
                                if (argc-- < 1) goto end;
                                crlfile= *(++argv);
                                }
-                       else if (strcmp(*argv,"-attime") == 0)
-                               {
-                               if (argc-- < 1) goto end;
-                               checktime_string= *(++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)
                                {
@@ -230,28 +227,25 @@ int MAIN(int argc, char **argv)
                        goto end;
                }
 
-       if(checktime_string)
-               {
-               /* interpret the -attime argument as seconds since Epoch */
-               if (sscanf(checktime_string, "%li", &timestamp) != 1)
-                       {
-                       BIO_printf(bio_err, "Error parsing timestamp %s\n",
-                                          checktime_string);
-                       ERR_print_errors(bio_err);
-                       goto end;
-                       }
-               t = (time_t) timestamp;  /* on some platforms time_t may be a float */
-               }
+       if (crl_download)
+               store_setup_crl_download(cert_ctx);
 
-       if (argc < 1) check(cert_ctx, NULL, untrusted, trusted, crls, e, t);
+       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, t);
-       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]");
-               BIO_printf(bio_err," [-attime timestamp]");
 #ifndef OPENSSL_NO_ENGINE
                BIO_printf(bio_err," [-engine e]");
 #endif
@@ -263,8 +257,8 @@ end:
                        X509_PURPOSE *ptmp;
                        ptmp = X509_PURPOSE_get0(i);
                        BIO_printf(bio_err, "\t%-10s\t%s\n",
-                                       X509_PURPOSE_get0_sname(ptmp),
-                                       X509_PURPOSE_get0_name(ptmp));
+                                  X509_PURPOSE_get0_sname(ptmp),
+                                  X509_PURPOSE_get0_name(ptmp));
                        }
 
                BIO_printf(bio_err,"recognized verify names:\n");
@@ -283,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, time_t at_time)
+               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)
@@ -314,10 +309,9 @@ static int check(X509_STORE *ctx, char *file,
        if(tchain) X509_STORE_CTX_trusted_stack(csc, tchain);
        if (crls)
                X509_STORE_CTX_set0_crls(csc, crls);
-       if (at_time) 
-               X509_STORE_CTX_set_time(csc, 0, at_time);
-
        i=X509_verify_cert(csc);
+       if (i > 0 && show_chain)
+               chain = X509_STORE_CTX_get1_chain(csc);
        X509_STORE_CTX_free(csc);
 
        ret=0;
@@ -329,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);