update NEWS file

diff --git a/NEWS b/NEWS
index d5f8a5ae784990704cb2f8fb61251069de02031c..9d0d563d2d5a40eac36ab9b3517a2c4fc604cdb9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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.

diff --git a/ssl/ssl3.h b/ssl/ssl3.h
index baaa89e717073dff29eb0b0c123358f54104435c..9b5a9b96d58cffec75e04b0494a3dcfea3e7321d 100644 (file)
--- a/ssl/ssl3.h
+++ b/ssl/ssl3.h
@@ -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