From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 28 Jun 2001 01:14:04 +0000 (+0000)
Subject:   Quiet the compiler, msvc is sticky about arg lists being consistent.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c1f601a762ba64e82ddd19dd2d57882de6c8924;p=thirdparty%2Fapache%2Fhttpd.git

  Quiet the compiler, msvc is sticky about arg lists being consistent.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@89461 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/ssl_util_ssl.c b/ssl_util_ssl.c
index b5bd118192b..f2454ca124e 100644
--- a/ssl_util_ssl.c
+++ b/ssl_util_ssl.c
@@ -95,7 +95,7 @@ void SSL_set_app_data2(SSL *ssl, void *arg)
 **  _________________________________________________________________
 */
 
-X509 *SSL_read_X509(FILE *fp, X509 **x509, int (*cb)())
+X509 *SSL_read_X509(FILE *fp, X509 **x509, int (*cb)(char*,int,int,void*))
 {
     X509 *rc;
     BIO *bioS;
@@ -148,7 +148,7 @@ static EVP_PKEY *d2i_PrivateKey_bio(BIO *bio, EVP_PKEY **key)
 }
 #endif
 
-EVP_PKEY *SSL_read_PrivateKey(FILE *fp, EVP_PKEY **key, int (*cb)())
+EVP_PKEY *SSL_read_PrivateKey(FILE *fp, EVP_PKEY **key, int (*cb)(char*,int,int,void*))
 {
     EVP_PKEY *rc;
     BIO *bioS;
@@ -458,7 +458,7 @@ BOOL SSL_load_CrtAndKeyInfo_path(apr_pool_t *p, STACK_OF(X509_INFO) *sk, char *p
  * should be sent to the peer in the SSL Certificate message.
  */
 int SSL_CTX_use_certificate_chain(
-    SSL_CTX *ctx, char *file, int skipfirst, int (*cb)())
+    SSL_CTX *ctx, char *file, int skipfirst, int (*cb)(char*,int,int,void*))
 {
     BIO *bio;
     X509 *x509;
diff --git a/ssl_util_ssl.h b/ssl_util_ssl.h
index c70584339a7..bc941cbf8f1 100644
--- a/ssl_util_ssl.h
+++ b/ssl_util_ssl.h
@@ -94,8 +94,8 @@
 int         SSL_get_app_data2_idx(void);
 void       *SSL_get_app_data2(SSL *);
 void        SSL_set_app_data2(SSL *, void *);
-X509       *SSL_read_X509(FILE *, X509 **, int (*)());
-EVP_PKEY   *SSL_read_PrivateKey(FILE *, EVP_PKEY **, int (*)());
+X509       *SSL_read_X509(FILE *, X509 **, int (*)(char*,int,int,void*));
+EVP_PKEY   *SSL_read_PrivateKey(FILE *, EVP_PKEY **, int (*)(char*,int,int,void*));
 int         SSL_smart_shutdown(SSL *ssl);
 X509_STORE *SSL_X509_STORE_create(char *, char *);
 int         SSL_X509_STORE_lookup(X509_STORE *, int, X509_NAME *, X509_OBJECT *);
@@ -107,7 +107,7 @@ BOOL        SSL_X509_getCN(apr_pool_t *, X509 *, char **);
 BOOL        SSL_load_CrtAndKeyInfo_file(apr_pool_t *, STACK_OF(X509_INFO) *, char *);
 BOOL        SSL_load_CrtAndKeyInfo_path(apr_pool_t *, STACK_OF(X509_INFO) *, char *);
 #endif /* SSL_EXPERIMENTAL_PROXY */
-int         SSL_CTX_use_certificate_chain(SSL_CTX *, char *, int, int (*)());
+int         SSL_CTX_use_certificate_chain(SSL_CTX *, char *, int, int (*)(char*,int,int,void*));
 char       *SSL_SESSION_id2sz(unsigned char *, int);
 
 #endif /* __SSL_UTIL_SSL_H__ */