Use the default_md config file value when signing CRLs.

[openssl.git] / apps / verify.c

diff --git a/apps/verify.c b/apps/verify.c
index 8cd675ff0ab9ce486ad0cd3124d438c538c098be..f7c85b8dd66ddded6648f7dcdcf5aea9a6f3d324 100644 (file)
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -60,32 +60,36 @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"

-#include "bio.h"
-#include "err.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+#include <openssl/pem.h>

 
 #undef PROG
 #define PROG   verify_main
 
 
 #undef PROG
 #define PROG   verify_main
 

-#ifndef NOPROTO

 static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx);
 static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx);

-static int check(X509_STORE *ctx,char *file);
-#else
-static int MS_CALLBACK cb();
-static int check();
-#endif
+static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X509) *tchain, int purpose, ENGINE *e);
+static STACK_OF(X509) *load_untrusted(char *file);
+static int v_verbose=0, vflags = 0;

 
 

-static int v_verbose=0;
+int MAIN(int, char **);

 
 

-int MAIN(argc, argv)
-int argc;
-char **argv;
+int MAIN(int argc, char **argv)

        {
        {

-       int i,ret=1;
+       ENGINE *e = NULL;
+       int i,ret=1, badarg = 0;
+       int purpose = -1;

        char *CApath=NULL,*CAfile=NULL;
        char *CApath=NULL,*CAfile=NULL;

+       char *untfile = NULL, *trustfile = NULL;
+       STACK_OF(X509) *untrusted = NULL, *trusted = NULL;

        X509_STORE *cert_ctx=NULL;
        X509_LOOKUP *lookup=NULL;
        X509_STORE *cert_ctx=NULL;
        X509_LOOKUP *lookup=NULL;

+       X509_VERIFY_PARAM *vpm = NULL;
+#ifndef OPENSSL_NO_ENGINE
+       char *engine=NULL;
+#endif

 
        cert_ctx=X509_STORE_new();
        if (cert_ctx == NULL) goto end;
 
        cert_ctx=X509_STORE_new();
        if (cert_ctx == NULL) goto end;


@@ -99,6 +103,9 @@ char **argv;
                if ((bio_err=BIO_new(BIO_s_file())) != NULL)
                        BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
                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;
+

        argc--;
        argv++;
        for (;;)
        argc--;
        argv++;
        for (;;)


@@ -115,6 +122,30 @@ char **argv;
                                if (argc-- < 1) goto end;
                                CAfile= *(++argv);
                                }
                                if (argc-- < 1) goto end;
                                CAfile= *(++argv);
                                }

+                       else if (args_verify(&argv, &argc, &badarg, bio_err,
+                                                                       &vpm))
+                               {
+                               if (badarg)
+                                       goto end;
+                               continue;
+                               }
+                       else if (strcmp(*argv,"-untrusted") == 0)
+                               {
+                               if (argc-- < 1) goto end;
+                               untfile= *(++argv);
+                               }
+                       else if (strcmp(*argv,"-trusted") == 0)
+                               {
+                               if (argc-- < 1) goto end;
+                               trustfile= *(++argv);
+                               }
+#ifndef OPENSSL_NO_ENGINE
+                       else if (strcmp(*argv,"-engine") == 0)
+                               {
+                               if (--argc < 1) goto end;
+                               engine= *(++argv);
+                               }
+#endif

                        else if (strcmp(*argv,"-help") == 0)
                                goto end;
                        else if (strcmp(*argv,"-verbose") == 0)
                        else if (strcmp(*argv,"-help") == 0)
                                goto end;
                        else if (strcmp(*argv,"-verbose") == 0)


@@ -130,69 +161,108 @@ char **argv;
                        break;
                }
 
                        break;
                }
 

+#ifndef OPENSSL_NO_ENGINE
+        e = setup_engine(bio_err, engine, 0);
+#endif
+
+       if (vpm)
+               X509_STORE_set1_param(cert_ctx, vpm);
+

        lookup=X509_STORE_add_lookup(cert_ctx,X509_LOOKUP_file());
        if (lookup == NULL) abort();
        lookup=X509_STORE_add_lookup(cert_ctx,X509_LOOKUP_file());
        if (lookup == NULL) abort();

-       if (!X509_LOOKUP_load_file(lookup,CAfile,X509_FILETYPE_PEM))
-               X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT);
+       if (CAfile) {
+               i=X509_LOOKUP_load_file(lookup,CAfile,X509_FILETYPE_PEM);
+               if(!i) {
+                       BIO_printf(bio_err, "Error loading file %s\n", CAfile);
+                       ERR_print_errors(bio_err);
+                       goto end;
+               }
+       } else X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT);

                
        lookup=X509_STORE_add_lookup(cert_ctx,X509_LOOKUP_hash_dir());
        if (lookup == NULL) abort();
                
        lookup=X509_STORE_add_lookup(cert_ctx,X509_LOOKUP_hash_dir());
        if (lookup == NULL) abort();

-       if (!X509_LOOKUP_add_dir(lookup,CApath,X509_FILETYPE_PEM))
-               X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT);
+       if (CApath) {
+               i=X509_LOOKUP_add_dir(lookup,CApath,X509_FILETYPE_PEM);
+               if(!i) {
+                       BIO_printf(bio_err, "Error loading directory %s\n", CApath);
+                       ERR_print_errors(bio_err);
+                       goto end;
+               }
+       } else X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT);

 
 

+       ERR_clear_error();
+
+       if(untfile) {
+               if(!(untrusted = load_untrusted(untfile))) {
+                       BIO_printf(bio_err, "Error loading untrusted file %s\n", untfile);
+                       ERR_print_errors(bio_err);
+                       goto end;
+               }
+       }

 
 

-       if (argc < 1) check(cert_ctx,NULL);
+       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, e);

        else
                for (i=0; i<argc; i++)
        else
                for (i=0; i<argc; i++)

-                       check(cert_ctx,argv[i]);
+                       check(cert_ctx,argv[i], untrusted, trusted, purpose, e);

        ret=0;
 end:
        ret=0;
 end:

-       if (ret == 1)
-               BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] cert1 cert2 ...\n");
+       if (ret == 1) {
+               BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] [-crl_check]");
+#ifndef OPENSSL_NO_ENGINE
+               BIO_printf(bio_err," [-engine e]");
+#endif
+               BIO_printf(bio_err," 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_get0(i);
+                       BIO_printf(bio_err, "\t%-10s\t%s\n", X509_PURPOSE_get0_sname(ptmp),
+                                                               X509_PURPOSE_get0_name(ptmp));
+               }
+       }
+       if (vpm) X509_VERIFY_PARAM_free(vpm);

        if (cert_ctx != NULL) X509_STORE_free(cert_ctx);
        if (cert_ctx != NULL) X509_STORE_free(cert_ctx);

-       EXIT(ret);
+       sk_X509_pop_free(untrusted, X509_free);
+       sk_X509_pop_free(trusted, X509_free);
+       apps_shutdown();
+       OPENSSL_EXIT(ret);

        }
 
        }
 

-static int check(ctx,file)
-X509_STORE *ctx;
-char *file;
+static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X509) *tchain, int purpose, ENGINE *e)

        {
        X509 *x=NULL;
        {
        X509 *x=NULL;

-       BIO *in=NULL;

        int i=0,ret=0;
        int i=0,ret=0;

-       X509_STORE_CTX csc;
+       X509_STORE_CTX *csc;

 
 

-       in=BIO_new(BIO_s_file());
-       if (in == NULL)
-               {
-               ERR_print_errors(bio_err);
+       x = load_cert(bio_err, file, FORMAT_PEM, NULL, e, "certificate file");
+       if (x == NULL)

                goto end;
                goto end;

-               }
+       fprintf(stdout,"%s: ",(file == NULL)?"stdin":file);

 
 

-       if (file == NULL)
-               BIO_set_fp(in,stdin,BIO_NOCLOSE);
-       else
+       csc = X509_STORE_CTX_new();
+       if (csc == NULL)

                {
                {

-               if (BIO_read_filename(in,file) <= 0)
-                       {
-                       perror(file);
-                       goto end;
-                       }
+               ERR_print_errors(bio_err);
+               goto end;

                }
                }

-
-       x=PEM_read_bio_X509(in,NULL,NULL);
-       if (x == NULL)
+       X509_STORE_set_flags(ctx, vflags);
+       if(!X509_STORE_CTX_init(csc,ctx,x,uchain))

                {
                {

-               fprintf(stdout,"%s: unable to load certificate file\n",
-                       (file == NULL)?"stdin":file);

                ERR_print_errors(bio_err);
                goto end;
                }
                ERR_print_errors(bio_err);
                goto end;
                }

-       fprintf(stdout,"%s: ",(file == NULL)?"stdin":file);
-
-       X509_STORE_CTX_init(&csc,ctx,x,NULL);
-       i=X509_verify_cert(&csc);
-       X509_STORE_CTX_cleanup(&csc);
+       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);

 
        ret=0;
 end:
 
        ret=0;
 end:


@@ -204,35 +274,94 @@ end:
        else
                ERR_print_errors(bio_err);
        if (x != NULL) X509_free(x);
        else
                ERR_print_errors(bio_err);
        if (x != NULL) X509_free(x);

-       if (in != NULL) BIO_free(in);

 
        return(ret);
        }
 
 
        return(ret);
        }
 

-static int MS_CALLBACK cb(ok,ctx)
-int ok;
-X509_STORE_CTX *ctx;
+static STACK_OF(X509) *load_untrusted(char *certfile)
+{
+       STACK_OF(X509_INFO) *sk=NULL;
+       STACK_OF(X509) *stack=NULL, *ret=NULL;
+       BIO *in=NULL;
+       X509_INFO *xi;
+
+       if(!(stack = sk_X509_new_null())) {
+               BIO_printf(bio_err,"memory allocation failure\n");
+               goto end;
+       }
+
+       if(!(in=BIO_new_file(certfile, "r"))) {
+               BIO_printf(bio_err,"error opening the file, %s\n",certfile);
+               goto end;
+       }
+
+       /* This loads from a file, a stack of x509/crl/pkey sets */
+       if(!(sk=PEM_X509_INFO_read_bio(in,NULL,NULL,NULL))) {
+               BIO_printf(bio_err,"error reading the file, %s\n",certfile);
+               goto end;
+       }
+
+       /* scan over it and pull out the certs */
+       while (sk_X509_INFO_num(sk))
+               {
+               xi=sk_X509_INFO_shift(sk);
+               if (xi->x509 != NULL)
+                       {
+                       sk_X509_push(stack,xi->x509);
+                       xi->x509=NULL;
+                       }
+               X509_INFO_free(xi);
+               }
+       if(!sk_X509_num(stack)) {
+               BIO_printf(bio_err,"no certificates in file, %s\n",certfile);
+               sk_X509_free(stack);
+               goto end;
+       }
+       ret=stack;
+end:
+       BIO_free(in);
+       sk_X509_INFO_free(sk);
+       return(ret);
+       }
+
+static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx)

        {
        char buf[256];
 
        if (!ok)
                {
        {
        char buf[256];
 
        if (!ok)
                {

-               /* since we are just checking the certificates, it is
-                * ok if they are self signed. */
-               if (ctx->error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
-                       ok=1;
-               else
+               if (ctx->current_cert)

                        {
                        X509_NAME_oneline(
                        {
                        X509_NAME_oneline(

-                               X509_get_subject_name(ctx->current_cert),buf,256);
+                               X509_get_subject_name(ctx->current_cert),buf,
+                               sizeof buf);

                        printf("%s\n",buf);
                        printf("%s\n",buf);

-                       printf("error %d at %d depth lookup:%s\n",ctx->error,
-                               ctx->error_depth,
-                               X509_verify_cert_error_string(ctx->error));
-                       if (ctx->error == X509_V_ERR_CERT_HAS_EXPIRED)
-                               ok=1;

                        }
                        }

+               printf("error %d at %d depth lookup:%s\n",ctx->error,
+                       ctx->error_depth,
+                       X509_verify_cert_error_string(ctx->error));
+               if (ctx->error == X509_V_ERR_CERT_HAS_EXPIRED) ok=1;
+               /* since we are just checking the certificates, it is
+                * ok if they are self signed. But we should still warn
+                * the user.
+                */
+               if (ctx->error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT) ok=1;
+               /* Continue after extension errors too */
+               if (ctx->error == X509_V_ERR_INVALID_CA) ok=1;
+               if (ctx->error == X509_V_ERR_PATH_LENGTH_EXCEEDED) ok=1;
+               if (ctx->error == X509_V_ERR_INVALID_PURPOSE) ok=1;
+               if (ctx->error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT) ok=1;
+               if (ctx->error == X509_V_ERR_CRL_HAS_EXPIRED) ok=1;
+               if (ctx->error == X509_V_ERR_CRL_NOT_YET_VALID) ok=1;
+               if (ctx->error == X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION) ok=1;
+
+               if (ctx->error == X509_V_ERR_NO_EXPLICIT_POLICY)
+                       policies_print(NULL, ctx);
+               return ok;
+

                }
                }

+       if ((ctx->error == X509_V_OK) && (ok == 2))
+               policies_print(NULL, ctx);

        if (!v_verbose)
                ERR_clear_error();
        return(ok);
        if (!v_verbose)
                ERR_clear_error();
        return(ok);