Commit 4997138a authored by Ben Laurie's avatar Ben Laurie
Browse files

Fix DES export ciphersuites.

parent 95dc05bc

CHANGES

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


 Changes between 0.9.2b and 0.9.3



  *) Fix new 56-bit DES export ciphersuites: they were using 7 bytes instead of

     8 of keying material. Merlin has also confirmed interop with this fix

     between OpenSSL and Baltimore C/SSL 2.0 and J/SSL 2.0.

     [Merlin Hughes <merlin@baltimore.ie>]



  *) Fix lots of warnings.

     [Richard Levitte <levitte@stacken.kth.se>]

ssl/ssl_locl.h

+2 −1
Original line number Diff line number Diff line
@@ -201,7 +201,8 @@ 
#define SSL_C_IS_EXPORT(c)	SSL_IS_EXPORT((c)->algorithms)

#define SSL_C_IS_EXPORT56(c)	SSL_IS_EXPORT56((c)->algorithms)

#define SSL_C_IS_EXPORT40(c)	SSL_IS_EXPORT40((c)->algorithms)

#define SSL_EXPORT_KEYLENGTH(a)	(SSL_IS_EXPORT40(a) ? 5 : 7)

#define SSL_EXPORT_KEYLENGTH(a)	(SSL_IS_EXPORT40(a) ? 5 : \

				 ((a)&SSL_ENC_MASK) == SSL_DES ? 8 : 7)

#define SSL_EXPORT_PKEYLENGTH(a) (SSL_IS_EXPORT40(a) ? 512 : 1024)

#define SSL_C_EXPORT_KEYLENGTH(c)	SSL_EXPORT_KEYLENGTH((c)->algorithms)

#define SSL_C_EXPORT_PKEYLENGTH(c)	SSL_EXPORT_PKEYLENGTH((c)->algorithms)