details: http://hg.nginx.org/nginx/rev/978ad80b3732
branches:
changeset: 6486:978ad80b3732
user: Maxim Dounin <mdounin@mdounin.ru>
date: Thu Mar 31 23:38:31 2016 +0300
description:
SSL: guarded error codes not present in OpenSSL 1.1.0.

diffstat:

src/event/ngx_event_openssl.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)

diffs (22 lines):

diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -1956,6 +1956,7 @@ ngx_ssl_connection_error(ngx_connection_
|| n == SSL_R_INAPPROPRIATE_FALLBACK /* 373 */
#endif
|| n == 1000 /* SSL_R_SSLV3_ALERT_CLOSE_NOTIFY */
+#ifdef SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE
|| n == SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE /* 1010 */
|| n == SSL_R_SSLV3_ALERT_BAD_RECORD_MAC /* 1020 */
|| n == SSL_R_TLSV1_ALERT_DECRYPTION_FAILED /* 1021 */
@@ -1978,7 +1979,9 @@ ngx_ssl_connection_error(ngx_connection_
|| n == SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY /* 1071 */
|| n == SSL_R_TLSV1_ALERT_INTERNAL_ERROR /* 1080 */
|| n == SSL_R_TLSV1_ALERT_USER_CANCELLED /* 1090 */
- || n == SSL_R_TLSV1_ALERT_NO_RENEGOTIATION) /* 1100 */
+ || n == SSL_R_TLSV1_ALERT_NO_RENEGOTIATION /* 1100 */
+#endif
+ )
{
switch (c->log_error) {


_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel