From: Ralf S. Engelschall Date: Thu, 4 Mar 1999 07:54:01 +0000 (+0000) Subject: Remove confusing variables in function signatures in files X-Git-Tag: OpenSSL_0_9_2b~91 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a06c602e6f8069bf5e12c8880565f81d35d078e4;p=oweals%2Fopenssl.git Remove confusing variables in function signatures in files ssl/ssl_lib.c and ssl/ssl.h. At least the double ctx-variable confused some compilers. Submitted by: Lennart Bong Reviewed by: Ralf S. Engelschall --- diff --git a/CHANGES b/CHANGES index 087a38b382..01d5f4eb48 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 f69eea0aeb..c5695c7fe1 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 0191378d3d..b99bb4e54a 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); }