summaryrefslogtreecommitdiffstats
path: root/ssl/ssl.h
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-12-31 14:13:30 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-12-31 14:13:30 +0000
commite6f418bcb7344fe40b78c82722577ee1910400f9 (patch)
treedaa71f88c4c547d54122f6377b81e789d0780b27 /ssl/ssl.h
parent5e6312175858a6cd92b3ec372ed6903abb6fdd78 (diff)
Compression handling on session resume was badly broken: it always
used compression algorithms in client hello (a legacy from when the compression algorithm wasn't serialized with SSL_SESSION).
Diffstat (limited to 'ssl/ssl.h')
-rw-r--r--ssl/ssl.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/ssl/ssl.h b/ssl/ssl.h
index 3c3ab46efd..d6c254e48e 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -2105,8 +2105,10 @@ void ERR_load_SSL_strings(void);
#define SSL_R_HTTPS_PROXY_REQUEST 155
#define SSL_R_HTTP_REQUEST 156
#define SSL_R_ILLEGAL_PADDING 283
+#define SSL_R_INCONSISTENT_COMPRESSION 340
#define SSL_R_INVALID_CHALLENGE_LENGTH 158
#define SSL_R_INVALID_COMMAND 280
+#define SSL_R_INVALID_COMPRESSION_ALGORITHM 341
#define SSL_R_INVALID_PURPOSE 278
#define SSL_R_INVALID_STATUS_RESPONSE 328
#define SSL_R_INVALID_TICKET_KEYS_LENGTH 325
@@ -2199,6 +2201,7 @@ void ERR_load_SSL_strings(void);
#define SSL_R_RENEGOTIATION_ENCODING_ERR 336
#define SSL_R_RENEGOTIATION_MISMATCH 337
#define SSL_R_REQUIRED_CIPHER_MISSING 215
+#define SSL_R_REQUIRED_COMPRESSSION_ALGORITHM_MISSING 342
#define SSL_R_REUSE_CERT_LENGTH_NOT_ZERO 216
#define SSL_R_REUSE_CERT_TYPE_NOT_ZERO 217
#define SSL_R_REUSE_CIPHER_LIST_NOT_ZERO 218