-Wall implies -Wuninitialized.

[openssl.git] / ssl / s23_srvr.c

diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c
index a4d0f1c90ff766b98edc7d0e7cae3b76bd3fa873..8dc0a0608fce8528f686b16575636c759eb5d48b 100644 (file)
--- a/ssl/s23_srvr.c
+++ b/ssl/s23_srvr.c
@@ -73,8 +73,7 @@ static SSL_METHOD *ssl23_get_server_method();
 int ssl23_get_client_hello();
 #endif
 
-static SSL_METHOD *ssl23_get_server_method(ver)
-int ver;
+static SSL_METHOD *ssl23_get_server_method(int ver)
        {
        if (ver == SSL2_VERSION)
                return(SSLv2_server_method());
@@ -86,7 +85,7 @@ int ver;
                return(NULL);
        }
 
-SSL_METHOD *SSLv23_server_method()
+SSL_METHOD *SSLv23_server_method(void)
        {
        static int init=1;
        static SSL_METHOD SSLv23_server_data;
@@ -102,8 +101,7 @@ SSL_METHOD *SSLv23_server_method()
        return(&SSLv23_server_data);
        }
 
-int ssl23_accept(s)
-SSL *s;
+int ssl23_accept(SSL *s)
        {
        BUF_MEM *buf;
        unsigned long Time=time(NULL);
@@ -194,8 +192,7 @@ end:
        }
 
 
-int ssl23_get_client_hello(s)
-SSL *s;
+int ssl23_get_client_hello(SSL *s)
        {
        char buf_space[8];
        char *buf= &(buf_space[0]);
@@ -213,7 +210,7 @@ SSL *s;
                if (!ssl3_setup_buffers(s)) goto err;
 
                n=ssl23_read_bytes(s,7);
-               if (n != 7) return(n);
+               if (n != 7) return(n); /* n == -1 || n == 0 */
 
                p=s->packet;
 
@@ -256,7 +253,7 @@ SSL *s;
 
                                if (s->options & SSL_OP_NON_EXPORT_FIRST)
                                        {
-                                       STACK *sk;
+                                       STACK_OF(SSL_CIPHER) *sk;
                                        SSL_CIPHER *c;
                                        int ne2,ne3;
 
@@ -287,9 +284,9 @@ SSL *s;
                                        if (sk != NULL)
                                                {
                                                ne2=ne3=0;
-                                               for (j=0; j<sk_num(sk); j++)
+                                               for (j=0; j<sk_SSL_CIPHER_num(sk); j++)
                                                        {
-                                                       c=(SSL_CIPHER *)sk_value(sk,j);
+                                                       c=sk_SSL_CIPHER_value(sk,j);
                                                        if (!SSL_C_IS_EXPORT(c))
                                                                {
                                                                if ((c->id>>24L) == 2L)