Add DSA and ECDSA "clone digests" to module for compatibility with old
authorDr. Stephen Henson <steve@openssl.org>
Wed, 1 Jun 2011 14:07:32 +0000 (14:07 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Wed, 1 Jun 2011 14:07:32 +0000 (14:07 +0000)
applications.

Makefile.fips
Makefile.org
crypto/evp/m_dss.c
crypto/evp/m_dss1.c
crypto/evp/m_ecdsa.c
fips/fipssyms.h

index 61a6442..5d0aca0 100644 (file)
@@ -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 \
index 716ccca..21a7a37 100644 (file)
@@ -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 \
index 48c2689..ca95d29 100644 (file)
@@ -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),
        };
index 4f03fb7..54a0fab 100644 (file)
@@ -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),
        };
index 8d87a49..c1fd691 100644 (file)
@@ -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),
        };
index 2748746..bdbc2fa 100644 (file)
 #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