--- include/curl/curl.h	Sat May 12 09:20:34 2007
+++ include/curl/curl.h	Tue Feb 20 14:30:18 2007
@@ -1071,12 +1071,6 @@
   CINIT(HTTP_TRANSFER_DECODING, LONG, 157),
   CINIT(HTTP_CONTENT_DECODING, LONG, 158),

-  /* Set the ssl context certificate verify callback function, currently
-     only for OpenSSL ssl_ctx in second argument. The function must be
-	 matching the curl_verify_callback proto.
-   */
-  CINIT(SSL_VERIFY_FUNCTION, FUNCTIONPOINT, 159),
-
   CURLOPT_LASTENTRY /* the last unused */
} CURLoption;

--- lib/ssluse.c	Sat May 12 09:22:11 2007
+++ lib/ssluse.c	Sun Apr 08 13:37:00 2007
@@ -1407,8 +1407,7 @@
    * SSL_get_verify_result() below. */
   SSL_CTX_set_verify(connssl->ctx,
                      
data->set.ssl.verifypeer?SSL_VERIFY_PEER:SSL_VERIFY_NONE,
-					 (data->set.ssl.fverify_callback ?
-					 data->set.ssl.fverify_callback : cert_verify_callback));
+                     cert_verify_callback);

   /* give application a chance to interfere with SSL set up. */
   if(data->set.ssl.fsslctx) {
--- lib/url.c	Sat May 12 09:33:48 2007
+++ lib/url.c	Tue Apr 10 13:46:40 2007
@@ -1753,17 +1753,6 @@
      */
     data->set.http_ce_skip = (bool)(0 == va_arg(param, long));
     break;
-#ifdef USE_SSLEAY
-#ifdef USE_OPENSSL
-  case CURLOPT_SSL_VERIFY_FUNCTION:
-    /*
-     * Set a SSL_CTX_set_verify callback function
-     */
-    data->set.ssl.fverify_callback = va_arg(param, curl_verify_callback);
-    break;
-#endif /* USE_SSLEAY */
-#endif /* USE_OPENSSL */
-
   default:
     /* unknown tag and its companion, just ignore: */
     result = CURLE_FAILED_INIT; /* correct this */
--- lib/urldata.h	Sat May 12 09:32:17 2007
+++ lib/urldata.h	Tue Apr 10 13:46:40 2007
@@ -133,13 +133,6 @@
    We prefix with CURL to prevent name collisions. */
#define CURLMAX(x,y) ((x)>(y)?(x):(y))

-#ifdef USE_SSLEAY
-#ifdef USE_OPENSSL
-typedef int (*curl_verify_callback)(int ok, X509_STORE_CTX *ctx);
-#endif /* USE_SSLEAY */
-#endif /* USE_OPENSSL */
-
-
#ifdef HAVE_KRB4
/* Types needed for krb4-ftp connections */
struct krb4buffer {
@@ -199,11 +192,6 @@
   char *cipher_list;     /* list of ciphers to use */
   long numsessions;      /* SSL session id cache size */
   curl_ssl_ctx_callback fsslctx; /* function to initialize ssl ctx */
-#ifdef USE_SSLEAY
-#ifdef USE_OPENSSL
-  curl_verify_callback fverify_callback; /* function to verify certificates 
*/
-#endif /* USE_SSLEAY */
-#endif /* USE_OPENSSL */
   void *fsslctxp;        /* parameter for call back */
   bool sessionid;        /* cache session IDs or not */
};