Run util/openssl-format-source -v -c .

Reviewed-by: Tim Hudson <tjh@openssl.org>

1 files changed, 107 insertions, 118 deletions

diff --git a/demos/bio/client-arg.c b/demos/bio/client-arg.c
index cca7a1ed06..dc354cae06 100644
--- a/demos/bio/client-arg.c
+++ b/demos/bio/client-arg.c
@@ -2,121 +2,110 @@
 #include <openssl/ssl.h>
 
 int main(int argc, char **argv)
-	{
-	BIO *sbio = NULL, *out = NULL;
-	int len;
-	char tmpbuf[1024];
-	SSL_CTX *ctx;
-	SSL_CONF_CTX *cctx;
-	SSL *ssl;
-	char **args = argv + 1;
-	const char *connect_str = "localhost:4433";
-	int nargs = argc - 1;
-
-	ERR_load_crypto_strings();
-	ERR_load_SSL_strings();
-	SSL_library_init();
-
-	ctx = SSL_CTX_new(SSLv23_client_method());
-	cctx = SSL_CONF_CTX_new();
-	SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CLIENT);
-	SSL_CONF_CTX_set_ssl_ctx(cctx, ctx);
-	while(*args && **args == '-')
-		{
-		int rv;
-		/* Parse standard arguments */
-		rv = SSL_CONF_cmd_argv(cctx, &nargs, &args);
-		if (rv == -3)
-			{
-			fprintf(stderr, "Missing argument for %s\n", *args);
-			goto end;
-			}
-		if (rv < 0)
-			{
-			fprintf(stderr, "Error in command %s\n", *args);
-			ERR_print_errors_fp(stderr);
-			goto end;
-			}
-		/* If rv > 0 we processed something so proceed to next arg */
-		if (rv > 0)
-			continue;
-		/* Otherwise application specific argument processing */
-		if (!strcmp(*args, "-connect"))
-			{
-			connect_str = args[1];
-			if (connect_str == NULL)
-				{
-				fprintf(stderr, "Missing -connect argument\n");
-				goto end;
-				}
-			args += 2;
-			nargs -= 2;
-			continue;
-			}
-		else
-			{
-			fprintf(stderr, "Unknown argument %s\n", *args);
-			goto end;
-			}
-		}
-
-	if (!SSL_CONF_CTX_finish(cctx))
-		{
-		fprintf(stderr, "Finish error\n");
-		ERR_print_errors_fp(stderr);
-		goto err;
-		}
-
-	/* We'd normally set some stuff like the verify paths and
-	* mode here because as things stand this will connect to
-	* any server whose certificate is signed by any CA.
-	 */
-
-	sbio = BIO_new_ssl_connect(ctx);
-
-	BIO_get_ssl(sbio, &ssl);
-
-	if(!ssl)
-		{
-		fprintf(stderr, "Can't locate SSL pointer\n");
-	  	goto end;
-		}
-
-	/* Don't want any retries */
-	SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY);
-
-	/* We might want to do other things with ssl here */
-
-	BIO_set_conn_hostname(sbio, connect_str);
-
-	out = BIO_new_fp(stdout, BIO_NOCLOSE);
-	if(BIO_do_connect(sbio) <= 0)
-		{
-		fprintf(stderr, "Error connecting to server\n");
-		ERR_print_errors_fp(stderr);
-		goto end;
-		}
-
-	if(BIO_do_handshake(sbio) <= 0)
-		{
-		fprintf(stderr, "Error establishing SSL connection\n");
-		ERR_print_errors_fp(stderr);
-		goto end;
-		}
-
-	/* Could examine ssl here to get connection info */
-
-	BIO_puts(sbio, "GET / HTTP/1.0\n\n");
-	for(;;)
-		{	
-		len = BIO_read(sbio, tmpbuf, 1024);
-		if(len <= 0) break;
-		BIO_write(out, tmpbuf, len);
-		}
-	end:
-	SSL_CONF_CTX_free(cctx);
-	BIO_free_all(sbio);
-	BIO_free(out);
-	return 0;
-	}
-
+{
+    BIO *sbio = NULL, *out = NULL;
+    int len;
+    char tmpbuf[1024];
+    SSL_CTX *ctx;
+    SSL_CONF_CTX *cctx;
+    SSL *ssl;
+    char **args = argv + 1;
+    const char *connect_str = "localhost:4433";
+    int nargs = argc - 1;
+
+    ERR_load_crypto_strings();
+    ERR_load_SSL_strings();
+    SSL_library_init();
+
+    ctx = SSL_CTX_new(SSLv23_client_method());
+    cctx = SSL_CONF_CTX_new();
+    SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CLIENT);
+    SSL_CONF_CTX_set_ssl_ctx(cctx, ctx);
+    while (*args && **args == '-') {
+        int rv;
+        /* Parse standard arguments */
+        rv = SSL_CONF_cmd_argv(cctx, &nargs, &args);
+        if (rv == -3) {
+            fprintf(stderr, "Missing argument for %s\n", *args);
+            goto end;
+        }
+        if (rv < 0) {
+            fprintf(stderr, "Error in command %s\n", *args);
+            ERR_print_errors_fp(stderr);
+            goto end;
+        }
+        /* If rv > 0 we processed something so proceed to next arg */
+        if (rv > 0)
+            continue;
+        /* Otherwise application specific argument processing */
+        if (!strcmp(*args, "-connect")) {
+            connect_str = args[1];
+            if (connect_str == NULL) {
+                fprintf(stderr, "Missing -connect argument\n");
+                goto end;
+            }
+            args += 2;
+            nargs -= 2;
+            continue;
+        } else {
+            fprintf(stderr, "Unknown argument %s\n", *args);
+            goto end;
+        }
+    }
+
+    if (!SSL_CONF_CTX_finish(cctx)) {
+        fprintf(stderr, "Finish error\n");
+        ERR_print_errors_fp(stderr);
+        goto err;
+    }
+
+    /*
+     * We'd normally set some stuff like the verify paths and * mode here
+     * because as things stand this will connect to * any server whose
+     * certificate is signed by any CA.
+     */
+
+    sbio = BIO_new_ssl_connect(ctx);
+
+    BIO_get_ssl(sbio, &ssl);
+
+    if (!ssl) {
+        fprintf(stderr, "Can't locate SSL pointer\n");
+        goto end;
+    }
+
+    /* Don't want any retries */
+    SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY);
+
+    /* We might want to do other things with ssl here */
+
+    BIO_set_conn_hostname(sbio, connect_str);
+
+    out = BIO_new_fp(stdout, BIO_NOCLOSE);
+    if (BIO_do_connect(sbio) <= 0) {
+        fprintf(stderr, "Error connecting to server\n");
+        ERR_print_errors_fp(stderr);
+        goto end;
+    }
+
+    if (BIO_do_handshake(sbio) <= 0) {
+        fprintf(stderr, "Error establishing SSL connection\n");
+        ERR_print_errors_fp(stderr);
+        goto end;
+    }
+
+    /* Could examine ssl here to get connection info */
+
+    BIO_puts(sbio, "GET / HTTP/1.0\n\n");
+    for (;;) {
+        len = BIO_read(sbio, tmpbuf, 1024);
+        if (len <= 0)
+            break;
+        BIO_write(out, tmpbuf, len);
+    }
+ end:
+    SSL_CONF_CTX_free(cctx);
+    BIO_free_all(sbio);
+    BIO_free(out);
+    return 0;
+}