generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update NEWS file

Browse Source
This commit is contained in:
Dr. Stephen Henson 2010-01-20 17:56:34 +00:00
parent 3ec5f38b47
commit eb125795d2
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -5,9 +5,9 @@
This file gives a brief overview of the major changes between each OpenSSL This file gives a brief overview of the major changes between each OpenSSL
release. For more details please read the CHANGES file. 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 RFC3280 path validation: sufficient to process PKITS tests.
o Integrated support for PVK files and keyblobs. o Integrated support for PVK files and keyblobs.
o Change default private key format to PKCS#8. o Change default private key format to PKCS#8.

13
ssl/ssl3.h
View File

@ -128,8 +128,21 @@
extern "C" { extern "C" {
#endif #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 */ /* Signalling cipher suite value: from draft-ietf-tls-renegotiation-03.txt */
#define SSL3_CK_SCSV 0x030000FF #define SSL3_CK_SCSV 0x030000FF
>>>>>>> 1.51
#define SSL3_CK_RSA_NULL_MD5 0x03000001 #define SSL3_CK_RSA_NULL_MD5 0x03000001
#define SSL3_CK_RSA_NULL_SHA 0x03000002 #define SSL3_CK_RSA_NULL_SHA 0x03000002