diff options
author | steve <steve> | 2010-01-20 17:59:53 +0000 |
---|---|---|
committer | steve <steve> | 2010-01-20 17:59:53 +0000 |
commit | 146413c669573ea39fe5558ec8e8dfa59c38dd2f (patch) | |
tree | 3b1466c3901efbffb7494bbdaa6abe19e6f67d4f /ssl | |
parent | 85853cee0063c0875a3d03b91c1ae8698d8d78f6 (diff) | |
download | openssl-146413c669573ea39fe5558ec8e8dfa59c38dd2f.tar.gz |
oops
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/ssl3.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/ssl/ssl3.h b/ssl/ssl3.h index 9b5a9b96d..baaa89e71 100644 --- a/ssl/ssl3.h +++ b/ssl/ssl3.h @@ -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 |