From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 18 Oct 2009 14:40:33 +0000 (+0000)
Subject: Use new X509_STORE_set_verify_cb function instead of old macro.
X-Git-Tag: OpenSSL-fips-2_0-rc1~1479
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6aa1770c6d9c305caf0b0798e55c94797be271ec;p=thirdparty%2Fopenssl.git

Use new X509_STORE_set_verify_cb function instead of old macro.
---

diff --git a/apps/cms.c b/apps/cms.c
index 3adcd78a9d1..d29a8849022 100644
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -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);
 		}
diff --git a/apps/smime.c b/apps/smime.c
index 67df0667b67..c583f8a0e16 100644
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -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);
 		}
diff --git a/apps/ts.c b/apps/ts.c
index bedb602fd5d..5fa9f7fda07 100644
--- 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)
diff --git a/apps/verify.c b/apps/verify.c
index 838ac46827e..96fcfb429d4 100644
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -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();
 
diff --git a/apps/x509.c b/apps/x509.c
index 72d104bf09f..0be3414d348 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -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++;