summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_err.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2003-10-06 11:00:15 +0000
committerRichard Levitte <levitte@openssl.org>2003-10-06 11:00:15 +0000
commit8242354952ead170335b98b33254ca9a0e836926 (patch)
tree0a87cad1acecb32f22dd045d240154c1cfcb4b42 /ssl/ssl_err.c
parentc40b9bdefb59be7e640cd7a10bfd2fa26ea1fe7b (diff)
Make sure int SSL_COMP_add_compression_method() checks if a certain
compression identity is already present among the registered compression methods, and if so, reject the addition request. Declare SSL_COMP_get_compression_method() so it can be used properly. Change ssltest.c so it checks what compression methods are available and enumerates them. As a side-effect, built-in compression methods will be automagically loaded that way. Additionally, change the identities for ZLIB and RLE to be conformant to draft-ietf-tls-compression-05.txt. Finally, make update. Next on my list: have the built-in compression methods added "automatically" instead of requiring that the author call SSL_COMP_add_compression_method() or SSL_COMP_get_compression_methods().
Diffstat (limited to 'ssl/ssl_err.c')
-rw-r--r--ssl/ssl_err.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index b9a50b8e63..359ea45b94 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -1,6 +1,6 @@
/* ssl/ssl_err.c */
/* ====================================================================
- * Copyright (c) 1999-2002 The OpenSSL Project. All rights reserved.
+ * Copyright (c) 1999-2003 The OpenSSL Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -271,6 +271,7 @@ static ERR_STRING_DATA SSL_str_reasons[]=
{SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC,"decryption failed or bad record mac"},
{SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG ,"dh public value length is wrong"},
{SSL_R_DIGEST_CHECK_FAILED ,"digest check failed"},
+{SSL_R_DUPLICATE_COMPRESSION_ID ,"duplicate compression id"},
{SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER ,"ecgroup too large for cipher"},
{SSL_R_ENCRYPTED_LENGTH_TOO_LONG ,"encrypted length too long"},
{SSL_R_ERROR_GENERATING_TMP_RSA_KEY ,"error generating tmp rsa key"},