Fix whitespace, new-style comments.
diff --git a/apps/s_server.c b/apps/s_server.c
index 47fa2f3..f757f3c 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -331,22 +331,22 @@
 
 #ifndef OPENSSL_NO_TLSEXT
 static int suppdata_cb(SSL *s, unsigned short supp_data_type,
-				const unsigned char *in,
-				unsigned short inlen, int *al,
-				void *arg);
+		       const unsigned char *in,
+		       unsigned short inlen, int *al,
+		       void *arg);
 
 static int auth_suppdata_generate_cb(SSL *s, unsigned short supp_data_type,
-				const unsigned char **out,
-				unsigned short *outlen, int *al, void *arg);
+				     const unsigned char **out,
+				     unsigned short *outlen, int *al, void *arg);
 
 static int authz_tlsext_generate_cb(SSL *s, unsigned short ext_type,
-				const unsigned char **out, unsigned short *outlen,
-				int *al, void *arg);
+				    const unsigned char **out, unsigned short *outlen,
+				    int *al, void *arg);
 
 static int authz_tlsext_cb(SSL *s, unsigned short ext_type,
-				const unsigned char *in,
-				unsigned short inlen, int *al,
-				void *arg);
+			   const unsigned char *in,
+			   unsigned short inlen, int *al,
+			   void *arg);
 
 static BIO *serverinfo_in = NULL;
 static const char *s_serverinfo_file = NULL;
@@ -3585,9 +3585,9 @@
 
 #ifndef OPENSSL_NO_TLSEXT
 static int authz_tlsext_cb(SSL *s, unsigned short ext_type,
-				const unsigned char *in,
-				unsigned short inlen, int *al,
-				void *arg)
+			   const unsigned char *in,
+			   unsigned short inlen, int *al,
+			   void *arg)
 	{
 	if (TLSEXT_TYPE_server_authz == ext_type)
 		client_provided_server_authz
@@ -3601,8 +3601,8 @@
 	}
 
 static int authz_tlsext_generate_cb(SSL *s, unsigned short ext_type,
-				const unsigned char **out, unsigned short *outlen,
-				int *al, void *arg)
+				    const unsigned char **out, unsigned short *outlen,
+				    int *al, void *arg)
 	{
 	if (c_auth && client_provided_client_authz && client_provided_server_authz)
 		{
@@ -3621,9 +3621,9 @@
 	}
 
 static int suppdata_cb(SSL *s, unsigned short supp_data_type,
-				const unsigned char *in,
-				unsigned short inlen, int *al,
-				void *arg)
+		       const unsigned char *in,
+		       unsigned short inlen, int *al,
+		       void *arg)
 	{
 	if (supp_data_type == TLSEXT_SUPPLEMENTALDATATYPE_authz_data)
 		{
@@ -3634,8 +3634,8 @@
 	}
 
 static int auth_suppdata_generate_cb(SSL *s, unsigned short supp_data_type,
-				const unsigned char **out,
-				unsigned short *outlen, int *al, void *arg)
+				     const unsigned char **out,
+				     unsigned short *outlen, int *al, void *arg)
 	{
 	if (c_auth && client_provided_client_authz && client_provided_server_authz)
 		{