diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-05-29 18:57:31 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-05-29 18:57:31 +0000 |
| commit | 43e12b6f1ce4f59aeaeacdad3f0e984efa321fb4 (patch) | |
| tree | 25384a49f36045b838585f351170c9d184befdd1 /crypto/evp/evp.h | |
| parent | 0b368578662f4ff7131352547ae110d909cf7270 (diff) | |
Add ignored FIPS options to evp.h change clashing flag value.
Diffstat (limited to 'crypto/evp/evp.h')
| -rw-r--r-- | crypto/evp/evp.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index 4eecdbeea7..8c7741932b 100644 --- a/crypto/evp/evp.h +++ b/crypto/evp/evp.h @@ -279,15 +279,23 @@ 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_NO_INIT 0x0008 /* Don't initialized md_data */ +/* FIPS and pad options are ignored in 1.0.0, definitions are here + * so we don't accidentally reuse the values for other purposes. + */ -/* MD operational flags */ +#define EVP_MD_CTX_FLAG_NON_FIPS_ALLOW 0x0008 /* Allow use of non FIPS digest + * in FIPS mode */ -#define EVP_MD_CTX_FLAG_OP_MASK 0x00f0 +/* The following PAD options are also currently ignored in 1.0.0, digest + * parameters are handled through EVP_DigestSign*() and EVP_DigestVerify*() + * instead. + */ +#define EVP_MD_CTX_FLAG_PAD_MASK 0xF0 /* RSA mode to use */ +#define EVP_MD_CTX_FLAG_PAD_PKCS1 0x00 /* PKCS#1 v1.5 mode */ +#define EVP_MD_CTX_FLAG_PAD_X931 0x10 /* X9.31 mode */ +#define EVP_MD_CTX_FLAG_PAD_PSS 0x20 /* PSS mode */ -#define EVP_MD_CTX_FLAG_OP_DIGEST 0x0000 -#define EVP_MD_CTX_FLAG_OP_SIGN 0x0010 -#define EVP_MD_CTX_FLAG_OP_VERIFY 0x0020 +#define EVP_MD_CTX_FLAG_NO_INIT 0x0100 /* Don't initialize md_data */ struct evp_cipher_st { |