Commit ff03c6bc authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add tiny ASN1 code for DSA signatures. 

Make DSA tests, selftests and algorithm tests use EVP.
parent 82c8b6b7

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ 


 Changes between 0.9.8e and 0.9.8f-fips  [xx XXX xxxx]



  *) Add small standalone ASN1 encoder/decoder to handle DSA signature format.

     Modify test, algorithm test and selftest routines to use EVP for DSA.

     Move FIPS implementation of EVP_sha*() and EVP_dss1() under fips-1.0.

     [Steve Henson]



  *) Modify VC++ build system to rename .text and .rdata segments in

     FIPS sources to .fipst${a,b,c}, and $fipsr${a,b,c} and place them

     in a static library fipscanister.lib using a perl script. These are

Makefile.org

+0 −1
Original line number Diff line number Diff line
@@ -298,7 +298,6 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cbc.o \ 
	../crypto/dsa/dsa_vrf.o \

	../crypto/err/err.o \

	../crypto/evp/digest.o \

	../crypto/evp/m_sha1.o \

	../crypto/evp/p_sign.o \

	../crypto/evp/p_verify.o \

	../crypto/mem_clr.o \

crypto/dsa/dsa.h

+5 −0
Original line number Diff line number Diff line
@@ -265,6 +265,11 @@ int DSA_print_fp(FILE *bp, const DSA *x, int off); 
DH *DSA_dup_DH(const DSA *r);

#endif



#ifdef OPENSSL_FIPS

int FIPS_dsa_sig_encode(unsigned char *out, DSA_SIG *sig);

int FIPS_dsa_sig_decode(DSA_SIG *sig, const unsigned char *in, int inlen);

#endif



/* BEGIN ERROR CODES */

/* The following lines are auto generated by the script mkerr.pl. Any changes

 * made after this point may be overwritten when the script is next run.

crypto/dsa/dsa_asn1.c

+1 −0
Original line number Diff line number Diff line
@@ -196,3 +196,4 @@ err: 
	DSA_SIG_free(s);

	return(ret);

	}

crypto/evp/m_dss1.c

+4 −1
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ 
#include <openssl/dsa.h>

#endif



#ifndef OPENSSL_FIPS



static int init(EVP_MD_CTX *ctx)

	{ return SHA1_Init(ctx->md_data); }
@@ -82,7 +84,7 @@ static const EVP_MD dss1_md= 
	NID_dsa,

	NID_dsaWithSHA1,

	SHA_DIGEST_LENGTH,

	EVP_MD_FLAG_FIPS,

	0,

	init,

	update,

	final,
@@ -98,3 +100,4 @@ const EVP_MD *EVP_dss1(void) 
	return(&dss1_md);

	}

#endif

#endif