Merge remote-tracking branch 'agl/1.0.2alpn' into agl-alpn

[oweals/openssl.git] / apps / dgst.c

diff --git a/apps/dgst.c b/apps/dgst.c
index 59814908c106fe13c980d4db0ec03f373ef6c551..81bd870f991a5f2c2622140a6a125c98bc0d7385 100644 (file)
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -127,7 +127,8 @@ int MAIN(int argc, char **argv)
 #endif
        char *hmac_key=NULL;
        char *mac_name=NULL;
-       STACK_OF(STRING) *sigopts = NULL, *macopts = NULL;
+       int non_fips_allow = 0;
+       STACK_OF(OPENSSL_STRING) *sigopts = NULL, *macopts = NULL;
 
        apps_startup();
 
@@ -155,6 +156,8 @@ int MAIN(int argc, char **argv)
                if ((*argv)[0] != '-') break;
                if (strcmp(*argv,"-c") == 0)
                        separator=1;
+               else if (strcmp(*argv,"-r") == 0)
+                       separator=2;
                else if (strcmp(*argv,"-rand") == 0)
                        {
                        if (--argc < 1) break;
@@ -213,6 +216,10 @@ int MAIN(int argc, char **argv)
                        out_bin = 1;
                else if (strcmp(*argv,"-d") == 0)
                        debug=1;
+               else if (!strcmp(*argv,"-fips-fingerprint"))
+                       hmac_key = "etaonrishdlcupfm";
+               else if (strcmp(*argv,"-non-fips-allow") == 0)
+                       non_fips_allow=1;
                else if (!strcmp(*argv,"-hmac"))
                        {
                        if (--argc < 1)
@@ -230,8 +237,8 @@ int MAIN(int argc, char **argv)
                        if (--argc < 1)
                                break;
                        if (!sigopts)
-                               sigopts = sk_STRING_new_null();
-                       if (!sigopts || !sk_STRING_push(sigopts, *(++argv)))
+                               sigopts = sk_OPENSSL_STRING_new_null();
+                       if (!sigopts || !sk_OPENSSL_STRING_push(sigopts, *(++argv)))
                                break;
                        }
                else if (strcmp(*argv,"-macopt") == 0)
@@ -239,8 +246,8 @@ int MAIN(int argc, char **argv)
                        if (--argc < 1)
                                break;
                        if (!macopts)
-                               macopts = sk_STRING_new_null();
-                       if (!macopts || !sk_STRING_push(macopts, *(++argv)))
+                               macopts = sk_OPENSSL_STRING_new_null();
+                       if (!macopts || !sk_OPENSSL_STRING_push(macopts, *(++argv)))
                                break;
                        }
                else if ((m=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
@@ -262,6 +269,7 @@ int MAIN(int argc, char **argv)
                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,"-r              to output the digest in coreutils format\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");
@@ -365,9 +373,9 @@ int MAIN(int argc, char **argv)
                if (macopts)
                        {
                        char *macopt;
-                       for (i = 0; i < sk_STRING_num(macopts); i++)
+                       for (i = 0; i < sk_OPENSSL_STRING_num(macopts); i++)
                                {
-                               macopt = sk_STRING_value(macopts, i);
+                               macopt = sk_OPENSSL_STRING_value(macopts, i);
                                if (pkey_ctrl_string(mac_ctx, macopt) <= 0)
                                        {
                                        BIO_printf(bio_err,
@@ -392,6 +400,13 @@ int MAIN(int argc, char **argv)
                        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 (hmac_key)
                {
                sigkey = EVP_PKEY_new_mac_key(EVP_PKEY_HMAC, e,
@@ -424,9 +439,9 @@ int MAIN(int argc, char **argv)
                if (sigopts)
                        {
                        char *sigopt;
-                       for (i = 0; i < sk_STRING_num(sigopts); i++)
+                       for (i = 0; i < sk_OPENSSL_STRING_num(sigopts); i++)
                                {
-                               sigopt = sk_STRING_value(sigopts, i);
+                               sigopt = sk_OPENSSL_STRING_value(sigopts, i);
                                if (pkey_ctrl_string(pctx, sigopt) <= 0)
                                        {
                                        BIO_printf(bio_err,
@@ -531,9 +546,9 @@ end:
        BIO_free_all(out);
        EVP_PKEY_free(sigkey);
        if (sigopts)
-               sk_STRING_free(sigopts);
+               sk_OPENSSL_STRING_free(sigopts);
        if (macopts)
-               sk_STRING_free(macopts);
+               sk_OPENSSL_STRING_free(macopts);
        if(sigbuf) OPENSSL_free(sigbuf);
        if (bmd != NULL) BIO_free(bmd);
        apps_shutdown();
@@ -594,7 +609,7 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
        else
                {
                len=BIO_gets(bp,(char *)buf,BUFSIZE);
-               if (len <0) 
+               if ((int)len <0)
                        {
                        ERR_print_errors(bio_err);
                        return 1;
@@ -602,6 +617,12 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
                }
 
        if(binout) BIO_write(out, buf, len);
+       else if (sep == 2)
+               {
+               for (i=0; i<(int)len; i++)
+                       BIO_printf(out, "%02x",buf[i]);
+               BIO_printf(out, " *%s\n", file);
+               }
        else 
                {
                if (sig_name)