diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-06-06 12:21:53 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-06-06 12:21:53 +0200 |
| commit | 29d34cdd24326b200a8fe3b4dc103cd7da0b134e (patch) | |
| tree | ffc45adb904e732b0856fe41dd6b8f8b73488cd9 /main/openssl/include | |
| parent | 476917d00cbf44411cd8168e4a6d88e7453dd408 (diff) | |
merge ccs fix
Diffstat (limited to 'main/openssl/include')
| -rw-r--r-- | main/openssl/include/openssl/ssl.h | 1 | ||||
| -rw-r--r-- | main/openssl/include/openssl/ssl3.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/main/openssl/include/openssl/ssl.h b/main/openssl/include/openssl/ssl.h index 57335a98..54b0eb6c 100644 --- a/main/openssl/include/openssl/ssl.h +++ b/main/openssl/include/openssl/ssl.h @@ -2707,6 +2707,7 @@ void ERR_load_SSL_strings(void); #define SSL_R_WRONG_VERSION_NUMBER 267 #define SSL_R_X509_LIB 268 #define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS 269 +#define SSL_R_UNEXPECTED_CCS 388 #ifdef __cplusplus } diff --git a/main/openssl/include/openssl/ssl3.h b/main/openssl/include/openssl/ssl3.h index 9086db42..f205f73d 100644 --- a/main/openssl/include/openssl/ssl3.h +++ b/main/openssl/include/openssl/ssl3.h @@ -388,6 +388,10 @@ typedef struct ssl3_buffer_st #define TLS1_FLAGS_TLS_PADDING_BUG 0x0008 #define TLS1_FLAGS_SKIP_CERT_VERIFY 0x0010 #define TLS1_FLAGS_KEEP_HANDSHAKE 0x0020 +/* SSL3_FLAGS_CCS_OK indicates that a ChangeCipherSpec record is acceptable at + * this point in the handshake. If this flag is not set then received CCS + * records will cause a fatal error for the connection. */ +#define SSL3_FLAGS_CCS_OK 0x0080 /* SSL3_FLAGS_SGC_RESTART_DONE is set when we * restart a handshake because of MS SGC and so prevents us |