From: Bodo Möller <bodo@openssl.org>
Date: Sat, 7 Jan 2006 20:28:11 +0000 (+0000)
Subject: complete and correct RFC3546 error codes
X-Git-Tag: OpenSSL_0_9_8k^2~1604
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3ff94a009b8dcf948d8f1afb2f0220a50378b71f;p=oweals%2Fopenssl.git

complete and correct RFC3546 error codes
---

diff --git a/ssl/ssl.h b/ssl/ssl.h
index 5d4e3ceb49..c5581e078c 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1140,7 +1140,11 @@ size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count);
 #define SSL_AD_INTERNAL_ERROR		TLS1_AD_INTERNAL_ERROR	/* fatal */
 #define SSL_AD_USER_CANCELLED		TLS1_AD_USER_CANCELLED
 #define SSL_AD_NO_RENEGOTIATION		TLS1_AD_NO_RENEGOTIATION
+#define SSL_AD_UNSUPPORTED_EXTENSION	TLS1_AD_UNSUPPORTED_EXTENSION
+#define SSL_AD_CERTIFICATE_UNOBTAINABLE TLS1_AD_CERTIFICATE_UNOBTAINABLE
 #define SSL_AD_UNRECOGNIZED_NAME	TLS1_AD_UNRECOGNIZED_NAME
+#define SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE
+#define SSL_AD_BAD_CERTIFICATE_HASH_VALUE TLS1_AD_BAD_CERTIFICATE_HASH_VALUE
 
 #define SSL_ERROR_NONE			0
 #define SSL_ERROR_SSL			1
diff --git a/ssl/tls1.h b/ssl/tls1.h
index 274866f493..532852d3e8 100644
--- a/ssl/tls1.h
+++ b/ssl/tls1.h
@@ -149,7 +149,12 @@ extern "C" {
 #define TLS1_AD_INTERNAL_ERROR		80	/* fatal */
 #define TLS1_AD_USER_CANCELLED		90
 #define TLS1_AD_NO_RENEGOTIATION	100
-#define TLS1_AD_UNRECOGNIZED_NAME 	122
+/* codes 110-114 are from RFC3546 */
+#define TLS1_AD_UNSUPPORTED_EXTENSION	110
+#define TLS1_AD_CERTIFICATE_UNOBTAINABLE 111
+#define TLS1_AD_UNRECOGNIZED_NAME 	112
+#define TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE 113
+#define TLS1_AD_BAD_CERTIFICATE_HASH_VALUE 114
 
 /* ExtensionType values from RFC 3546 */
 #define TLSEXT_TYPE_server_name			0