diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2010-01-20 17:56:34 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2010-01-20 17:56:34 +0000 |
| commit | eb125795d247ca2885fbb57c79a8f6d9129616fe (patch) | |
| tree | b6a86fb25844847bdcea40a90f9db6667da09e5f /ssl | |
| parent | 3ec5f38b47e425e757e87dbd5ba2725754346eb5 (diff) | |
| download | openssl-eb125795d247ca2885fbb57c79a8f6d9129616fe.zip openssl-eb125795d247ca2885fbb57c79a8f6d9129616fe.tar.gz openssl-eb125795d247ca2885fbb57c79a8f6d9129616fe.tar.bz2 | |
update NEWS file
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl3.h | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -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 |