More get0 et al. changes. Also provide fgrep targets in CHANGES

[openssl.git] / apps / verify.c

diff --git a/apps/verify.c b/apps/verify.c
index 8a03e0f2904c6d1f89ae776f0c9477b305d431d5..267ee4ecd7853fc53c1e5ab7683e24d6c72010cd 100644 (file)
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -74,6 +74,8 @@ static int check(X509_STORE *ctx,char *file, STACK_OF(X509)*other, int purpose);
 static STACK_OF(X509) *load_untrusted(char *file);
 static int v_verbose=0;
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        int i,ret=1;
@@ -84,9 +86,6 @@ int MAIN(int argc, char **argv)
        X509_STORE *cert_ctx=NULL;
        X509_LOOKUP *lookup=NULL;
 
-       X509_PURPOSE_add_standard();
-       X509_TRUST_add_standard();
-       X509V3_add_standard_extensions();
        cert_ctx=X509_STORE_new();
        if (cert_ctx == NULL) goto end;
        X509_STORE_set_verify_cb_func(cert_ctx,cb);
@@ -122,10 +121,10 @@ int MAIN(int argc, char **argv)
                                i = X509_PURPOSE_get_by_sname(*(++argv));
                                if(i < 0)
                                        {
-                                       BIO_printf(bio_err, "unrecognised purpose\n");
+                                       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)
@@ -188,19 +187,16 @@ int MAIN(int argc, char **argv)
 end:
        if (ret == 1) {
                BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] cert1 cert2 ...\n");
-               BIO_printf(bio_err,"recognised usages:\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);
-                       BIO_printf(bio_err, "\t%-10s\t%s\n", X509_PURPOSE_iget_sname(ptmp),
-                                                               X509_PURPOSE_iget_name(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 (cert_ctx != NULL) X509_STORE_free(cert_ctx);
        sk_X509_pop_free(untrusted, X509_free);
-       X509V3_EXT_cleanup();
-       X509_PURPOSE_cleanup();
-       X509_TRUST_cleanup();
        EXIT(ret);
        }
 
@@ -246,7 +242,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(purpose >= 0) X509_STORE_CTX_chain_purpose(csc, purpose);
+       if(purpose >= 0) X509_STORE_CTX_set_purpose(csc, purpose);
        i=X509_verify_cert(csc);
        X509_STORE_CTX_free(csc);