Use new X509_STORE_set_verify_cb function instead of old macro.
authorDr. Stephen Henson <steve@openssl.org>
Sun, 18 Oct 2009 14:40:33 +0000 (14:40 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sun, 18 Oct 2009 14:40:33 +0000 (14:40 +0000)
apps/cms.c
apps/smime.c
apps/ts.c
apps/verify.c
apps/x509.c

index 3adcd78..d29a884 100644 (file)
@@ -880,7 +880,7 @@ int MAIN(int argc, char **argv)
                {
                if (!(store = setup_verify(bio_err, CAfile, CApath)))
                        goto end;
-               X509_STORE_set_verify_cb_func(store, cms_cb);
+               X509_STORE_set_verify_cb(store, cms_cb);
                if (vpm)
                        X509_STORE_set1_param(store, vpm);
                }
index 67df066..c583f8a 100644 (file)
@@ -671,7 +671,7 @@ int MAIN(int argc, char **argv)
                {
                if (!(store = setup_verify(bio_err, CAfile, CApath)))
                        goto end;
-               X509_STORE_set_verify_cb_func(store, smime_cb);
+               X509_STORE_set_verify_cb(store, smime_cb);
                if (vpm)
                        X509_STORE_set1_param(store, vpm);
                }
index bedb602..5fa9f7f 100644 (file)
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -1083,7 +1083,7 @@ static X509_STORE *create_cert_store(char *ca_path, char *ca_file)
        cert_ctx = X509_STORE_new();
 
        /* Setting the callback for certificate chain verification. */
-       X509_STORE_set_verify_cb_func(cert_ctx, verify_cb);
+       X509_STORE_set_verify_cb(cert_ctx, verify_cb);
 
        /* Adding a trusted certificate directory source. */
        if (ca_path)
index 838ac46..96fcfb4 100644 (file)
@@ -93,7 +93,7 @@ int MAIN(int argc, char **argv)
 
        cert_ctx=X509_STORE_new();
        if (cert_ctx == NULL) goto end;
-       X509_STORE_set_verify_cb_func(cert_ctx,cb);
+       X509_STORE_set_verify_cb(cert_ctx,cb);
 
        ERR_load_crypto_strings();
 
index 72d104b..0be3414 100644 (file)
@@ -225,7 +225,7 @@ int MAIN(int argc, char **argv)
 
        ctx=X509_STORE_new();
        if (ctx == NULL) goto end;
-       X509_STORE_set_verify_cb_func(ctx,callb);
+       X509_STORE_set_verify_cb(ctx,callb);
 
        argc--;
        argv++;