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

update NEWS file

parent 3ec5f38b

NEWS

+2 −2
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ 
  This file gives a brief overview of the major changes between each OpenSSL

  release. For more details please read the CHANGES file.



  Major changes between OpenSSL 0.9.8k and OpenSSL 1.0:



  Major changes between OpenSSL 0.9.8l and OpenSSL 1.0:



      o Support for draft-ietf-tls-renegotiation-03.txt

      o RFC3280 path validation: sufficient to process PKITS tests.

      o Integrated support for PVK files and keyblobs.

      o Change default private key format to PKCS#8.

ssl/ssl3.h

+13 −0
Original line number Diff line number Diff line
@@ -128,8 +128,21 @@ 
extern "C" {

#endif



<<<<<<< ssl3.h

/* Magic Cipher Suite Value. NB: bogus value used for testing */

<<<<<<< ssl3.h

#ifndef SSL3_CK_MCSV

#define SSL3_CK_MCSV				0x03000FEC

#endif

=======

#ifndef SSL3_CK_SCSV

#define SSL3_CK_SCSV				0x03000FEC

#endif

>>>>>>> 1.50

=======

/* Signalling cipher suite value: from draft-ietf-tls-renegotiation-03.txt */

#define SSL3_CK_SCSV				0x030000FF

>>>>>>> 1.51



#define SSL3_CK_RSA_NULL_MD5			0x03000001

#define SSL3_CK_RSA_NULL_SHA			0x03000002