Cleanup of mod_ssl compiler warnings

The following patches mop up some unnecessary compile warnings, when the 
functions are properly decorated.  It's been sitting in my drafts waiting
for a subscription to go through for 3 months, so feel free to verify that
they are still appropriate.



   --- mod_ssl.h	25 Oct 2005 04:32:42 -0000	1.1
   +++ mod_ssl.h	25 Oct 2005 05:54:19 -0000	1.2
   @@ -108,6 +108,10 @@
    #include <sys/time.h>
    #endif
    #ifdef WIN32
   +#ifndef WIN32_LEAN_AND_MEAN
   +#define WIN32_LEAN_AND_MEAN
   +#endif
   +#include <windows.h>
    #include <wincrypt.h>
    #include <winsock2.h>
    #endif
   @@ -759,7 +763,7 @@

    /*  Pass Phrase Support  */
    void         ssl_pphrase_Handle(server_rec *, pool *);
   -int          ssl_pphrase_Handle_CB(char *, int, int);
   +int          ssl_pphrase_Handle_CB(char *, int, int, void *);

    /*  Diffie-Hellman Parameter Support  */
    DH           *ssl_dh_GetTmpParam(int);
   --- ssl_engine_pphrase.c	25 Oct 2005 04:32:35 -0000	1.1
   +++ ssl_engine_pphrase.c	25 Oct 2005 05:54:19 -0000	1.2
   @@ -389,7 +389,7 @@
        return;
    }

   -int ssl_pphrase_Handle_CB(char *buf, int bufsize, int verify)
   +int ssl_pphrase_Handle_CB(char *buf, int bufsize, int verify, void *nadda)
    {
        SSLModConfigRec *mc = myModConfig();
        server_rec *s;
   --- ssl_util_ssl.c	25 Oct 2005 04:32:39 -0000	1.1
   +++ ssl_util_ssl.c	25 Oct 2005 05:54:19 -0000	1.2
   @@ -98,7 +98,7 @@
    **  _________________________________________________________________
    */

   -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;
   @@ -151,7 +151,7 @@
    }
    #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;
   @@ -464,7 +464,7 @@
     * 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;
   --- ssl_util_ssl.h	25 Oct 2005 04:32:37 -0000	1.1
   +++ ssl_util_ssl.h	25 Oct 2005 05:54:19 -0000	1.2
   @@ -103,8 +103,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 *);
   @@ -116,7 +116,7 @@
    BOOL        SSL_load_CrtAndKeyInfo_file(pool *, STACK_OF(X509_INFO) *, char *);
    BOOL        SSL_load_CrtAndKeyInfo_path(pool *, 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 */


______________________________________________________________________
Apache Interface to OpenSSL (mod_ssl)                   www.modssl.org
User Support Mailing List                      [email protected]
Automated List Manager                            [email protected]