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

[openssl.git] / apps / dgst.c

diff --git a/apps/dgst.c b/apps/dgst.c
index 9ebfc22e79692f2b06b3a33ef55e192467070785..e04880c5b620df415276ed7b2d4796fdaaa881e8 100644 (file)
--- a/apps/dgst.c
+++ b/apps/dgst.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 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).
  * 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.
  * 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:
  * 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 :-).
  *     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)"
  *    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
  * 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.
  * 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
  * 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


@@ -69,484 +69,454 @@
 #include <openssl/hmac.h>
 
 #undef BUFSIZE
 #include <openssl/hmac.h>
 
 #undef BUFSIZE

-#define BUFSIZE        1024*8
+#define BUFSIZE 1024*8

 
 #undef PROG
 
 #undef PROG

-#define PROG   dgst_main
+#define PROG    dgst_main

 
 int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
 
 int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,

-         EVP_PKEY *key, unsigned char *sigin, int siglen, const char *title,
-         const char *file,BIO *bmd,const char *hmac_key, int non_fips_allow);
+          EVP_PKEY *key, unsigned char *sigin, int siglen, const char *title,
+          const char *file, BIO *bmd, const char *hmac_key,
+          int non_fips_allow);

 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)

-       {
-       ENGINE *e = NULL;
-       unsigned char *buf=NULL;
-       int i,err=1;
-       const EVP_MD *md=NULL,*m;
-       BIO *in=NULL,*inp;
-       BIO *bmd=NULL;
-       BIO *out = NULL;
-       const char *name;
+{
+    ENGINE *e = NULL;
+    unsigned char *buf = NULL;
+    int i, err = 1;
+    const EVP_MD *md = NULL, *m;
+    BIO *in = NULL, *inp;
+    BIO *bmd = NULL;
+    BIO *out = NULL;
+    const char *name;

 #define PROG_NAME_SIZE  39
 #define PROG_NAME_SIZE  39

-       char pname[PROG_NAME_SIZE+1];
-       int separator=0;
-       int debug=0;
-       int keyform=FORMAT_PEM;
-       const char *outfile = NULL, *keyfile = NULL;
-       const char *sigfile = NULL, *randfile = NULL;
-       int out_bin = -1, want_pub = 0, do_verify = 0;
-       EVP_PKEY *sigkey = NULL;
-       unsigned char *sigbuf = NULL;
-       int siglen = 0;
-       unsigned int sig_flags = 0;
-       char *passargin = NULL, *passin = NULL;
+    char pname[PROG_NAME_SIZE + 1];
+    int separator = 0;
+    int debug = 0;
+    int keyform = FORMAT_PEM;
+    const char *outfile = NULL, *keyfile = NULL;
+    const char *sigfile = NULL, *randfile = NULL;
+    int out_bin = -1, want_pub = 0, do_verify = 0;
+    EVP_PKEY *sigkey = NULL;
+    unsigned char *sigbuf = NULL;
+    int siglen = 0;
+    unsigned int sig_flags = 0;
+    char *passargin = NULL, *passin = NULL;

 #ifndef OPENSSL_NO_ENGINE
 #ifndef OPENSSL_NO_ENGINE

-       char *engine=NULL;
+    char *engine = NULL;

 #endif
 #endif

-       char *hmac_key=NULL;
-       int non_fips_allow = 0;
-
-       apps_startup();
-ERR_load_crypto_strings();
-       if ((buf=(unsigned char *)OPENSSL_malloc(BUFSIZE)) == NULL)
-               {
-               BIO_printf(bio_err,"out of memory\n");
-               goto end;
-               }
-       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 (!load_config(bio_err, NULL))
-               goto end;
-
-       /* first check the program name */
-       program_name(argv[0],pname,sizeof pname);
-
-       md=EVP_get_digestbyname(pname);
-
-       argc--;
-       argv++;
-       while (argc > 0)
-               {
-               if ((*argv)[0] != '-') break;
-               if (strcmp(*argv,"-c") == 0)
-                       separator=1;
-               else if (strcmp(*argv,"-rand") == 0)
-                       {
-                       if (--argc < 1) break;
-                       randfile=*(++argv);
-                       }
-               else if (strcmp(*argv,"-out") == 0)
-                       {
-                       if (--argc < 1) break;
-                       outfile=*(++argv);
-                       }
-               else if (strcmp(*argv,"-sign") == 0)
-                       {
-                       if (--argc < 1) break;
-                       keyfile=*(++argv);
-                       }
-               else if (!strcmp(*argv,"-passin"))
-                       {
-                       if (--argc < 1)
-                               break;
-                       passargin=*++argv;
-                       }
-               else if (strcmp(*argv,"-verify") == 0)
-                       {
-                       if (--argc < 1) break;
-                       keyfile=*(++argv);
-                       want_pub = 1;
-                       do_verify = 1;
-                       }
-               else if (strcmp(*argv,"-prverify") == 0)
-                       {
-                       if (--argc < 1) break;
-                       keyfile=*(++argv);
-                       do_verify = 1;
-                       }
-               else if (strcmp(*argv,"-x931") == 0)
-                       sig_flags = EVP_MD_CTX_FLAG_PAD_X931;
-               else if (strcmp(*argv,"-pss_saltlen") == 0)
-                       {
-                       int saltlen;
-                       if (--argc < 1) break;
-                       saltlen=atoi(*(++argv));
-                       if (saltlen == -1)
-                               sig_flags = EVP_MD_CTX_FLAG_PSS_MREC;
-                       else if (saltlen == -2)
-                               sig_flags = EVP_MD_CTX_FLAG_PSS_MDLEN;
-                       else if (saltlen < -2 || saltlen >= 0xFFFE)
-                               {
-                               BIO_printf(bio_err, "Invalid PSS salt length %d\n", saltlen);
-                               goto end;
-                               }
-                       else
-                               sig_flags = saltlen;
-                       sig_flags <<= 16;
-                       sig_flags |= EVP_MD_CTX_FLAG_PAD_PSS;
-                       }
-               else if (strcmp(*argv,"-signature") == 0)
-                       {
-                       if (--argc < 1) break;
-                       sigfile=*(++argv);
-                       }
-               else if (strcmp(*argv,"-keyform") == 0)
-                       {
-                       if (--argc < 1) break;
-                       keyform=str2fmt(*(++argv));
-                       }
+    char *hmac_key = NULL;
+    int non_fips_allow = 0;
+
+    apps_startup();
+    ERR_load_crypto_strings();
+    if ((buf = (unsigned char *)OPENSSL_malloc(BUFSIZE)) == NULL) {
+        BIO_printf(bio_err, "out of memory\n");
+        goto end;
+    }
+    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 (!load_config(bio_err, NULL))
+        goto end;
+
+    /* first check the program name */
+    program_name(argv[0], pname, sizeof pname);
+
+    md = EVP_get_digestbyname(pname);
+
+    argc--;
+    argv++;
+    while (argc > 0) {
+        if ((*argv)[0] != '-')
+            break;
+        if (strcmp(*argv, "-c") == 0)
+            separator = 1;
+        else if (strcmp(*argv, "-rand") == 0) {
+            if (--argc < 1)
+                break;
+            randfile = *(++argv);
+        } else if (strcmp(*argv, "-out") == 0) {
+            if (--argc < 1)
+                break;
+            outfile = *(++argv);
+        } else if (strcmp(*argv, "-sign") == 0) {
+            if (--argc < 1)
+                break;
+            keyfile = *(++argv);
+        } else if (!strcmp(*argv, "-passin")) {
+            if (--argc < 1)
+                break;
+            passargin = *++argv;
+        } else if (strcmp(*argv, "-verify") == 0) {
+            if (--argc < 1)
+                break;
+            keyfile = *(++argv);
+            want_pub = 1;
+            do_verify = 1;
+        } else if (strcmp(*argv, "-prverify") == 0) {
+            if (--argc < 1)
+                break;
+            keyfile = *(++argv);
+            do_verify = 1;
+        } else if (strcmp(*argv, "-x931") == 0)
+            sig_flags = EVP_MD_CTX_FLAG_PAD_X931;
+        else if (strcmp(*argv, "-pss_saltlen") == 0) {
+            int saltlen;
+            if (--argc < 1)
+                break;
+            saltlen = atoi(*(++argv));
+            if (saltlen == -1)
+                sig_flags = EVP_MD_CTX_FLAG_PSS_MREC;
+            else if (saltlen == -2)
+                sig_flags = EVP_MD_CTX_FLAG_PSS_MDLEN;
+            else if (saltlen < -2 || saltlen >= 0xFFFE) {
+                BIO_printf(bio_err, "Invalid PSS salt length %d\n", saltlen);
+                goto end;
+            } else
+                sig_flags = saltlen;
+            sig_flags <<= 16;
+            sig_flags |= EVP_MD_CTX_FLAG_PAD_PSS;
+        } else if (strcmp(*argv, "-signature") == 0) {
+            if (--argc < 1)
+                break;
+            sigfile = *(++argv);
+        } else if (strcmp(*argv, "-keyform") == 0) {
+            if (--argc < 1)
+                break;
+            keyform = str2fmt(*(++argv));
+        }

 #ifndef OPENSSL_NO_ENGINE
 #ifndef OPENSSL_NO_ENGINE

-               else if (strcmp(*argv,"-engine") == 0)
-                       {
-                       if (--argc < 1) break;
-                       engine= *(++argv);
-                       }
+        else if (strcmp(*argv, "-engine") == 0) {
+            if (--argc < 1)
+                break;
+            engine = *(++argv);
+        }

 #endif
 #endif

-               else if (strcmp(*argv,"-hex") == 0)
-                       out_bin = 0;
-               else if (strcmp(*argv,"-binary") == 0)
-                       out_bin = 1;
-               else if (strcmp(*argv,"-d") == 0)
-                       debug=1;
-               else if (strcmp(*argv,"-non-fips-allow") == 0)
-                       non_fips_allow=1;
-               else if (!strcmp(*argv,"-fips-fingerprint"))
-                       hmac_key = "etaonrishdlcupfm";
-               else if (!strcmp(*argv,"-hmac"))
-                       {
-                       if (--argc < 1)
-                               break;
-                       hmac_key=*++argv;
-                       }
-               else if ((m=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
-                       md=m;
-               else
-                       break;
-               argc--;
-               argv++;
-               }
-
-       if (md == NULL)
-               md=EVP_md5();
-
-       if(do_verify && !sigfile) {
-               BIO_printf(bio_err, "No signature to verify: use the -signature option\n");
-               err = 1; 
-               goto end;
-       }
-
-       if ((argc > 0) && (argv[0][0] == '-')) /* bad option */
-               {
-               BIO_printf(bio_err,"unknown option '%s'\n",*argv);
-               BIO_printf(bio_err,"options are\n");
-               BIO_printf(bio_err,"-c              to output the digest with separating colons\n");
-               BIO_printf(bio_err,"-d              to output debug info\n");
-               BIO_printf(bio_err,"-hex            output as hex dump\n");
-               BIO_printf(bio_err,"-binary         output in binary form\n");
-               BIO_printf(bio_err,"-sign   file    sign digest using private key in file\n");
-               BIO_printf(bio_err,"-verify file    verify a signature using public key in file\n");
-               BIO_printf(bio_err,"-prverify file  verify a signature using private key in file\n");
-               BIO_printf(bio_err,"-keyform arg    key file format (PEM or ENGINE)\n");
-               BIO_printf(bio_err,"-signature file signature to verify\n");
-               BIO_printf(bio_err,"-binary         output in binary form\n");
-               BIO_printf(bio_err,"-hmac key       create hashed MAC with key\n");
+        else if (strcmp(*argv, "-hex") == 0)
+            out_bin = 0;
+        else if (strcmp(*argv, "-binary") == 0)
+            out_bin = 1;
+        else if (strcmp(*argv, "-d") == 0)
+            debug = 1;
+        else if (strcmp(*argv, "-non-fips-allow") == 0)
+            non_fips_allow = 1;
+        else if (!strcmp(*argv, "-fips-fingerprint"))
+            hmac_key = "etaonrishdlcupfm";
+        else if (!strcmp(*argv, "-hmac")) {
+            if (--argc < 1)
+                break;
+            hmac_key = *++argv;
+        } else if ((m = EVP_get_digestbyname(&((*argv)[1]))) != NULL)
+            md = m;
+        else
+            break;
+        argc--;
+        argv++;
+    }
+
+    if (md == NULL)
+        md = EVP_md5();
+
+    if (do_verify && !sigfile) {
+        BIO_printf(bio_err,
+                   "No signature to verify: use the -signature option\n");
+        err = 1;
+        goto end;
+    }
+
+    if ((argc > 0) && (argv[0][0] == '-')) { /* bad option */
+        BIO_printf(bio_err, "unknown option '%s'\n", *argv);
+        BIO_printf(bio_err, "options are\n");
+        BIO_printf(bio_err,
+                   "-c              to output the digest with separating colons\n");
+        BIO_printf(bio_err, "-d              to output debug info\n");
+        BIO_printf(bio_err, "-hex            output as hex dump\n");
+        BIO_printf(bio_err, "-binary         output in binary form\n");
+        BIO_printf(bio_err,
+                   "-sign   file    sign digest using private key in file\n");
+        BIO_printf(bio_err,
+                   "-verify file    verify a signature using public key in file\n");
+        BIO_printf(bio_err,
+                   "-prverify file  verify a signature using private key in file\n");
+        BIO_printf(bio_err,
+                   "-keyform arg    key file format (PEM or ENGINE)\n");
+        BIO_printf(bio_err, "-signature file signature to verify\n");
+        BIO_printf(bio_err, "-binary         output in binary form\n");
+        BIO_printf(bio_err, "-hmac key       create hashed MAC with key\n");

 #ifndef OPENSSL_NO_ENGINE
 #ifndef OPENSSL_NO_ENGINE

-               BIO_printf(bio_err,"-engine e       use engine e, possibly a hardware device.\n");
+        BIO_printf(bio_err,
+                   "-engine e       use engine e, possibly a hardware device.\n");

 #endif
 
 #endif
 

-               BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm (default)\n",
-                       LN_md5,LN_md5);
-               BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-                       LN_md4,LN_md4);
-               BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-                       LN_md2,LN_md2);
+        BIO_printf(bio_err,
+                   "-%-14s to use the %s message digest algorithm (default)\n",
+                   LN_md5, LN_md5);
+        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
+                   LN_md4, LN_md4);
+        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
+                   LN_md2, LN_md2);

 #ifndef OPENSSL_NO_SHA
 #ifndef OPENSSL_NO_SHA

-               BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-                       LN_sha1,LN_sha1);
-               BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-                       LN_sha,LN_sha);
-#ifndef OPENSSL_NO_SHA256
-               BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-                       LN_sha224,LN_sha224);
-               BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-                       LN_sha256,LN_sha256);
+        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
+                   LN_sha1, LN_sha1);
+        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
+                   LN_sha, LN_sha);
+# ifndef OPENSSL_NO_SHA256
+        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
+                   LN_sha224, LN_sha224);
+        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
+                   LN_sha256, LN_sha256);
+# endif
+# ifndef OPENSSL_NO_SHA512
+        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
+                   LN_sha384, LN_sha384);
+        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
+                   LN_sha512, LN_sha512);
+# endif

 #endif
 #endif

-#ifndef OPENSSL_NO_SHA512
-               BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-                       LN_sha384,LN_sha384);
-               BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-                       LN_sha512,LN_sha512);
-#endif
-#endif
-               BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-                       LN_mdc2,LN_mdc2);
-               BIO_printf(bio_err,"-%-14s to use the %s message digest algorithm\n",
-                       LN_ripemd160,LN_ripemd160);
-               err=1;
-               goto end;
-               }
-
+        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
+                   LN_mdc2, LN_mdc2);
+        BIO_printf(bio_err, "-%-14s to use the %s message digest algorithm\n",
+                   LN_ripemd160, LN_ripemd160);
+        err = 1;
+        goto end;
+    }

 #ifndef OPENSSL_NO_ENGINE
 #ifndef OPENSSL_NO_ENGINE

-        e = setup_engine(bio_err, engine, 0);
+    e = setup_engine(bio_err, engine, 0);

 #endif
 
 #endif
 

-       in=BIO_new(BIO_s_file());
-       bmd=BIO_new(BIO_f_md());
-       if (debug)
-               {
-               BIO_set_callback(in,BIO_debug_callback);
-               /* needed for windows 3.1 */
-               BIO_set_callback_arg(in,(char *)bio_err);
-               }
-
-       if(!app_passwd(bio_err, passargin, NULL, &passin, NULL))
-               {
-               BIO_printf(bio_err, "Error getting password\n");
-               goto end;
-               }
-
-       if ((in == NULL) || (bmd == NULL))
-               {
-               ERR_print_errors(bio_err);
-               goto end;
-               }
-
-       if(out_bin == -1) {
-               if(keyfile) out_bin = 1;
-               else out_bin = 0;
-       }
-
-       if(randfile)
-               app_RAND_load_file(randfile, bio_err, 0);
-
-       if(outfile) {
-               if(out_bin)
-                       out = BIO_new_file(outfile, "wb");
-               else    out = BIO_new_file(outfile, "w");
-       } else {
-               out = BIO_new_fp(stdout, BIO_NOCLOSE);
+    in = BIO_new(BIO_s_file());
+    bmd = BIO_new(BIO_f_md());
+    if (debug) {
+        BIO_set_callback(in, BIO_debug_callback);
+        /* needed for windows 3.1 */
+        BIO_set_callback_arg(in, (char *)bio_err);
+    }
+
+    if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
+        BIO_printf(bio_err, "Error getting password\n");
+        goto end;
+    }
+
+    if ((in == NULL) || (bmd == NULL)) {
+        ERR_print_errors(bio_err);
+        goto end;
+    }
+
+    if (out_bin == -1) {
+        if (keyfile)
+            out_bin = 1;
+        else
+            out_bin = 0;
+    }
+
+    if (randfile)
+        app_RAND_load_file(randfile, bio_err, 0);
+
+    if (outfile) {
+        if (out_bin)
+            out = BIO_new_file(outfile, "wb");
+        else
+            out = BIO_new_file(outfile, "w");
+    } else {
+        out = BIO_new_fp(stdout, BIO_NOCLOSE);

 #ifdef OPENSSL_SYS_VMS
 #ifdef OPENSSL_SYS_VMS

-               {
-               BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-               out = BIO_push(tmpbio, out);
-               }
+        {
+            BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+            out = BIO_push(tmpbio, out);
+        }

 #endif
 #endif

-       }
-
-       if(!out) {
-               BIO_printf(bio_err, "Error opening output file %s\n", 
-                                       outfile ? outfile : "(stdout)");
-               ERR_print_errors(bio_err);
-               goto end;
-       }
-
-       if(keyfile)
-               {
-               if (want_pub)
-                       sigkey = load_pubkey(bio_err, keyfile, keyform, 0, NULL,
-                               e, "key file");
-               else
-                       sigkey = load_key(bio_err, keyfile, keyform, 0, passin,
-                               e, "key file");
-               if (!sigkey)
-                       {
-                       /* load_[pub]key() has already printed an appropriate
-                          message */
-                       goto end;
-                       }
-               }
-
-       if(sigfile && sigkey) {
-               BIO *sigbio;
-               sigbio = BIO_new_file(sigfile, "rb");
-               siglen = EVP_PKEY_size(sigkey);
-               sigbuf = OPENSSL_malloc(siglen);
-               if(!sigbio) {
-                       BIO_printf(bio_err, "Error opening signature file %s\n",
-                                                               sigfile);
-                       ERR_print_errors(bio_err);
-                       goto end;
-               }
-               siglen = BIO_read(sigbio, sigbuf, siglen);
-               BIO_free(sigbio);
-               if(siglen <= 0) {
-                       BIO_printf(bio_err, "Error reading signature file %s\n",
-                                                               sigfile);
-                       ERR_print_errors(bio_err);
-                       goto end;
-               }
-       }
-
-       if (non_fips_allow)
-               {
-               EVP_MD_CTX *md_ctx;
-               BIO_get_md_ctx(bmd,&md_ctx);
-               EVP_MD_CTX_set_flags(md_ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
-               }
-
-       if (sig_flags)
-               {
-               EVP_MD_CTX *md_ctx;
-               BIO_get_md_ctx(bmd,&md_ctx);
-               EVP_MD_CTX_set_flags(md_ctx, sig_flags);
-               }
-
-       /* we use md as a filter, reading from 'in' */
-       if (!BIO_set_md(bmd,md))
-               {
-               BIO_printf(bio_err, "Error setting digest %s\n", pname);
-               ERR_print_errors(bio_err);
-               goto end;
-               }
-               
-       inp=BIO_push(bmd,in);
-
-       if (argc == 0)
-               {
-               BIO_set_fp(in,stdin,BIO_NOCLOSE);
-               err=do_fp(out, buf,inp,separator, out_bin, sigkey, sigbuf,
-                         siglen,"","(stdin)",bmd,hmac_key,non_fips_allow);
-               }
-       else
-               {
-               name=OBJ_nid2sn(md->type);
-               err = 0;
-               for (i=0; i<argc; i++)
-                       {
-                       char *tmp,*tofree=NULL;
-                       int r;
-
-                       if (BIO_read_filename(in,argv[i]) <= 0)
-                               {
-                               perror(argv[i]);
-                               err++;
-                               continue;
-                               }
-                       if(!out_bin)
-                               {
-                               size_t len = strlen(name)+strlen(argv[i])+(hmac_key ? 5 : 0)+5;
-                               tmp=tofree=OPENSSL_malloc(len);
-                               BIO_snprintf(tmp,len,"%s%s(%s)= ",
-                                                        hmac_key ? "HMAC-" : "",name,argv[i]);
-                               }
-                       else
-                               tmp="";
-                       r=do_fp(out,buf,inp,separator,out_bin,sigkey,sigbuf,
-                               siglen,tmp,argv[i],bmd,hmac_key,non_fips_allow);
-                       if(r)
-                           err=r;
-                       if(tofree)
-                               OPENSSL_free(tofree);
-                       (void)BIO_reset(bmd);
-                       }
-               }
-end:
-       if (buf != NULL)
-               {
-               OPENSSL_cleanse(buf,BUFSIZE);
-               OPENSSL_free(buf);
-               }
-       if (in != NULL) BIO_free(in);
-       if (passin)
-               OPENSSL_free(passin);
-       BIO_free_all(out);
-       EVP_PKEY_free(sigkey);
-       if(sigbuf) OPENSSL_free(sigbuf);
-       if (bmd != NULL) BIO_free(bmd);
-       apps_shutdown();
-       OPENSSL_EXIT(err);
-       }
+    }
+
+    if (!out) {
+        BIO_printf(bio_err, "Error opening output file %s\n",
+                   outfile ? outfile : "(stdout)");
+        ERR_print_errors(bio_err);
+        goto end;
+    }
+
+    if (keyfile) {
+        if (want_pub)
+            sigkey = load_pubkey(bio_err, keyfile, keyform, 0, NULL,
+                                 e, "key file");
+        else
+            sigkey = load_key(bio_err, keyfile, keyform, 0, passin,
+                              e, "key file");
+        if (!sigkey) {
+            /*
+             * load_[pub]key() has already printed an appropriate message
+             */
+            goto end;
+        }
+    }
+
+    if (sigfile && sigkey) {
+        BIO *sigbio;
+        sigbio = BIO_new_file(sigfile, "rb");
+        siglen = EVP_PKEY_size(sigkey);
+        sigbuf = OPENSSL_malloc(siglen);
+        if (!sigbio) {
+            BIO_printf(bio_err, "Error opening signature file %s\n", sigfile);
+            ERR_print_errors(bio_err);
+            goto end;
+        }
+        siglen = BIO_read(sigbio, sigbuf, siglen);
+        BIO_free(sigbio);
+        if (siglen <= 0) {
+            BIO_printf(bio_err, "Error reading signature file %s\n", sigfile);
+            ERR_print_errors(bio_err);
+            goto end;
+        }
+    }
+
+    if (non_fips_allow) {
+        EVP_MD_CTX *md_ctx;
+        BIO_get_md_ctx(bmd, &md_ctx);
+        EVP_MD_CTX_set_flags(md_ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
+    }
+
+    if (sig_flags) {
+        EVP_MD_CTX *md_ctx;
+        BIO_get_md_ctx(bmd, &md_ctx);
+        EVP_MD_CTX_set_flags(md_ctx, sig_flags);
+    }
+
+    /* we use md as a filter, reading from 'in' */
+    if (!BIO_set_md(bmd, md)) {
+        BIO_printf(bio_err, "Error setting digest %s\n", pname);
+        ERR_print_errors(bio_err);
+        goto end;
+    }
+
+    inp = BIO_push(bmd, in);
+
+    if (argc == 0) {
+        BIO_set_fp(in, stdin, BIO_NOCLOSE);
+        err = do_fp(out, buf, inp, separator, out_bin, sigkey, sigbuf,
+                    siglen, "", "(stdin)", bmd, hmac_key, non_fips_allow);
+    } else {
+        name = OBJ_nid2sn(md->type);
+        err = 0;
+        for (i = 0; i < argc; i++) {
+            char *tmp, *tofree = NULL;
+            int r;
+
+            if (BIO_read_filename(in, argv[i]) <= 0) {
+                perror(argv[i]);
+                err++;
+                continue;
+            }
+            if (!out_bin) {
+                size_t len =
+                    strlen(name) + strlen(argv[i]) + (hmac_key ? 5 : 0) + 5;
+                tmp = tofree = OPENSSL_malloc(len);
+                BIO_snprintf(tmp, len, "%s%s(%s)= ",
+                             hmac_key ? "HMAC-" : "", name, argv[i]);
+            } else
+                tmp = "";
+            r = do_fp(out, buf, inp, separator, out_bin, sigkey, sigbuf,
+                      siglen, tmp, argv[i], bmd, hmac_key, non_fips_allow);
+            if (r)
+                err = r;
+            if (tofree)
+                OPENSSL_free(tofree);
+            (void)BIO_reset(bmd);
+        }
+    }
+ end:
+    if (buf != NULL) {
+        OPENSSL_cleanse(buf, BUFSIZE);
+        OPENSSL_free(buf);
+    }
+    if (in != NULL)
+        BIO_free(in);
+    if (passin)
+        OPENSSL_free(passin);
+    BIO_free_all(out);
+    EVP_PKEY_free(sigkey);
+    if (sigbuf)
+        OPENSSL_free(sigbuf);
+    if (bmd != NULL)
+        BIO_free(bmd);
+    apps_shutdown();
+    OPENSSL_EXIT(err);
+}

 
 int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
 
 int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,

-         EVP_PKEY *key, unsigned char *sigin, int siglen, const char *title,
-         const char *file,BIO *bmd,const char *hmac_key,int non_fips_allow)
-       {
-       unsigned int len;
-       int i;
-       EVP_MD_CTX *md_ctx;
-       HMAC_CTX hmac_ctx;
-
-       if (hmac_key)
-               {
-               EVP_MD *md;
-
-               BIO_get_md(bmd,&md);
-               HMAC_CTX_init(&hmac_ctx);
-               HMAC_Init_ex(&hmac_ctx,hmac_key,strlen(hmac_key),md, NULL);
-               BIO_get_md_ctx(bmd,&md_ctx);
-               BIO_set_md_ctx(bmd,&hmac_ctx.md_ctx);
-               }
-       for (;;)
-               {
-               i=BIO_read(bp,(char *)buf,BUFSIZE);
-               if(i < 0)
-                       {
-                       BIO_printf(bio_err, "Read Error in %s\n",file);
-                       ERR_print_errors(bio_err);
-                       return 1;
-                       }
-               if (i == 0) break;
-               }
-       if(sigin)
-               {
-               EVP_MD_CTX *ctx;
-               BIO_get_md_ctx(bp, &ctx);
-               i = EVP_VerifyFinal(ctx, sigin, (unsigned int)siglen, key); 
-               if(i > 0)
-                       BIO_printf(out, "Verified OK\n");
-               else if(i == 0)
-                       {
-                       BIO_printf(out, "Verification Failure\n");
-                       return 1;
-                       }
-               else
-                       {
-                       BIO_printf(bio_err, "Error Verifying Data\n");
-                       ERR_print_errors(bio_err);
-                       return 1;
-                       }
-               return 0;
-               }
-       if(key)
-               {
-               EVP_MD_CTX *ctx;
-               BIO_get_md_ctx(bp, &ctx);
-               if(!EVP_SignFinal(ctx, buf, (unsigned int *)&len, key)) 
-                       {
-                       BIO_printf(bio_err, "Error Signing Data\n");
-                       ERR_print_errors(bio_err);
-                       return 1;
-                       }
-               }
-       else if(hmac_key)
-               {
-               HMAC_Final(&hmac_ctx,buf,&len);
-               HMAC_CTX_cleanup(&hmac_ctx);
-               }
-       else
-               len=BIO_gets(bp,(char *)buf,BUFSIZE);
-
-       if(binout) BIO_write(out, buf, len);
-       else 
-               {
-               BIO_write(out,title,strlen(title));
-               for (i=0; i<(int)len; i++)
-                       {
-                       if (sep && (i != 0))
-                               BIO_printf(out, ":");
-                       BIO_printf(out, "%02x",buf[i]);
-                       }
-               BIO_printf(out, "\n");
-               }
-       if (hmac_key)
-               {
-               BIO_set_md_ctx(bmd,md_ctx);
-               }
-       return 0;
-       }
-
+          EVP_PKEY *key, unsigned char *sigin, int siglen, const char *title,
+          const char *file, BIO *bmd, const char *hmac_key,
+          int non_fips_allow)
+{
+    unsigned int len;
+    int i;
+    EVP_MD_CTX *md_ctx;
+    HMAC_CTX hmac_ctx;
+
+    if (hmac_key) {
+        EVP_MD *md;
+
+        BIO_get_md(bmd, &md);
+        HMAC_CTX_init(&hmac_ctx);
+        HMAC_Init_ex(&hmac_ctx, hmac_key, strlen(hmac_key), md, NULL);
+        BIO_get_md_ctx(bmd, &md_ctx);
+        BIO_set_md_ctx(bmd, &hmac_ctx.md_ctx);
+    }
+    for (;;) {
+        i = BIO_read(bp, (char *)buf, BUFSIZE);
+        if (i < 0) {
+            BIO_printf(bio_err, "Read Error in %s\n", file);
+            ERR_print_errors(bio_err);
+            return 1;
+        }
+        if (i == 0)
+            break;
+    }
+    if (sigin) {
+        EVP_MD_CTX *ctx;
+        BIO_get_md_ctx(bp, &ctx);
+        i = EVP_VerifyFinal(ctx, sigin, (unsigned int)siglen, key);
+        if (i > 0)
+            BIO_printf(out, "Verified OK\n");
+        else if (i == 0) {
+            BIO_printf(out, "Verification Failure\n");
+            return 1;
+        } else {
+            BIO_printf(bio_err, "Error Verifying Data\n");
+            ERR_print_errors(bio_err);
+            return 1;
+        }
+        return 0;
+    }
+    if (key) {
+        EVP_MD_CTX *ctx;
+        BIO_get_md_ctx(bp, &ctx);
+        if (!EVP_SignFinal(ctx, buf, (unsigned int *)&len, key)) {
+            BIO_printf(bio_err, "Error Signing Data\n");
+            ERR_print_errors(bio_err);
+            return 1;
+        }
+    } else if (hmac_key) {
+        HMAC_Final(&hmac_ctx, buf, &len);
+        HMAC_CTX_cleanup(&hmac_ctx);
+    } else
+        len = BIO_gets(bp, (char *)buf, BUFSIZE);
+
+    if (binout)
+        BIO_write(out, buf, len);
+    else {
+        BIO_write(out, title, strlen(title));
+        for (i = 0; i < (int)len; i++) {
+            if (sep && (i != 0))
+                BIO_printf(out, ":");
+            BIO_printf(out, "%02x", buf[i]);
+        }
+        BIO_printf(out, "\n");
+    }
+    if (hmac_key) {
+        BIO_set_md_ctx(bmd, md_ctx);
+    }
+    return 0;
+}