X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=apps%2Fs_client.c;h=c4c3b0e94a59b6b6746bd2f061d0b719f35f2218;hp=0e158121c804a5ad7798afade8dda5c98f38146f;hb=07fb39c32e62cc8fb710e07c20c66b6f22398246;hpb=82fc1d9c28e834549f61e4c91b3f6bbdf4c48153

diff --git a/apps/s_client.c b/apps/s_client.c
index 0e158121c8..c4c3b0e94a 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -148,11 +148,13 @@ static void sc_usage(void)
 	BIO_printf(bio_err," -tls1         - just use TLSv1\n");
 	BIO_printf(bio_err," -no_tls1/-no_ssl3/-no_ssl2 - turn off that protocol\n");
 	BIO_printf(bio_err," -bugs         - Switch on all SSL implementation bug workarounds\n");
-	BIO_printf(bio_err," -cipher       - prefered cipher to use, use the 'openssl ciphers'\n");
+	BIO_printf(bio_err," -cipher       - preferred cipher to use, use the 'openssl ciphers'\n");
 	BIO_printf(bio_err,"                 command to see what is available\n");
 
 	}
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
 	{
 	int off=0;
@@ -337,7 +339,7 @@ bad:
 			}
 		}
 
-	SSLeay_add_ssl_algorithms();
+	OpenSSL_add_ssl_algorithms();
 	SSL_load_error_strings();
 	ctx=SSL_CTX_new(meth);
 	if (ctx == NULL)
@@ -354,7 +356,7 @@ bad:
 	if (state) SSL_CTX_set_info_callback(ctx,apps_ssl_info_callback);
 	if (cipher != NULL)
 		if(!SSL_CTX_set_cipher_list(ctx,cipher)) {
-		BIO_printf(bio_err,"error seting cipher list\n");
+		BIO_printf(bio_err,"error setting cipher list\n");
 		ERR_print_errors(bio_err);
 		goto end;
 	}
@@ -370,7 +372,7 @@ bad:
 	if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
 		(!SSL_CTX_set_default_verify_paths(ctx)))
 		{
-		/* BIO_printf(bio_err,"error seting default verify locations\n"); */
+		/* BIO_printf(bio_err,"error setting default verify locations\n"); */
 		ERR_print_errors(bio_err);
 		/* goto end; */
 		}
@@ -506,6 +508,7 @@ re_start:
 			 * are any keypresses. Note: this is a hack, in a proper
 			 * Windows application we wouldn't do this.
 			 */
+			i=0;
 			if(!write_tty) {
 				if(read_tty) {
 					tv.tv_sec = 1;