diff options
author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-12-15 19:33:48 +0100 |
---|---|---|
committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-12-15 19:33:48 +0100 |
commit | fce78bd4ede74d4fa7bd1c8195d8f7bc9403bd4c (patch) | |
tree | 47178f4d920c5fc4af3c91ee8c20ec6b8312cf96 /ssl/s3_lib.c | |
parent | d016d1ec34977fa9305ad5d535b03d6c5677cf1c (diff) |
Fix invalid function type casts.
Rename bio_info_cb to BIO_info_cb.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4493)
Diffstat (limited to 'ssl/s3_lib.c')
-rw-r--r-- | ssl/s3_lib.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 8c74a759c5..6ddd1885ce 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3246,6 +3246,20 @@ void ssl_sort_cipher_list(void) qsort(ssl3_scsvs, SSL3_NUM_SCSVS, sizeof(ssl3_scsvs[0]), cipher_compare); } +static int ssl_undefined_function_1(SSL *ssl, unsigned char *r, size_t s, + const char * t, size_t u, + const unsigned char * v, size_t w, int x) +{ + (void)r; + (void)s; + (void)t; + (void)u; + (void)v; + (void)w; + (void)x; + return ssl_undefined_function(ssl); +} + const SSL3_ENC_METHOD SSLv3_enc_data = { ssl3_enc, n_ssl3_mac, @@ -3256,9 +3270,7 @@ const SSL3_ENC_METHOD SSLv3_enc_data = { SSL3_MD_CLIENT_FINISHED_CONST, 4, SSL3_MD_SERVER_FINISHED_CONST, 4, ssl3_alert_code, - (int (*)(SSL *, unsigned char *, size_t, const char *, - size_t, const unsigned char *, size_t, - int use_context))ssl_undefined_function, + ssl_undefined_function_1, 0, ssl3_set_handshake_header, tls_close_construct_packet, |