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

oops

Browse Source
This commit is contained in:
Dr. Stephen Henson 2010-01-20 17:59:53 +00:00
parent eb125795d2
commit 49371e3acb
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ssl/ssl3.h
View File

@ -128,21 +128,8 @@
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