Changeset 811 for openssl/trunk/apps/dgst.c

Timestamp:

Aug 7, 2014, 9:32:43 PM (11 years ago)

Author:

dmik

Message:

openssl: Merge version 1.0.1i from vendor to trunk.

Location:

openssl/trunk

Files:

• . (modified) (1 prop)
• apps/dgst.c (modified) (3 diffs)

openssl/trunk/apps/dgst.c ¶

@@ -128 +128 @@
         char *hmac_key=NULL;
         char *mac_name=NULL;
+        int non_fips_allow = 0;
         STACK_OF(OPENSSL_STRING) *sigopts = NULL, *macopts = NULL;
 
@@ -216 +217 @@
                 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"))
                         {
@@ -396 +401 @@
                 }
 
+        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)
                 {