From 5d681769c60b2d3216d76c1efe4f112a24baf519 Mon Sep 17 00:00:00 2001
From: mrcsys
Date: Mon, 17 Apr 2006 12:26:17 +0000
Subject: updated to match heiko's prefered function names I had not noticed
 that he had renamed ALL of mine before

---
 nanohttp/nanohttp-ssl.c | 14 +++++++-------
 nanohttp/nanohttp-ssl.h |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'nanohttp')

diff --git a/nanohttp/nanohttp-ssl.c b/nanohttp/nanohttp-ssl.c
index 3acb3c8..79506ea 100644
--- a/nanohttp/nanohttp-ssl.c
+++ b/nanohttp/nanohttp-ssl.c
@@ -1,5 +1,5 @@
 /******************************************************************
-*  $Id: nanohttp-ssl.c,v 1.23 2006/04/14 14:44:40 mrcsys Exp $
+*  $Id: nanohttp-ssl.c,v 1.24 2006/04/17 12:26:17 mrcsys Exp $
 *
 * CSOAP Project:  A http client/server library in C
 * Copyright (C) 2001-2005  Rochester Institute of Technology
@@ -84,7 +84,7 @@ static SSL_CTX *context = NULL;
 
 static int enabled = 0;
 
-int (*user_verify) (X509 * cert) = simple_user_verify;
+int (*_hssl_verify_cert) (X509 * cert) = _hssl_dummy_verify_cert;
 
 static void
 _hssl_superseed (void)
@@ -170,12 +170,12 @@ verify_sn (X509 * cert, int who, int nid, char *str)
 }
 
 void
-hssl_set_user_verify( int func(X509 * cert) ){
-    user_verify = func;
+hssl_set_hssl_verify_cert( int func(X509 * cert) ){
+    _hssl_verify_cert = func;
 }
 
 static int
-simple_user_verify (X509 * cert)
+_hssl_dummy_verify_cert(X509 * cert)
 {
   /* TODO: Make sure that the client is providing a client cert,
      or that the Module is providing the Module cert */
@@ -196,10 +196,10 @@ _hssl_cert_verify_callback(int prev_ok, X509_STORE_CTX * ctx)
         return 1;
     }
 */
-  log_verbose2 ("Cert dept = %d", X509_STORE_CTX_get_error_depth(ctx) );
+  log_verbose2 ("Cert depth = %d", X509_STORE_CTX_get_error_depth(ctx) );
   if (X509_STORE_CTX_get_error_depth(ctx) == 0)
   {
-    return user_verify(X509_STORE_CTX_get_current_cert(ctx));
+    return _hssl_verify_cert(X509_STORE_CTX_get_current_cert(ctx));
   }
   else
   {
diff --git a/nanohttp/nanohttp-ssl.h b/nanohttp/nanohttp-ssl.h
index 86b61cd..af99069 100644
--- a/nanohttp/nanohttp-ssl.h
+++ b/nanohttp/nanohttp-ssl.h
@@ -1,5 +1,5 @@
 /******************************************************************
-*  $Id: nanohttp-ssl.h,v 1.15 2006/04/14 14:44:40 mrcsys Exp $
+*  $Id: nanohttp-ssl.h,v 1.16 2006/04/17 12:26:17 mrcsys Exp $
 *
 * CSOAP Project:  A http client/server library in C
 * Copyright (C) 2001-2005  Rochester Institute of Technology
@@ -83,7 +83,7 @@ int verify_sn(X509 * cert, int who, int nid, char *str);
  */
 void hssl_set_user_verify( int func(X509 * cert) );
 
-static int simple_user_verify(X509 * cert);
+static int _hssl_dummy_verify_cert(X509 * cert);
 
 #ifdef __cplusplus
 }
-- 
cgit v1.1-32-gdbae