allow setting of verify names in command line utilities and print out verify names...
authorDr. Stephen Henson <steve@openssl.org>
Thu, 25 Feb 2010 00:11:32 +0000 (00:11 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 25 Feb 2010 00:11:32 +0000 (00:11 +0000)
apps/apps.c
apps/verify.c

index 5dccea7..4688224 100644 (file)
@@ -2239,6 +2239,7 @@ int args_verify(char ***pargs, int *pargc,
        int purpose = 0, depth = -1;
        char **oldargs = *pargs;
        char *arg = **pargs, *argn = (*pargs)[1];
+       const X509_VERIFY_PARAM *vpm = NULL;
        if (!strcmp(arg, "-policy"))
                {
                if (!argn)
@@ -2276,6 +2277,21 @@ int args_verify(char ***pargs, int *pargc,
                        }
                (*pargs)++;
                }
+       else if (strcmp(arg,"-verify_name") == 0)
+               {
+               if (!argn)
+                       *badarg = 1;
+               else
+                       {
+                       vpm = X509_VERIFY_PARAM_lookup(argn);
+                       if(!vpm)
+                               {
+                               BIO_printf(err, "unrecognized verify name\n");
+                               *badarg = 1;
+                               }
+                       }
+               (*pargs)++;
+               }
        else if (strcmp(arg,"-verify_depth") == 0)
                {
                if (!argn)
@@ -2334,6 +2350,9 @@ int args_verify(char ***pargs, int *pargc,
                goto end;
                }
 
+       if (vpm)
+               X509_VERIFY_PARAM_set1(*pm, vpm);
+
        if (otmp)
                X509_VERIFY_PARAM_add0_policy(*pm, otmp);
        if (flags)
index 9163997..4fd6b19 100644 (file)
@@ -234,13 +234,26 @@ end:
                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++) {
+               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));
-               }
+                       BIO_printf(bio_err, "\t%-10s\t%s\n",
+                                       X509_PURPOSE_get0_sname(ptmp),
+                                       X509_PURPOSE_get0_name(ptmp));
+                       }
+
+               BIO_printf(bio_err,"recognized verify names:\n");
+               for(i = 0; i < X509_VERIFY_PARAM_get_count(); i++)
+                       {
+                       const X509_VERIFY_PARAM *vptmp;
+                       vptmp = X509_VERIFY_PARAM_get0(i);
+                       BIO_printf(bio_err, "\t%-10s\n",
+                                       X509_VERIFY_PARAM_get0_name(vptmp));
+                       }
+
        }
        if (vpm) X509_VERIFY_PARAM_free(vpm);
        if (cert_ctx != NULL) X509_STORE_free(cert_ctx);