3 files changed, 10 insertions, 5 deletions
diff --git a/apps/s_apps.h b/apps/s_apps.h
index 08fbbc2229..a46d77b6d8 100644
--- a/apps/s_apps.h
+++ b/apps/s_apps.h
@@ -148,7 +148,9 @@ typedef fd_mask fd_set;
 #define PORT_STR        "4433"
 #define PROTOCOL        "tcp"
 
-int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context);
+int do_server(int port, int type, int *ret,
+	      int (*cb) (char *hostname, int s, unsigned char *context),
+	      unsigned char *context);
 #ifdef HEADER_X509_H
 int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
 #endif
@@ -162,11 +164,12 @@ int extract_port(char *str, short *port_ptr);
 int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p);
 
 long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
-	int argi, long argl, long ret);
+				   size_t argi, long argl, long ret);
 
 #ifdef HEADER_SSL_H
 void MS_CALLBACK apps_ssl_info_callback(const SSL *s, int where, int ret);
-void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg);
+void MS_CALLBACK msg_cb(int write_p, int version, int content_type,
+			const void *buf, size_t len, SSL *ssl, void *arg);
 void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
 					unsigned char *data, int len,
 					void *arg);
diff --git a/apps/s_cb.c b/apps/s_cb.c
index dc50ff5d3f..95860d208f 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -260,7 +260,7 @@ int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key)
 	}
 
 long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
-	int argi, long argl, long ret)
+				   size_t argi, long argl, long ret)
 	{
 	BIO *out;
 
diff --git a/apps/s_socket.c b/apps/s_socket.c
index b5f9db3062..f884f6d33e 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -279,7 +279,9 @@ static int init_client_ip(int *sock, unsigned char ip[4], int port, int type)
 	return(1);
 	}
 
-int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context)
+int do_server(int port, int type, int *ret,
+	      int (*cb)(char *hostname, int s, unsigned char *context),
+	      unsigned char *context)
 	{
 	int sock;
 	char *name = NULL;