diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2010-01-20 17:59:53 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2010-01-20 17:59:53 +0000 |
| commit | 49371e3acb5b1c9a1c50017a5d6fdf99728e7ddd (patch) | |
| tree | 76825cb72ae743bf3a06657675c3af8e1cc1e1ec /ssl | |
| parent | eb125795d247ca2885fbb57c79a8f6d9129616fe (diff) | |
| download | openssl-49371e3acb5b1c9a1c50017a5d6fdf99728e7ddd.zip openssl-49371e3acb5b1c9a1c50017a5d6fdf99728e7ddd.tar.gz openssl-49371e3acb5b1c9a1c50017a5d6fdf99728e7ddd.tar.bz2 | |
oops
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl3.h | 13 |
1 files changed, 0 insertions, 13 deletions
@@ -128,21 +128,8 @@ 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 |