Add DSA and ECDSA "clone digests" to module for compatibility with old

applications.

diff --git a/Makefile.fips b/Makefile.fips
index 61a644222e97fbbd75eccd9fad43d0607f925080..5d0aca0a3e513bb8d010bf63b6343853346c82d7 100644 (file)
--- a/Makefile.fips
+++ b/Makefile.fips
@@ -330,6 +330,9 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/evp/e_aes.o \
        ../crypto/evp/e_des3.o \
        ../crypto/evp/m_sha1.o \
+       ../crypto/evp/m_dss1.o \
+       ../crypto/evp/m_dss.o \
+       ../crypto/evp/m_ecdsa.o \
        ../crypto/hmac/hmac.o \
        ../crypto/modes/cbc128.o \
        ../crypto/modes/ccm128.o \

diff --git a/Makefile.org b/Makefile.org
index 716cccac43ccc2ef0cf03f5a175be8ef6b8fa95a..21a7a3751e17e34427b4538eaa58e6b10ee61ad0 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -323,6 +323,9 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/evp/e_aes.o \
        ../crypto/evp/e_des3.o \
        ../crypto/evp/m_sha1.o \
+       ../crypto/evp/m_dss1.o \
+       ../crypto/evp/m_dss.o \
+       ../crypto/evp/m_ecdsa.o \
        ../crypto/hmac/hmac.o \
        ../crypto/modes/cbc128.o \
        ../crypto/modes/ccm128.o \

diff --git a/crypto/evp/m_dss.c b/crypto/evp/m_dss.c
index 48c2689504821fdeeaef5f3f0b06118eab40725e..ca95d2911647fea3ed53f7406a9a21e7d87680ab 100644 (file)
--- a/crypto/evp/m_dss.c
+++ b/crypto/evp/m_dss.c
@@ -81,13 +81,13 @@ static const EVP_MD dsa_md=
        NID_dsaWithSHA,
        NID_dsaWithSHA,
        SHA_DIGEST_LENGTH,
-       EVP_MD_FLAG_PKEY_DIGEST,
+       EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_PKEY_DIGEST|EVP_MD_FLAG_FIPS,
        init,
        update,
        final,
        NULL,
        NULL,
-       EVP_PKEY_DSA_method,
+       EVP_PKEY_NULL_method,
        SHA_CBLOCK,
        sizeof(EVP_MD *)+sizeof(SHA_CTX),
        };

diff --git a/crypto/evp/m_dss1.c b/crypto/evp/m_dss1.c
index 4f03fb70e0263e84566c24d333ddd06b7cee71ce..54a0faba5e5c416a9eda00d9f9b926662817b0fc 100644 (file)
--- a/crypto/evp/m_dss1.c
+++ b/crypto/evp/m_dss1.c
@@ -82,13 +82,13 @@ static const EVP_MD dss1_md=
        NID_dsa,
        NID_dsaWithSHA1,
        SHA_DIGEST_LENGTH,
-       EVP_MD_FLAG_PKEY_DIGEST,
+       EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_PKEY_DIGEST|EVP_MD_FLAG_FIPS,
        init,
        update,
        final,
        NULL,
        NULL,
-       EVP_PKEY_DSA_method,
+       EVP_PKEY_NULL_method,
        SHA_CBLOCK,
        sizeof(EVP_MD *)+sizeof(SHA_CTX),
        };

diff --git a/crypto/evp/m_ecdsa.c b/crypto/evp/m_ecdsa.c
index 8d87a49ebe9af85ca213f8f3ff67fb6b31d2407c..c1fd691f5cb21890b9d23a66e87b4df986069e2f 100644 (file)
--- a/crypto/evp/m_ecdsa.c
+++ b/crypto/evp/m_ecdsa.c
@@ -130,13 +130,13 @@ static const EVP_MD ecdsa_md=
        NID_ecdsa_with_SHA1,
        NID_ecdsa_with_SHA1,
        SHA_DIGEST_LENGTH,
-       EVP_MD_FLAG_PKEY_DIGEST,
+       EVP_MD_FLAG_PKEY_METHOD_SIGNATURE|EVP_MD_FLAG_PKEY_DIGEST|EVP_MD_FLAG_FIPS,
        init,
        update,
        final,
        NULL,
        NULL,
-       EVP_PKEY_ECDSA_method,
+       EVP_PKEY_NULL_method,
        SHA_CBLOCK,
        sizeof(EVP_MD *)+sizeof(SHA_CTX),
        };

diff --git a/fips/fipssyms.h b/fips/fipssyms.h
index 2748746071870e0108075d1e6f187eb7a7e91c3c..bdbc2faab99ff9cb590ff26422d916be27813b57 100644 (file)
--- a/fips/fipssyms.h
+++ b/fips/fipssyms.h
@@ -343,6 +343,9 @@
 #define EVP_des_ede_ecb FIPS_evp_des_ede_ecb
 #define EVP_des_ede_ofb FIPS_evp_des_ede_ofb
 #define EVP_sha1 FIPS_evp_sha1
+#define EVP_dss FIPS_evp_dss
+#define EVP_dss1 FIPS_evp_dss1
+#define EVP_ecdsa FIPS_evp_ecdsa
 #define EVP_sha224 FIPS_evp_sha224
 #define EVP_sha256 FIPS_evp_sha256
 #define EVP_sha384 FIPS_evp_sha384