complete and correct RFC3546 error codes

3ff94a00 · Bodo Möller · 1aeb3da8 · 3ff94a00 · 3ff94a00
隐藏空白更改
内联并排

Showing with 10 addition and 1 deletion

ssl/ssl.h ssl/ssl.h +4 -0

ssl/tls1.h ssl/tls1.h +6 -1

未找到文件。
--- 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

--- 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