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

Remove hard coded ecdsaWithSHA1 hack in ssl routines and check for RSA 

using OBJ xref utilities instead of string comparison with OID name.

This removes the arbitrary restriction on using SHA1 only with some ECC
ciphersuites.
parent 165c20c2

CHANGES

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


 Changes between 1.0.0d and 1.0.0e [xx XXX xxxx]



  *) Remove hard coded ecdsaWithSHA1 signature tests in ssl code and check

     signature public key algorithm by using OID xref utilities instead.

     Before this you could only use some ECC ciphersuites with SHA1 only.

     [Steve Henson]



  *) Add protection against ECDSA timing attacks as mentioned in the paper

     by Billy Bob Brumley and Nicola Tuveri, see:

crypto/Makefile

+14 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ ex_data.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h 
ex_data.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h

ex_data.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h

ex_data.o: ex_data.c

fips_ers.o: ../include/openssl/opensslconf.h fips_ers.c

mem.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h

mem.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h

mem.o: ../include/openssl/err.h ../include/openssl/lhash.h
@@ -194,6 +195,19 @@ mem_dbg.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h 
mem_dbg.o: mem_dbg.c

o_dir.o: ../e_os.h ../include/openssl/e_os2.h ../include/openssl/opensslconf.h

o_dir.o: LPdir_unix.c o_dir.c o_dir.h

o_fips.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h

o_fips.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h

o_fips.o: ../include/openssl/err.h ../include/openssl/lhash.h

o_fips.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h

o_fips.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h

o_fips.o: ../include/openssl/stack.h ../include/openssl/symhacks.h cryptlib.h

o_fips.o: o_fips.c

o_init.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/crypto.h

o_init.o: ../include/openssl/e_os2.h ../include/openssl/err.h

o_init.o: ../include/openssl/lhash.h ../include/openssl/opensslconf.h

o_init.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h

o_init.o: ../include/openssl/safestack.h ../include/openssl/stack.h

o_init.o: ../include/openssl/symhacks.h o_init.c

o_str.o: ../e_os.h ../include/openssl/e_os2.h ../include/openssl/opensslconf.h

o_str.o: o_str.c o_str.h

o_time.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h o_time.c

crypto/aes/Makefile

+5 −3
Original line number Diff line number Diff line
@@ -121,9 +121,11 @@ aes_ige.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h 
aes_ige.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

aes_ige.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

aes_ige.o: ../../include/openssl/symhacks.h ../cryptlib.h aes_ige.c aes_locl.h

aes_misc.o: ../../include/openssl/aes.h ../../include/openssl/e_os2.h

aes_misc.o: ../../include/openssl/opensslconf.h

aes_misc.o: ../../include/openssl/opensslv.h aes_locl.h aes_misc.c

aes_misc.o: ../../include/openssl/aes.h ../../include/openssl/crypto.h

aes_misc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h

aes_misc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

aes_misc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

aes_misc.o: ../../include/openssl/symhacks.h aes_locl.h aes_misc.c

aes_ofb.o: ../../include/openssl/aes.h ../../include/openssl/modes.h

aes_ofb.o: ../../include/openssl/opensslconf.h aes_ofb.c

aes_wrap.o: ../../e_os.h ../../include/openssl/aes.h

crypto/bf/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -94,5 +94,8 @@ bf_enc.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h 
bf_enc.o: ../../include/openssl/opensslconf.h bf_enc.c bf_locl.h

bf_ofb64.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h

bf_ofb64.o: ../../include/openssl/opensslconf.h bf_locl.h bf_ofb64.c

bf_skey.o: ../../include/openssl/blowfish.h ../../include/openssl/e_os2.h

bf_skey.o: ../../include/openssl/opensslconf.h bf_locl.h bf_pi.h bf_skey.c
 
bf_skey.o: ../../include/openssl/blowfish.h ../../include/openssl/crypto.h

bf_skey.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h

bf_skey.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

bf_skey.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

bf_skey.o: ../../include/openssl/symhacks.h bf_locl.h bf_pi.h bf_skey.c

crypto/camellia/Makefile

+10 −3
Original line number Diff line number Diff line
@@ -96,8 +96,15 @@ cmll_ctr.o: ../../include/openssl/camellia.h ../../include/openssl/modes.h 
cmll_ctr.o: ../../include/openssl/opensslconf.h cmll_ctr.c

cmll_ecb.o: ../../include/openssl/camellia.h

cmll_ecb.o: ../../include/openssl/opensslconf.h cmll_ecb.c cmll_locl.h

cmll_misc.o: ../../include/openssl/camellia.h

cmll_misc.o: ../../include/openssl/opensslconf.h

cmll_misc.o: ../../include/openssl/opensslv.h cmll_locl.h cmll_misc.c

cmll_misc.o: ../../include/openssl/camellia.h ../../include/openssl/crypto.h

cmll_misc.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h

cmll_misc.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

cmll_misc.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

cmll_misc.o: ../../include/openssl/symhacks.h cmll_locl.h cmll_misc.c

cmll_ofb.o: ../../include/openssl/camellia.h ../../include/openssl/modes.h

cmll_ofb.o: ../../include/openssl/opensslconf.h cmll_ofb.c

cmll_utl.o: ../../include/openssl/camellia.h ../../include/openssl/crypto.h

cmll_utl.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h

cmll_utl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

cmll_utl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

cmll_utl.o: ../../include/openssl/symhacks.h cmll_locl.h cmll_utl.c