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

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

1 files changed, 131 insertions, 137 deletions

diff --git a/demos/bio/server-arg.c b/demos/bio/server-arg.c
index 0d432a4762..1d0e1db234 100644
--- a/demos/bio/server-arg.c
+++ b/demos/bio/server-arg.c
@@ -1,11 +1,10 @@
 /* NOCW */
 /* demos/bio/server-arg.c */
 
-/* A minimal program to serve an SSL connection.
- * It uses blocking.
- * It use the SSL_CONF API with the command line.
- *
- * cc -I../../include server-arg.c -L../.. -lssl -lcrypto -ldl
+/*
+ * A minimal program to serve an SSL connection. It uses blocking. It use the
+ * SSL_CONF API with the command line. cc -I../../include server-arg.c
+ * -L../.. -lssl -lcrypto -ldl
  */
 
 #include <stdio.h>
@@ -13,138 +12,133 @@
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 
-
 int main(int argc, char *argv[])
-	{
-	char *port = "*:4433";
-	BIO *ssl_bio,*tmp;
-	SSL_CTX *ctx;
-	SSL_CONF_CTX *cctx;
-	char buf[512];
-	BIO *in=NULL;
-	int ret=1,i;
-	char **args = argv + 1;
-	int nargs = argc - 1;
-
-	SSL_load_error_strings();
-
-	/* Add ciphers and message digests */
-	OpenSSL_add_ssl_algorithms();
-
-	ctx=SSL_CTX_new(SSLv23_server_method());
-
-	cctx = SSL_CONF_CTX_new();
-	SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_SERVER);
-	SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CERTIFICATE);
-	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 err;
-			}
-		if (rv < 0)
-			{
-			fprintf(stderr, "Error in command %s\n", *args);
-			ERR_print_errors_fp(stderr);
-			goto err;
-			}
-		/* If rv > 0 we processed something so proceed to next arg */
-		if (rv > 0)
-			continue;
-		/* Otherwise application specific argument processing */
-		if (!strcmp(*args, "-port"))
-			{
-			port = args[1];
-			if (port == NULL)
-				{
-				fprintf(stderr, "Missing -port argument\n");
-				goto err;
-				}
-			args += 2;
-			nargs -= 2;
-			continue;
-			}
-		else
-			{
-			fprintf(stderr, "Unknown argument %s\n", *args);
-			goto err;
-			}
-		}
-
-	if (!SSL_CONF_CTX_finish(cctx))
-		{
-		fprintf(stderr, "Finish error\n");
-		ERR_print_errors_fp(stderr);
-		goto err;
-		}
+{
+    char *port = "*:4433";
+    BIO *ssl_bio, *tmp;
+    SSL_CTX *ctx;
+    SSL_CONF_CTX *cctx;
+    char buf[512];
+    BIO *in = NULL;
+    int ret = 1, i;
+    char **args = argv + 1;
+    int nargs = argc - 1;
+
+    SSL_load_error_strings();
+
+    /* Add ciphers and message digests */
+    OpenSSL_add_ssl_algorithms();
+
+    ctx = SSL_CTX_new(SSLv23_server_method());
+
+    cctx = SSL_CONF_CTX_new();
+    SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_SERVER);
+    SSL_CONF_CTX_set_flags(cctx, SSL_CONF_FLAG_CERTIFICATE);
+    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 err;
+        }
+        if (rv < 0) {
+            fprintf(stderr, "Error in command %s\n", *args);
+            ERR_print_errors_fp(stderr);
+            goto err;
+        }
+        /* If rv > 0 we processed something so proceed to next arg */
+        if (rv > 0)
+            continue;
+        /* Otherwise application specific argument processing */
+        if (!strcmp(*args, "-port")) {
+            port = args[1];
+            if (port == NULL) {
+                fprintf(stderr, "Missing -port argument\n");
+                goto err;
+            }
+            args += 2;
+            nargs -= 2;
+            continue;
+        } else {
+            fprintf(stderr, "Unknown argument %s\n", *args);
+            goto err;
+        }
+    }
+
+    if (!SSL_CONF_CTX_finish(cctx)) {
+        fprintf(stderr, "Finish error\n");
+        ERR_print_errors_fp(stderr);
+        goto err;
+    }
 #if 0
-	/* Demo of how to iterate over all certificates in an SSL_CTX
-	 * structure.
-	 */
-	{
-	X509 *x;
-	int rv;
-	rv = SSL_CTX_set_current_cert(ctx, SSL_CERT_SET_FIRST);
-	while (rv)
-		{
-		X509 *x = SSL_CTX_get0_certificate(ctx);
-		X509_NAME_print_ex_fp(stdout, X509_get_subject_name(x), 0, XN_FLAG_ONELINE);
-		printf("\n");
-		rv = SSL_CTX_set_current_cert(ctx, SSL_CERT_SET_NEXT);
-		}
-	fflush(stdout);
-	}
+    /*
+     * Demo of how to iterate over all certificates in an SSL_CTX structure.
+     */
+    {
+        X509 *x;
+        int rv;
+        rv = SSL_CTX_set_current_cert(ctx, SSL_CERT_SET_FIRST);
+        while (rv) {
+            X509 *x = SSL_CTX_get0_certificate(ctx);
+            X509_NAME_print_ex_fp(stdout, X509_get_subject_name(x), 0,
+                                  XN_FLAG_ONELINE);
+            printf("\n");
+            rv = SSL_CTX_set_current_cert(ctx, SSL_CERT_SET_NEXT);
+        }
+        fflush(stdout);
+    }
 #endif
-	/* Setup server side SSL bio */
-	ssl_bio=BIO_new_ssl(ctx,0);
-
-	if ((in=BIO_new_accept(port)) == NULL) goto err;
-
-	/* This means that when a new connection is accepted on 'in',
-	 * The ssl_bio will be 'duplicated' and have the new socket
-	 * BIO push into it.  Basically it means the SSL BIO will be
-	 * automatically setup */
-	BIO_set_accept_bios(in,ssl_bio);
-
-again:
-	/* The first call will setup the accept socket, and the second
-	 * will get a socket.  In this loop, the first actual accept
-	 * will occur in the BIO_read() function. */
-
-	if (BIO_do_accept(in) <= 0) goto err;
-
-	for (;;)
-		{
-		i=BIO_read(in,buf,512);
-		if (i == 0)
-			{
-			/* If we have finished, remove the underlying
-			 * BIO stack so the next time we call any function
-			 * for this BIO, it will attempt to do an
-			 * accept */
-			printf("Done\n");
-			tmp=BIO_pop(in);
-			BIO_free_all(tmp);
-			goto again;
-			}
-		if (i < 0) goto err;
-		fwrite(buf,1,i,stdout);
-		fflush(stdout);
-		}
-
-	ret=0;
-err:
-	if (ret)
-		{
-		ERR_print_errors_fp(stderr);
-		}
-	if (in != NULL) BIO_free(in);
-	exit(ret);
-	return(!ret);
-	}
-
+    /* Setup server side SSL bio */
+    ssl_bio = BIO_new_ssl(ctx, 0);
+
+    if ((in = BIO_new_accept(port)) == NULL)
+        goto err;
+
+    /*
+     * This means that when a new connection is accepted on 'in', The ssl_bio
+     * will be 'duplicated' and have the new socket BIO push into it.
+     * Basically it means the SSL BIO will be automatically setup
+     */
+    BIO_set_accept_bios(in, ssl_bio);
+
+ again:
+    /*
+     * The first call will setup the accept socket, and the second will get a
+     * socket.  In this loop, the first actual accept will occur in the
+     * BIO_read() function.
+     */
+
+    if (BIO_do_accept(in) <= 0)
+        goto err;
+
+    for (;;) {
+        i = BIO_read(in, buf, 512);
+        if (i == 0) {
+            /*
+             * If we have finished, remove the underlying BIO stack so the
+             * next time we call any function for this BIO, it will attempt
+             * to do an accept
+             */
+            printf("Done\n");
+            tmp = BIO_pop(in);
+            BIO_free_all(tmp);
+            goto again;
+        }
+        if (i < 0)
+            goto err;
+        fwrite(buf, 1, i, stdout);
+        fflush(stdout);
+    }
+
+    ret = 0;
+ err:
+    if (ret) {
+        ERR_print_errors_fp(stderr);
+    }
+    if (in != NULL)
+        BIO_free(in);
+    exit(ret);
+    return (!ret);
+}