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
#endif
#ifdef WIN32
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include
#include
#include
#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 modssl-users@modssl.org
Automated List Manager majordomo@modssl.org

Re: Cleanup of mod_ssl compiler warnings

On Fri, Feb 10, 2006, William A. Rowe, Jr. wrote:

> 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.
> [...]

I had to add some "#if SSL_LIBRARY_VERSION < 0x00904000
....#else..#endif" to the patches to let it still work on older OpenSSL
versions, but after this I've added to mod_ssl for release with version
2.8.26. Thanks for your contribution.

Ralf S. Engelschall
rse@engelschall.com
www.engelschall.com

____________________________________________________________ __________
Apache Interface to OpenSSL (mod_ssl) www.modssl.org
User Support Mailing List modssl-users@modssl.org
Automated List Manager majordomo@modssl.org

Re: Cleanup of mod_ssl compiler warnings

--0-758489326-1147089008=:36360
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable

Please rmove me from your list

"Ralf S. Engelschall" wrote: On Fri, Feb 10, 2006,=
William A. Rowe, Jr. wrote:

> The following patches mop up some unnecessary compile warnings, when th=
e
> functions are properly decorated. It's been sitting in my drafts waitin=
g
> for a subscription to go through for 3 months, so feel free to verify t=
hat
> they are still appropriate.
> [...]

I had to add some "#if SSL_LIBRARY_VERSION < 0x00904000
....#else..#endif" to the patches to let it still work on older OpenSSL
versions, but after this I've added to mod_ssl for release with version
2.8.26. Thanks for your contribution.

Ralf S. Engelschall
rse@engelschall.com
www.engelschall.com

____________________________________________________________ __________
Apache Interface to OpenSSL (mod_ssl) www.modssl.org
User Support Mailing List modssl-users@modssl.org
Automated List Manager majordomo@modssl.org


=09
---------------------------------
Talk is cheap. Use Yahoo! Messenger to make PC-to-Phone calls. Great rat=
es starting at 1¢/min.
--0-758489326-1147089008=:36360
Content-Type: text/html; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable

Please rmove me from your list

"Ralf S. Engelschall" <rse=
@engelschall.com> wrote:

PADDING-LEFT: 5px; MARGIN-LEFT: 5px; BORDER-LEFT: #1010ff 2px solid">On F=
ri, Feb 10, 2006, William A. Rowe, Jr. wrote:

> The following p=
atches mop up some unnecessary compile warnings, when the
> functio=
ns 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 th=
at
> they are still appropriate.
> [...]

I had to add =
some "#if SSL_LIBRARY_VERSION < 0x00904000
...#else..#endif" to the=
patches to let it still work on older OpenSSL
versions, but after thi=
s I've added to mod_ssl for release with version
2.8.26. Thanks for yo=
ur contribution.

Ralf S. Engelschall
rse@engelschall.com
www=
..engelschall.com

_________________________________________________=
_____________________
Apache Interface
to OpenSSL (mod_ssl) www.modssl.org
User Support Mailing List modssl-=
users@modssl.org
Automated List Manager majordomo@modssl.org
KQUOTE>

---

Talk is cheap. Use Yahoo! Messenger to make PC-to-Phone ca=
lls. us.rd.yahoo.com/evt=3D39666/*http://messenger.yahoo.com"> Great rates sta=
rting at 1¢/min.
--0-758489326-1147089008=:36360--
____________________________________________________________ __________
Apache Interface to OpenSSL (mod_ssl) www.modssl.org
User Support Mailing List modssl-users@modssl.org
Automated List Manager majordomo@modssl.org