comparison src/event/ngx_event_openssl.h @ 4446:fd40c9ef750d stable-1.0

Merge of r4401, r4415: SSL changes: *) Added support for TLSv1.1, TLSv1.2 in ssl_protocols directive. Support for TLSv1.1 and TLSv1.2 protocols was introduced in OpenSSL 1.0.1 (-beta1 was recently released). This change makes it possible to disable these protocols and/or enable them without other protocols. *) Removed ENGINE_load_builtin_engines() call. It's already called by OPENSSL_config(). Calling it again causes some openssl engines (notably GOST) to corrupt memory, as they don't expect to be created more than once.
author Maxim Dounin <mdounin@mdounin.ru>
date Sun, 05 Feb 2012 19:15:09 +0000
parents 718f2154b813
children 4919fb357a5d
comparison
equal deleted inserted replaced
4445:50445a6d469e 4446:fd40c9ef750d
79 ngx_queue_t expire_queue; 79 ngx_queue_t expire_queue;
80 } ngx_ssl_session_cache_t; 80 } ngx_ssl_session_cache_t;
81 81
82 82
83 83
84 #define NGX_SSL_SSLv2 2 84 #define NGX_SSL_SSLv2 0x0002
85 #define NGX_SSL_SSLv3 4 85 #define NGX_SSL_SSLv3 0x0004
86 #define NGX_SSL_TLSv1 8 86 #define NGX_SSL_TLSv1 0x0008
87 #define NGX_SSL_TLSv1_1 0x0010
88 #define NGX_SSL_TLSv1_2 0x0020
87 89
88 90
89 #define NGX_SSL_BUFFER 1 91 #define NGX_SSL_BUFFER 1
90 #define NGX_SSL_CLIENT 2 92 #define NGX_SSL_CLIENT 2
91 93