diff --git a/CHANGES b/CHANGES index 087a38b382bf190284864f9e42d838eb52d82d09..01d5f4eb4843ef26db6b5db89711b9c0c0103cec 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,10 @@ Changes between 0.9.1c and 0.9.2 + *) Remove confusing variables in function signatures in files + ssl/ssl_lib.c and ssl/ssl.h. + [Lennart Bong ] + *) Don't install bss_file.c under PREFIX/include/ [Lennart Bong ] diff --git a/ssl/ssl.h b/ssl/ssl.h index f69eea0aeb7707231348e0eff5530b9205ac9bbf..c5695c7fe1ba4687c6f32f5a60974558c9af3be9 100644 --- a/ssl/ssl.h +++ b/ssl/ssl.h @@ -841,7 +841,7 @@ BIO * SSL_get_wbio(SSL *s); int SSL_set_cipher_list(SSL *s, char *str); void SSL_set_read_ahead(SSL *s, int yes); int SSL_get_verify_mode(SSL *s); -int (*SSL_get_verify_callback(SSL *s))(int ok,X509_STORE_CTX *ctx); +int (*SSL_get_verify_callback(SSL *s))(int,X509_STORE_CTX *); void SSL_set_verify(SSL *s, int mode, int (*callback)(int ok,X509_STORE_CTX *ctx)); int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa); @@ -898,7 +898,7 @@ X509 * SSL_get_peer_certificate(SSL *s); STACK * SSL_get_peer_cert_chain(SSL *s); int SSL_CTX_get_verify_mode(SSL_CTX *ctx); -int (*SSL_CTX_get_verify_callback(SSL_CTX *ctx))(int ok,X509_STORE_CTX *ctx); +int (*SSL_CTX_get_verify_callback(SSL_CTX *ctx))(int,X509_STORE_CTX *); void SSL_CTX_set_verify(SSL_CTX *ctx,int mode, int (*callback)(int, X509_STORE_CTX *)); void SSL_CTX_set_cert_verify_cb(SSL_CTX *ctx, int (*cb)(),char *arg); diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 0191378d3d23a760604f37a87c67643c088bcfd3..b99bb4e54ac9c7ef6e875ebd3cca4ec5d928ace9 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -392,7 +392,7 @@ int SSL_get_verify_mode(SSL *s) return(s->verify_mode); } -int (*SSL_get_verify_callback(SSL *s))(int ok,X509_STORE_CTX *ctx) +int (*SSL_get_verify_callback(SSL *s))(int,X509_STORE_CTX *) { return(s->verify_callback); } @@ -402,7 +402,7 @@ int SSL_CTX_get_verify_mode(SSL_CTX *ctx) return(ctx->verify_mode); } -int (*SSL_CTX_get_verify_callback(SSL_CTX *ctx))(int ok,X509_STORE_CTX *ctx) +int (*SSL_CTX_get_verify_callback(SSL_CTX *ctx))(int,X509_STORE_CTX *) { return(ctx->default_verify_callback); }