Use prototypes.

diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index d1ebf06e3efe2753d323103257428878ced7f911..1ce1c161ec66d1d775e80d3eb7ffa783aa93856b 100644 (file)
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -412,7 +412,7 @@ int ssl3_cert_verify_mac(SSL *s, EVP_MD_CTX *ctx, unsigned char *p)
        }
 
 int ssl3_final_finish_mac(SSL *s, EVP_MD_CTX *ctx1, EVP_MD_CTX *ctx2,
-            unsigned char *sender, int len, unsigned char *p)
+            const char *sender, int len, unsigned char *p)
        {
        int ret;
 

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 10d080df8f640f36f48e09e40b3cbab91210aa39..88ff03b3ac52c0e175f32d7edfc9ae5d54d07c93 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -72,12 +72,13 @@ static int ssl_meth_num=0;
 static int ssl_ctx_meth_num=0;
 
 OPENSSL_GLOBAL SSL3_ENC_METHOD ssl3_undef_enc_method={
+       /* evil casts, but these functions are only called if there's a libraryr bug */
+       (int (*)(SSL *,int))ssl_undefined_function,
+       (int (*)(SSL *, unsigned char *, int))ssl_undefined_function,
        ssl_undefined_function,
-       ssl_undefined_function,
-       ssl_undefined_function,
-       ssl_undefined_function,
-       ssl_undefined_function,
-       ssl_undefined_function,
+       (int (*)(SSL *, unsigned char *, unsigned char *, int))ssl_undefined_function,
+       (int (*)(SSL*, int))ssl_undefined_function,
+       (int (*)(SSL *, EVP_MD_CTX *, EVP_MD_CTX *, const char*, int, unsigned char *))ssl_undefined_function
        };
 
 int SSL_clear(SSL *s)

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index e1ac715d16e25eddc30c141373379dd628c84f92..fbf91054d55ec3c72fcdbd7758166060c666935a 100644 (file)
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -322,19 +322,19 @@ typedef struct sess_cert_st
  * an opaque strucute :-) */
 typedef struct ssl3_enc_method
        {
-       int (*enc)();
-       int (*mac)();
-       int (*setup_key_block)();
-       int (*generate_master_secret)();
-       int (*change_cipher_state)();
-       int (*final_finish_mac)();
+       int (*enc)(SSL *, int);
+       int (*mac)(SSL *, unsigned char *, int);
+       int (*setup_key_block)(SSL *);
+       int (*generate_master_secret)(SSL *, unsigned char *, unsigned char *, int);
+       int (*change_cipher_state)(SSL *, int);
+       int (*final_finish_mac)(SSL *, EVP_MD_CTX *, EVP_MD_CTX *, const char *, int, unsigned char *);
        int finish_mac_length;
-       int (*cert_verify_mac)();
+       int (*cert_verify_mac)(SSL *, EVP_MD_CTX *, unsigned char *);
        const char *client_finished_label;
        int client_finished_label_len;
        const char *server_finished_label;
        int server_finished_label_len;
-       int (*alert_value)();
+       int (*alert_value)(int);
        } SSL3_ENC_METHOD;
 
 /* Used for holding the relevant compression methods loaded into SSL_CTX */
@@ -443,7 +443,7 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len);
 int ssl3_part_read(SSL *s, int i);
 int ssl3_write_bytes(SSL *s, int type, const void *buf, int len);
 int ssl3_final_finish_mac(SSL *s, EVP_MD_CTX *ctx1,EVP_MD_CTX *ctx2,
-       unsigned char *sender, int slen,unsigned char *p);
+       const char *sender, int slen,unsigned char *p);
 int ssl3_cert_verify_mac(SSL *s, EVP_MD_CTX *in, unsigned char *p);
 void ssl3_finish_mac(SSL *s, const unsigned char *buf, int len);
 int ssl3_enc(SSL *s, int send_data);
@@ -483,7 +483,7 @@ int tls1_change_cipher_state(SSL *s, int which);
 int tls1_setup_key_block(SSL *s);
 int tls1_enc(SSL *s, int snd);
 int tls1_final_finish_mac(SSL *s, EVP_MD_CTX *in1_ctx, EVP_MD_CTX *in2_ctx,
-       unsigned char *str, int slen, unsigned char *p);
+       const char *str, int slen, unsigned char *p);
 int tls1_cert_verify_mac(SSL *s, EVP_MD_CTX *in, unsigned char *p);
 int tls1_mac(SSL *ssl, unsigned char *md, int snd);
 int tls1_generate_master_secret(SSL *s, unsigned char *out,

diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 914b7434987fc286e3f29086cd5c6b99160148ef..243464298d122cf6fbc9cfcde8fd149b7fe00295 100644 (file)
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -494,7 +494,7 @@ int tls1_cert_verify_mac(SSL *s, EVP_MD_CTX *in_ctx, unsigned char *out)
        }
 
 int tls1_final_finish_mac(SSL *s, EVP_MD_CTX *in1_ctx, EVP_MD_CTX *in2_ctx,
-            unsigned char *str, int slen, unsigned char *out)
+            const char *str, int slen, unsigned char *out)
        {
        unsigned int i;
        EVP_MD_CTX ctx;