Rename functions for new convention.
[openssl.git] / apps / verify.c
index e580acee8561d493cdfc1c90da283134ac724391..c2b19a1b07fdea095f39884e36e2d432e178b811 100644 (file)
@@ -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;
@@ -119,7 +121,7 @@ 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);
@@ -185,12 +187,12 @@ 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));
+                       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);