Initial KNF.

2 files changed, 133 insertions, 173 deletions

diff --git a/src/lib/libssl/src/apps/ec.c b/src/lib/libssl/src/apps/ec.c
index b9be5d74fc..f64608e9c3 100644
--- a/src/lib/libssl/src/apps/ec.c
+++ b/src/lib/libssl/src/apps/ec.c
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -83,7 +83,8 @@
 
 int MAIN(int, char **);
 
-int MAIN(int argc, char **argv)
+int
+MAIN(int argc, char **argv)
 {
         int     ret = 1;
         EC_KEY  *eckey = NULL;
@@ -91,7 +92,7 @@ int MAIN(int argc, char **argv)
         int     i, badops = 0;
         const EVP_CIPHER *enc = NULL;
         BIO     *in = NULL, *out = NULL;
-        int     informat, outformat, text=0, noout=0;
+        int     informat, outformat, text = 0, noout = 0;
         int     pubin = 0, pubout = 0, param_out = 0;
         char    *infile, *outfile, *prog, *engine;
         char    *passargin = NULL, *passargout = NULL;
@@ -104,7 +105,7 @@ int MAIN(int argc, char **argv)
         apps_startup();
 
         if (bio_err == NULL)
-                if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+                if ((bio_err = BIO_new(BIO_s_file())) != NULL)
                         BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT);
 
         if (!load_config(bio_err, NULL))
@@ -119,49 +120,40 @@ int MAIN(int argc, char **argv)
         prog = argv[0];
         argc--;
         argv++;
-        while (argc >= 1)
-                {
-                if (strcmp(*argv,"-inform") == 0)
-                        {
-                        if (--argc < 1) goto bad;
-                        informat=str2fmt(*(++argv));
-                        }
-                else if (strcmp(*argv,"-outform") == 0)
-                        {
-                        if (--argc < 1) goto bad;
-                        outformat=str2fmt(*(++argv));
-                        }
-                else if (strcmp(*argv,"-in") == 0)
-                        {
-                        if (--argc < 1) goto bad;
+        while (argc >= 1) {
+                if (strcmp(*argv, "-inform") == 0) {
+                        if (--argc < 1)
+                                goto bad;
+                        informat = str2fmt(*(++argv));
+                } else if (strcmp(*argv, "-outform") == 0) {
+                        if (--argc < 1)
+                                goto bad;
+                        outformat = str2fmt(*(++argv));
+                } else if (strcmp(*argv, "-in") == 0) {
+                        if (--argc < 1)
+                                goto bad;
                         infile= *(++argv);
-                        }
-                else if (strcmp(*argv,"-out") == 0)
-                        {
-                        if (--argc < 1) goto bad;
+                } else if (strcmp(*argv, "-out") == 0) {
+                        if (--argc < 1)
+                                goto bad;
                         outfile= *(++argv);
-                        }
-                else if (strcmp(*argv,"-passin") == 0)
-                        {
-                        if (--argc < 1) goto bad;
+                } else if (strcmp(*argv, "-passin") == 0) {
+                        if (--argc < 1)
+                                goto bad;
                         passargin= *(++argv);
-                        }
-                else if (strcmp(*argv,"-passout") == 0)
-                        {
-                        if (--argc < 1) goto bad;
+                } else if (strcmp(*argv, "-passout") == 0) {
+                        if (--argc < 1)
+                                goto bad;
                         passargout= *(++argv);
-                        }
-                else if (strcmp(*argv, "-engine") == 0)
-                        {
-                        if (--argc < 1) goto bad;
+                } else if (strcmp(*argv, "-engine") == 0) {
+                        if (--argc < 1)
+                                goto bad;
                         engine= *(++argv);
-                        }
-                else if (strcmp(*argv, "-noout") == 0)
+                } else if (strcmp(*argv, "-noout") == 0)
                         noout = 1;
                 else if (strcmp(*argv, "-text") == 0)
                         text = 1;
-                else if (strcmp(*argv, "-conv_form") == 0)
-                        {
+                else if (strcmp(*argv, "-conv_form") == 0) {
                         if (--argc < 1)
                                 goto bad;
                         ++argv;
@@ -174,9 +166,7 @@ int MAIN(int argc, char **argv)
                                 form = POINT_CONVERSION_HYBRID;
                         else
                                 goto bad;
-                        }
-                else if (strcmp(*argv, "-param_enc") == 0)
-                        {
+                } else if (strcmp(*argv, "-param_enc") == 0) {
                         if (--argc < 1)
                                 goto bad;
                         ++argv;
@@ -187,139 +177,122 @@ int MAIN(int argc, char **argv)
                                 asn1_flag = 0;
                         else
                                 goto bad;
-                        }
-                else if (strcmp(*argv, "-param_out") == 0)
+                } else if (strcmp(*argv, "-param_out") == 0)
                         param_out = 1;
                 else if (strcmp(*argv, "-pubin") == 0)
-                        pubin=1;
+                        pubin = 1;
                 else if (strcmp(*argv, "-pubout") == 0)
-                        pubout=1;
-                else if ((enc=EVP_get_cipherbyname(&(argv[0][1]))) == NULL)
-                        {
+                        pubout = 1;
+                else if ((enc = EVP_get_cipherbyname(&(argv[0][1]))) == NULL) {
                         BIO_printf(bio_err, "unknown option %s\n", *argv);
-                        badops=1;
+                        badops = 1;
                         break;
-                        }
+                }
                 argc--;
                 argv++;
-                }
+        }
 
-        if (badops)
-                {
+        if (badops) {
 bad:
                 BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
                 BIO_printf(bio_err, "where options are\n");
                 BIO_printf(bio_err, " -inform arg     input format - "
-                                "DER or PEM\n");
+                    "DER or PEM\n");
                 BIO_printf(bio_err, " -outform arg    output format - "
-                                "DER or PEM\n");
+                    "DER or PEM\n");
                 BIO_printf(bio_err, " -in arg         input file\n");
                 BIO_printf(bio_err, " -passin arg     input file pass "
-                                "phrase source\n");
+                    "phrase source\n");
                 BIO_printf(bio_err, " -out arg        output file\n");
                 BIO_printf(bio_err, " -passout arg    output file pass "
-                                "phrase source\n");
+                    "phrase source\n");
                 BIO_printf(bio_err, " -engine e       use engine e, "
-                                "possibly a hardware device.\n");
+                    "possibly a hardware device.\n");
                 BIO_printf(bio_err, " -des            encrypt PEM output, "
-                                "instead of 'des' every other \n"
-                                "                 cipher "
-                                "supported by OpenSSL can be used\n");
+                "instead of 'des' every other \n"
+                "                 cipher "
+                    "supported by OpenSSL can be used\n");
                 BIO_printf(bio_err, " -text           print the key\n");
                 BIO_printf(bio_err, " -noout          don't print key out\n");
                 BIO_printf(bio_err, " -param_out      print the elliptic "
-                                "curve parameters\n");
+                    "curve parameters\n");
                 BIO_printf(bio_err, " -conv_form arg  specifies the "
-                                "point conversion form \n");
+                    "point conversion form \n");
                 BIO_printf(bio_err, "                 possible values:"
-                                " compressed\n");
+                    " compressed\n");
                 BIO_printf(bio_err, "                                 "
-                                " uncompressed (default)\n");
+                    " uncompressed (default)\n");
                 BIO_printf(bio_err, "                                  "
-                                " hybrid\n");
+                    " hybrid\n");
                 BIO_printf(bio_err, " -param_enc arg  specifies the way"
-                                " the ec parameters are encoded\n");
+                    " the ec parameters are encoded\n");
                 BIO_printf(bio_err, "                 in the asn1 der "
-                                "encoding\n");
+                    "encoding\n");
                 BIO_printf(bio_err, "                 possible values:"
-                                " named_curve (default)\n");
-                BIO_printf(bio_err,"                                  "
-                                "explicit\n");
+                    " named_curve (default)\n");
+                BIO_printf(bio_err, "                                  "
+                    "explicit\n");
                 goto end;
-                }
+        }
 
         ERR_load_crypto_strings();
 
 #ifndef OPENSSL_NO_ENGINE
-        setup_engine(bio_err, engine, 0);
+        setup_engine(bio_err, engine, 0);
 #endif
 
-        if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) 
-                {
+        if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
                 BIO_printf(bio_err, "Error getting passwords\n");
                 goto end;
-                }
+        }
 
         in = BIO_new(BIO_s_file());
         out = BIO_new(BIO_s_file());
-        if ((in == NULL) || (out == NULL))
-                {
+        if ((in == NULL) || (out == NULL)) {
                 ERR_print_errors(bio_err);
                 goto end;
-                }
+        }
 
         if (infile == NULL)
                 BIO_set_fp(in, stdin, BIO_NOCLOSE);
-        else
-                {
-                if (BIO_read_filename(in, infile) <= 0)
-                        {
+        else {
+                if (BIO_read_filename(in, infile) <= 0) {
                         perror(infile);
                         goto end;
-                        }
                 }
+        }
 
         BIO_printf(bio_err, "read EC key\n");
-        if (informat == FORMAT_ASN1) 
-                {
-                if (pubin) 
+        if (informat == FORMAT_ASN1) {
+                if (pubin)
                         eckey = d2i_EC_PUBKEY_bio(in, NULL);
-                else 
+                else
                         eckey = d2i_ECPrivateKey_bio(in, NULL);
-                } 
-        else if (informat == FORMAT_PEM) 
-                {
-                if (pubin) 
-                        eckey = PEM_read_bio_EC_PUBKEY(in, NULL, NULL, 
-                                NULL);
-                else 
+        } else if (informat == FORMAT_PEM) {
+                if (pubin)
+                        eckey = PEM_read_bio_EC_PUBKEY(in, NULL, NULL,
+                            NULL);
+                else
                         eckey = PEM_read_bio_ECPrivateKey(in, NULL, NULL,
-                                passin);
-                } 
-        else
-                {
+                            passin);
+        } else {
                 BIO_printf(bio_err, "bad input format specified for key\n");
                 goto end;
-                }
-        if (eckey == NULL)
-                {
-                BIO_printf(bio_err,"unable to load Key\n");
+        }
+        if (eckey == NULL) {
+                BIO_printf(bio_err, "unable to load Key\n");
                 ERR_print_errors(bio_err);
                 goto end;
-                }
+        }
 
-        if (outfile == NULL)
-                {
+        if (outfile == NULL) {
                 BIO_set_fp(out, stdout, BIO_NOCLOSE);
-                }
-        else
-                {
-                if (BIO_write_filename(out, outfile) <= 0)
-                        {
+        } else {
+                if (BIO_write_filename(out, outfile) <= 0) {
                         perror(outfile);
                         goto end;
-                        }
                 }
+        }
 
         group = EC_KEY_get0_group(eckey);
 
@@ -329,54 +302,45 @@ bad:
         if (new_asn1_flag)
                 EC_KEY_set_asn1_flag(eckey, asn1_flag);
 
-        if (text) 
-                if (!EC_KEY_print(out, eckey, 0))
-                        {
+        if (text)
+                if (!EC_KEY_print(out, eckey, 0)) {
                         perror(outfile);
                         ERR_print_errors(bio_err);
                         goto end;
-                        }
+                }
 
-        if (noout) 
-                {
+        if (noout) {
                 ret = 0;
                 goto end;
-                }
+        }
 
         BIO_printf(bio_err, "writing EC key\n");
-        if (outformat == FORMAT_ASN1) 
-                {
+        if (outformat == FORMAT_ASN1) {
                 if (param_out)
                         i = i2d_ECPKParameters_bio(out, group);
-                else if (pubin || pubout) 
+                else if (pubin || pubout)
                         i = i2d_EC_PUBKEY_bio(out, eckey);
-                else 
+                else
                         i = i2d_ECPrivateKey_bio(out, eckey);
-                } 
-        else if (outformat == FORMAT_PEM) 
-                {
+        } else if (outformat == FORMAT_PEM) {
                 if (param_out)
                         i = PEM_write_bio_ECPKParameters(out, group);
                 else if (pubin || pubout)
                         i = PEM_write_bio_EC_PUBKEY(out, eckey);
-                else 
+                else
                         i = PEM_write_bio_ECPrivateKey(out, eckey, enc,
-                                                NULL, 0, NULL, passout);
-                } 
-        else 
-                {
+                    NULL, 0, NULL, passout);
+        } else {
                 BIO_printf(bio_err, "bad output format specified for "
-                        "outfile\n");
+                    "outfile\n");
                 goto end;
-                }
+        }
 
-        if (!i)
-                {
+        if (!i) {
                 BIO_printf(bio_err, "unable to write private key\n");
                 ERR_print_errors(bio_err);
-                }
-        else
-                ret=0;
+        } else
+                ret = 0;
 end:
         if (in)
                 BIO_free(in);
@@ -394,7 +358,7 @@ end:
 #else /* !OPENSSL_NO_EC */
 
 # if PEDANTIC
-static void *dummy=&dummy;
+static void *dummy = &dummy;
 # endif
 
 #endif
diff --git a/src/lib/libssl/src/apps/errstr.c b/src/lib/libssl/src/apps/errstr.c
index f9b4a4f093..00c489be0e 100644
--- a/src/lib/libssl/src/apps/errstr.c
+++ b/src/lib/libssl/src/apps/errstr.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -70,53 +70,49 @@
 
 int MAIN(int, char **);
 
-int MAIN(int argc, char **argv)
-        {
-        int i,ret=0;
+int
+MAIN(int argc, char **argv)
+{
+        int i, ret = 0;
         char buf[256];
         unsigned long l;
 
         apps_startup();
 
         if (bio_err == NULL)
-                if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-                        BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+                if ((bio_err = BIO_new(BIO_s_file())) != NULL)
+                        BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT);
 
         SSL_load_error_strings();
 
-        if ((argc > 1) && (strcmp(argv[1],"-stats") == 0))
-                {
-                BIO *out=NULL;
+        if ((argc > 1) && (strcmp(argv[1], "-stats") == 0)) {
+                BIO *out = NULL;
 
-                out=BIO_new(BIO_s_file());
-                if ((out != NULL) && BIO_set_fp(out,stdout,BIO_NOCLOSE))
-                        {
+                out = BIO_new(BIO_s_file());
+                if ((out != NULL) && BIO_set_fp(out, stdout, BIO_NOCLOSE)) {
                         lh_ERR_STRING_DATA_node_stats_bio(
-                                                  ERR_get_string_table(), out);
+                            ERR_get_string_table(), out);
                         lh_ERR_STRING_DATA_stats_bio(ERR_get_string_table(),
-                                                     out);
+                            out);
                         lh_ERR_STRING_DATA_node_usage_stats_bio(
-                                                    ERR_get_string_table(),out);
-                        }
-                if (out != NULL) BIO_free_all(out);
+                            ERR_get_string_table(), out);
+                }
+                if (out != NULL)
+                        BIO_free_all(out);
                 argc--;
                 argv++;
-                }
+        }
 
-        for (i=1; i<argc; i++)
-                {
-                if (sscanf(argv[i],"%lx",&l))
-                        {
+        for (i = 1; i < argc; i++) {
+                if (sscanf(argv[i], "%lx",&l)) {
                         ERR_error_string_n(l, buf, sizeof buf);
-                        printf("%s\n",buf);
-                        }
-                else
-                        {
-                        printf("%s: bad error code\n",argv[i]);
+                        printf("%s\n", buf);
+                } else {
+                        printf("%s: bad error code\n", argv[i]);
                         printf("usage: errstr [-stats] <errno> ...\n");
                         ret++;
-                        }
                 }
+        }
         apps_shutdown();
         OPENSSL_EXIT(ret);
-        }
+}