[PATCH] SSL: guard use of SSL_R_BLOCK_CIPHER_PAD_IS_WRONG

Piotr Sikora piotrsikora at google.com
Sat Nov 7 02:43:24 UTC 2015


# HG changeset patch
# User Piotr Sikora <piotrsikora at google.com>
# Date 1446864006 28800
#      Fri Nov 06 18:40:06 2015 -0800
# Node ID 8aef9afa46e31a112fa1ceaffaefbc5990dbde22
# Parent  bfd17e00b5cf13df79c4212a1fca6a1bedd66168
SSL: guard use of SSL_R_BLOCK_CIPHER_PAD_IS_WRONG.

This error was removed from BoringSSL.

Signed-off-by: Piotr Sikora <piotrsikora at google.com>

diff -r bfd17e00b5cf -r 8aef9afa46e3 src/event/ngx_event_openssl.c
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -1909,7 +1909,9 @@ ngx_ssl_connection_error(ngx_connection_
 
             /* handshake failures */
         if (n == SSL_R_BAD_CHANGE_CIPHER_SPEC                        /*  103 */
+#ifdef SSL_R_BLOCK_CIPHER_PAD_IS_WRONG
             || n == SSL_R_BLOCK_CIPHER_PAD_IS_WRONG                  /*  129 */
+#endif
             || n == SSL_R_DIGEST_CHECK_FAILED                        /*  149 */
             || n == SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST              /*  151 */
             || n == SSL_R_EXCESSIVE_MESSAGE_SIZE                     /*  152 */



More information about the nginx-devel mailing list