*BIG* verify code reorganisation.

[openssl.git] / apps / verify.c

diff --git a/apps/verify.c b/apps/verify.c
index c2b19a1b07fdea095f39884e36e2d432e178b811..f50eaaecb3ea0db753b8d1a5498cd53d38533a0d 100644 (file)
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -70,7 +70,7 @@
 #define PROG   verify_main
 
 static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx);
-static int check(X509_STORE *ctx,char *file, STACK_OF(X509)*other, int purpose);
+static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X509) *tchain, int purpose);
 static STACK_OF(X509) *load_untrusted(char *file);
 static int v_verbose=0;
 
@@ -81,8 +81,8 @@ int MAIN(int argc, char **argv)
        int i,ret=1;
        int purpose = -1;
        char *CApath=NULL,*CAfile=NULL;
-       char *untfile = NULL;
-       STACK_OF(X509) *untrusted = NULL;
+       char *untfile = NULL, *trustfile = NULL;
+       STACK_OF(X509) *untrusted = NULL, *trusted = NULL;
        X509_STORE *cert_ctx=NULL;
        X509_LOOKUP *lookup=NULL;
 
@@ -124,7 +124,7 @@ int MAIN(int argc, char **argv)
                                        BIO_printf(bio_err, "unrecognized purpose\n");
                                        goto end;
                                        }
-                               xptmp = X509_PURPOSE_iget(i);
+                               xptmp = X509_PURPOSE_get0(i);
                                purpose = X509_PURPOSE_get_id(xptmp);
                                }
                        else if (strcmp(*argv,"-untrusted") == 0)
@@ -132,6 +132,11 @@ int MAIN(int argc, char **argv)
                                if (argc-- < 1) goto end;
                                untfile= *(++argv);
                                }
+                       else if (strcmp(*argv,"-trusted") == 0)
+                               {
+                               if (argc-- < 1) goto end;
+                               trustfile= *(++argv);
+                               }
                        else if (strcmp(*argv,"-help") == 0)
                                goto end;
                        else if (strcmp(*argv,"-verbose") == 0)
@@ -179,28 +184,37 @@ int MAIN(int argc, char **argv)
                }
        }
 
-       if (argc < 1) check(cert_ctx, NULL, untrusted, purpose);
+       if(trustfile) {
+               if(!(trusted = load_untrusted(trustfile))) {
+                       BIO_printf(bio_err, "Error loading untrusted file %s\n", trustfile);
+                       ERR_print_errors(bio_err);
+                       goto end;
+               }
+       }
+
+       if (argc < 1) check(cert_ctx, NULL, untrusted, trusted, purpose);
        else
                for (i=0; i<argc; i++)
-                       check(cert_ctx,argv[i], untrusted, purpose);
+                       check(cert_ctx,argv[i], untrusted, trusted, purpose);
        ret=0;
 end:
        if (ret == 1) {
-               BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] cert1 cert2 ...\n");
+               BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] cert1 cert2 ...\n");
                BIO_printf(bio_err,"recognized usages:\n");
                for(i = 0; i < X509_PURPOSE_get_count(); i++) {
                        X509_PURPOSE *ptmp;
-                       ptmp = X509_PURPOSE_iget(i);
+                       ptmp = X509_PURPOSE_get0(i);
                        BIO_printf(bio_err, "\t%-10s\t%s\n", X509_PURPOSE_get0_sname(ptmp),
                                                                X509_PURPOSE_get0_name(ptmp));
                }
        }
        if (cert_ctx != NULL) X509_STORE_free(cert_ctx);
        sk_X509_pop_free(untrusted, X509_free);
+       sk_X509_pop_free(trusted, X509_free);
        EXIT(ret);
        }
 
-static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, int purpose)
+static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X509) *tchain, int purpose)
        {
        X509 *x=NULL;
        BIO *in=NULL;
@@ -242,6 +256,7 @@ static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, int purpos
                goto end;
                }
        X509_STORE_CTX_init(csc,ctx,x,uchain);
+       if(tchain) X509_STORE_CTX_trusted_stack(csc, tchain);
        if(purpose >= 0) X509_STORE_CTX_set_purpose(csc, purpose);
        i=X509_verify_cert(csc);
        X509_STORE_CTX_free(csc);