diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-01-26 15:37:41 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-01-26 15:37:41 +0000 |
| commit | c553721e8ba2a79c9ee14bf17814271ce1f33d9e (patch) | |
| tree | 88e6aee60d78b8c534ea559f1106dddaa4229e4c /crypto/rsa/rsa_pss.c | |
| parent | 1588a3cae72e60071f1f8a89dbd1356bc08581fc (diff) | |
FIPS mode RSA changes:
Check for selftest failures.
Pairwise consistency test for RSA key generation.
Use some EVP macros instead of EVP functions.
Use minimal FIPS EVP where needed.
Diffstat (limited to 'crypto/rsa/rsa_pss.c')
| -rw-r--r-- | crypto/rsa/rsa_pss.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crypto/rsa/rsa_pss.c b/crypto/rsa/rsa_pss.c index 4f87a2939d..794de9dff6 100644 --- a/crypto/rsa/rsa_pss.c +++ b/crypto/rsa/rsa_pss.c @@ -56,6 +56,8 @@ * */ +#define OPENSSL_FIPSEVP + #include <stdio.h> #include "cryptlib.h" #include <openssl/bn.h> @@ -93,7 +95,7 @@ int RSA_verify_PKCS1_PSS_mgf1(RSA *rsa, const unsigned char *mHash, if (mgf1Hash == NULL) mgf1Hash = Hash; - hLen = EVP_MD_size(Hash); + hLen = M_EVP_MD_size(Hash); if (hLen < 0) goto err; /* @@ -166,7 +168,7 @@ int RSA_verify_PKCS1_PSS_mgf1(RSA *rsa, const unsigned char *mHash, if (!EVP_DigestUpdate(&ctx, DB + i, maskedDBLen - i)) goto err; } - if (!EVP_DigestFinal(&ctx, H_, NULL)) + if (!EVP_DigestFinal_ex(&ctx, H_, NULL)) goto err; if (memcmp(H_, H, hLen)) { @@ -205,7 +207,7 @@ int RSA_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM, if (mgf1Hash == NULL) mgf1Hash = Hash; - hLen = EVP_MD_size(Hash); + hLen = M_EVP_MD_size(Hash); if (hLen < 0) goto err; /* @@ -260,7 +262,7 @@ int RSA_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM, goto err; if (sLen && !EVP_DigestUpdate(&ctx, salt, sLen)) goto err; - if (!EVP_DigestFinal(&ctx, H, NULL)) + if (!EVP_DigestFinal_ex(&ctx, H, NULL)) goto err; EVP_MD_CTX_cleanup(&ctx); |