summaryrefslogtreecommitdiffstats
path: root/crypto/evp
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2008-06-16 16:56:43 +0000
committerDr. Stephen Henson <steve@openssl.org>2008-06-16 16:56:43 +0000
commit14748adb096f124d4101578afed8d26da4f15f53 (patch)
treed03ebb869552073f10d40b14910c9ab0b6a93af6 /crypto/evp
parentff2ab9e6bbca8d9eed37dda647e8a37254ef2107 (diff)
Make ssl code consistent with FIPS branch. The new code has no effect
at present because it asserts either noop flags or is inside OPENSSL_FIPS #ifdef's.
Diffstat (limited to 'crypto/evp')
-rw-r--r--crypto/evp/evp.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index bdd3b7ecaa..09e621bebe 100644
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -303,6 +303,8 @@ struct env_md_ctx_st
* cleaned */
#define EVP_MD_CTX_FLAG_REUSE 0x0004 /* Don't free up ctx->md_data
* in EVP_MD_CTX_cleanup */
+#define EVP_MD_CTX_FLAG_NON_FIPS_ALLOW 0x0008 /* Allow use of non FIPS digest
+ * in FIPS mode */
struct evp_cipher_st
{