Mercurial > hg > nginx-vendor-current
comparison src/event/ngx_event_openssl.h @ 688:f31b19fe7f48 NGINX_1_3_7
nginx 1.3.7
*) Feature: OCSP stapling support.
Thanks to Comodo, DigiCert and GlobalSign for sponsoring this work.
*) Feature: the "ssl_trusted_certificate" directive.
*) Feature: resolver now randomly rotates addresses returned from cache.
Thanks to Anton Jouline.
*) Bugfix: OpenSSL 0.9.7 compatibility.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 02 Oct 2012 00:00:00 +0400 |
parents | d0f7a625f27c |
children | b5b7eea22fda |
comparison
equal
deleted
inserted
replaced
687:a7305f494f1c | 688:f31b19fe7f48 |
---|---|
15 #include <openssl/ssl.h> | 15 #include <openssl/ssl.h> |
16 #include <openssl/err.h> | 16 #include <openssl/err.h> |
17 #include <openssl/conf.h> | 17 #include <openssl/conf.h> |
18 #include <openssl/engine.h> | 18 #include <openssl/engine.h> |
19 #include <openssl/evp.h> | 19 #include <openssl/evp.h> |
20 #include <openssl/ocsp.h> | |
20 | 21 |
21 #define NGX_SSL_NAME "OpenSSL" | 22 #define NGX_SSL_NAME "OpenSSL" |
22 | 23 |
23 | 24 |
24 #define ngx_ssl_session_t SSL_SESSION | 25 #define ngx_ssl_session_t SSL_SESSION |
99 ngx_int_t ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data); | 100 ngx_int_t ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data); |
100 ngx_int_t ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, | 101 ngx_int_t ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, |
101 ngx_str_t *cert, ngx_str_t *key); | 102 ngx_str_t *cert, ngx_str_t *key); |
102 ngx_int_t ngx_ssl_client_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, | 103 ngx_int_t ngx_ssl_client_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, |
103 ngx_str_t *cert, ngx_int_t depth); | 104 ngx_str_t *cert, ngx_int_t depth); |
105 ngx_int_t ngx_ssl_trusted_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, | |
106 ngx_str_t *cert, ngx_int_t depth); | |
104 ngx_int_t ngx_ssl_crl(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *crl); | 107 ngx_int_t ngx_ssl_crl(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *crl); |
108 ngx_int_t ngx_ssl_stapling(ngx_conf_t *cf, ngx_ssl_t *ssl, | |
109 ngx_str_t *file, ngx_str_t *responder, ngx_uint_t verify); | |
110 ngx_int_t ngx_ssl_stapling_resolver(ngx_conf_t *cf, ngx_ssl_t *ssl, | |
111 ngx_resolver_t *resolver, ngx_msec_t resolver_timeout); | |
105 RSA *ngx_ssl_rsa512_key_callback(SSL *ssl, int is_export, int key_length); | 112 RSA *ngx_ssl_rsa512_key_callback(SSL *ssl, int is_export, int key_length); |
106 ngx_int_t ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file); | 113 ngx_int_t ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file); |
107 ngx_int_t ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name); | 114 ngx_int_t ngx_ssl_ecdh_curve(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *name); |
108 ngx_int_t ngx_ssl_session_cache(ngx_ssl_t *ssl, ngx_str_t *sess_ctx, | 115 ngx_int_t ngx_ssl_session_cache(ngx_ssl_t *ssl, ngx_str_t *sess_ctx, |
109 ssize_t builtin_session_cache, ngx_shm_zone_t *shm_zone, time_t timeout); | 116 ssize_t builtin_session_cache, ngx_shm_zone_t *shm_zone, time_t timeout); |
155 | 162 |
156 | 163 |
157 extern int ngx_ssl_connection_index; | 164 extern int ngx_ssl_connection_index; |
158 extern int ngx_ssl_server_conf_index; | 165 extern int ngx_ssl_server_conf_index; |
159 extern int ngx_ssl_session_cache_index; | 166 extern int ngx_ssl_session_cache_index; |
167 extern int ngx_ssl_certificate_index; | |
168 extern int ngx_ssl_stapling_index; | |
160 | 169 |
161 | 170 |
162 #endif /* _NGX_EVENT_OPENSSL_H_INCLUDED_ */ | 171 #endif /* _NGX_EVENT_OPENSSL_H_INCLUDED_ */ |