Work with -pedantic!

[openssl.git] / apps / s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index 7d9df46085fb9ee524b0dbfcb39a202bdef6a91e..f026fa1b6b673432ea99a8306fe2dd0036504fa8 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -76,8 +76,8 @@
 
 #ifndef NOPROTO
 static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int export,int keylength);
-static int sv_body(char *hostname, int s, char *context);
-static int www_body(char *hostname, int s, char *context);
+static int sv_body(char *hostname, int s, unsigned char *context);
+static int www_body(char *hostname, int s, unsigned char *context);
 static void close_accept_socket(void );
 static void sv_usage(void);
 static int init_ssl_connection(SSL *s);
@@ -120,7 +120,7 @@ static unsigned char dh512_g[]={
        0x02,
        };
 
-static DH *get_dh512()
+static DH *get_dh512(void)
        {
        DH *dh=NULL;
 
@@ -164,7 +164,7 @@ static int s_debug=0;
 static int s_quiet=0;
 
 #if 0
-static void s_server_init()
+static void s_server_init(void)
        {
        cipher=NULL;
        s_server_verify=SSL_VERIFY_NONE;
@@ -185,7 +185,7 @@ static void s_server_init()
        }
 #endif
 
-static void sv_usage()
+static void sv_usage(void)
        {
        BIO_printf(bio_err,"usage: s_server [args ...]\n");
        BIO_printf(bio_err,"\n");
@@ -226,9 +226,7 @@ static int local_argc=0;
 static char **local_argv;
 static int hack=0;
 
-int MAIN(argc, argv)
-int argc;
-char *argv[];
+int MAIN(int argc, char *argv[])
        {
        short port=PORT;
        char *CApath=NULL,*CAfile=NULL;
@@ -533,9 +531,7 @@ end:
        EXIT(ret);
        }
 
-static void print_stats(bio,ssl_ctx)
-BIO *bio;
-SSL_CTX *ssl_ctx;
+static void print_stats(BIO *bio, SSL_CTX *ssl_ctx)
        {
        BIO_printf(bio,"%4ld items in the session cache\n",
                SSL_CTX_sess_number(ssl_ctx));
@@ -560,10 +556,7 @@ SSL_CTX *ssl_ctx;
                SSL_CTX_sess_get_cache_size(ssl_ctx));
        }
 
-static int sv_body(hostname, s, context)
-char *hostname;
-int s;
-char *context;
+static int sv_body(char *hostname, int s, unsigned char *context)
        {
        char *buf=NULL;
        fd_set readfds;
@@ -593,7 +586,8 @@ char *context;
        if (con == NULL) {
                con=(SSL *)SSL_new(ctx);
                if(context)
-                     SSL_set_session_id_context(con, context, strlen(context));
+                     SSL_set_session_id_context(con, context,
+                                                strlen((char *)context));
        }
        SSL_clear(con);
 
@@ -779,7 +773,7 @@ err:
        return(ret);
        }
 
-static void close_accept_socket()
+static void close_accept_socket(void)
        {
        BIO_printf(bio_err,"shutdown accept socket\n");
        if (accept_socket >= 0)
@@ -788,11 +782,10 @@ static void close_accept_socket()
                }
        }
 
-static int init_ssl_connection(con)
-SSL *con;
+static int init_ssl_connection(SSL *con)
        {
        int i;
-       char *str;
+       const char *str;
        X509 *peer;
        long verify_error;
        MS_STATIC char buf[BUFSIZ];
@@ -844,7 +837,7 @@ SSL *con;
        }
 
 #ifndef NO_DH
-static DH *load_dh_param()
+static DH *load_dh_param(void)
        {
        DH *ret=NULL;
        BIO *bio;
@@ -859,9 +852,7 @@ err:
 #endif
 
 #if 0
-static int load_CA(ctx,file)
-SSL_CTX *ctx;
-char *file;
+static int load_CA(SSL_CTX *ctx, char *file)
        {
        FILE *in;
        X509 *x=NULL;
@@ -881,10 +872,7 @@ char *file;
        }
 #endif
 
-static int www_body(hostname, s, context)
-char *hostname;
-int s;
-char *context;
+static int www_body(char *hostname, int s, unsigned char *context)
        {
        char *buf=NULL;
        int ret=1;
@@ -917,7 +905,8 @@ char *context;
        if (!BIO_set_write_buffer_size(io,bufsize)) goto err;
 
        if ((con=(SSL *)SSL_new(ctx)) == NULL) goto err;
-       if(context) SSL_set_session_id_context(con, context, strlen(context));
+       if(context) SSL_set_session_id_context(con, context,
+                                              strlen((char *)context));
 
        sbio=BIO_new_socket(s,BIO_NOCLOSE);
        if (s_nbio_test)
@@ -998,7 +987,7 @@ char *context;
                        {
                        char *p;
                        X509 *peer;
-                       STACK *sk;
+                       STACK_OF(SSL_CIPHER) *sk;
                        static char *space="                          ";
 
                        BIO_puts(io,"HTTP/1.0 200 ok\r\nContent-type: text/html\r\n\r\n");
@@ -1017,10 +1006,10 @@ char *context;
                         * be done */
                        BIO_printf(io,"Ciphers supported in s_server binary\n");
                        sk=SSL_get_ciphers(con);
-                       j=sk_num(sk);
+                       j=sk_SSL_CIPHER_num(sk);
                        for (i=0; i<j; i++)
                                {
-                               c=(SSL_CIPHER *)sk_value(sk,i);
+                               c=sk_SSL_CIPHER_value(sk,i);
                                BIO_printf(io,"%-11s:%-25s",
                                        SSL_CIPHER_get_version(c),
                                        SSL_CIPHER_get_name(c));
@@ -1226,10 +1215,7 @@ err:
        return(ret);
        }
 
-static RSA MS_CALLBACK *tmp_rsa_cb(s,export,keylength)
-SSL *s;
-int export;
-int keylength;
+static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int export, int keylength)
        {
        static RSA *rsa_tmp=NULL;