comparison src/event/ngx_event_openssl.h @ 8411:7995cd199b52 quic

Merged with the default branch.
author Sergey Kandaurov <pluknet@nginx.com>
date Tue, 26 May 2020 20:26:44 +0300
parents 253cf267f95a b56f725dd4bb
children 7621ffaa79b3
comparison
equal deleted inserted replaced
8410:c7d1b500bd0a 8411:7995cd199b52
69 #if (OPENSSL_VERSION_NUMBER < 0x10002000L) 69 #if (OPENSSL_VERSION_NUMBER < 0x10002000L)
70 #define SSL_is_server(s) (s)->server 70 #define SSL_is_server(s) (s)->server
71 #endif 71 #endif
72 72
73 73
74 typedef struct ngx_ssl_ocsp_s ngx_ssl_ocsp_t;
75
76
74 struct ngx_ssl_s { 77 struct ngx_ssl_s {
75 SSL_CTX *ctx; 78 SSL_CTX *ctx;
76 ngx_log_t *log; 79 ngx_log_t *log;
77 size_t buffer_size; 80 size_t buffer_size;
78 }; 81 };
91 ngx_ssl_session_t *session; 94 ngx_ssl_session_t *session;
92 ngx_connection_handler_pt save_session; 95 ngx_connection_handler_pt save_session;
93 96
94 ngx_event_handler_pt saved_read_handler; 97 ngx_event_handler_pt saved_read_handler;
95 ngx_event_handler_pt saved_write_handler; 98 ngx_event_handler_pt saved_write_handler;
99
100 ngx_ssl_ocsp_t *ocsp;
96 101
97 u_char early_buf; 102 u_char early_buf;
98 103
99 unsigned handshaked:1; 104 unsigned handshaked:1;
100 unsigned renegotiation:1; 105 unsigned renegotiation:1;
102 unsigned no_wait_shutdown:1; 107 unsigned no_wait_shutdown:1;
103 unsigned no_send_shutdown:1; 108 unsigned no_send_shutdown:1;
104 unsigned handshake_buffer_set:1; 109 unsigned handshake_buffer_set:1;
105 unsigned try_early_data:1; 110 unsigned try_early_data:1;
106 unsigned in_early:1; 111 unsigned in_early:1;
112 unsigned in_ocsp:1;
107 unsigned early_preread:1; 113 unsigned early_preread:1;
108 unsigned write_blocked:1; 114 unsigned write_blocked:1;
109 }; 115 };
110 116
111 117
185 ngx_int_t ngx_ssl_crl(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *crl); 191 ngx_int_t ngx_ssl_crl(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *crl);
186 ngx_int_t ngx_ssl_stapling(ngx_conf_t *cf, ngx_ssl_t *ssl, 192 ngx_int_t ngx_ssl_stapling(ngx_conf_t *cf, ngx_ssl_t *ssl,
187 ngx_str_t *file, ngx_str_t *responder, ngx_uint_t verify); 193 ngx_str_t *file, ngx_str_t *responder, ngx_uint_t verify);
188 ngx_int_t ngx_ssl_stapling_resolver(ngx_conf_t *cf, ngx_ssl_t *ssl, 194 ngx_int_t ngx_ssl_stapling_resolver(ngx_conf_t *cf, ngx_ssl_t *ssl,
189 ngx_resolver_t *resolver, ngx_msec_t resolver_timeout); 195 ngx_resolver_t *resolver, ngx_msec_t resolver_timeout);
196 ngx_int_t ngx_ssl_ocsp(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *responder,
197 ngx_uint_t depth, ngx_shm_zone_t *shm_zone);
198 ngx_int_t ngx_ssl_ocsp_resolver(ngx_conf_t *cf, ngx_ssl_t *ssl,
199 ngx_resolver_t *resolver, ngx_msec_t resolver_timeout);
200 ngx_int_t ngx_ssl_ocsp_validate(ngx_connection_t *c);
201 ngx_int_t ngx_ssl_ocsp_get_status(ngx_connection_t *c, const char **s);
202 void ngx_ssl_ocsp_cleanup(ngx_connection_t *c);
203 ngx_int_t ngx_ssl_ocsp_cache_init(ngx_shm_zone_t *shm_zone, void *data);
190 RSA *ngx_ssl_rsa512_key_callback(ngx_ssl_conn_t *ssl_conn, int is_export, 204 RSA *ngx_ssl_rsa512_key_callback(ngx_ssl_conn_t *ssl_conn, int is_export,
191 int key_length); 205 int key_length);
192 ngx_array_t *ngx_ssl_read_password_file(ngx_conf_t *cf, ngx_str_t *file); 206 ngx_array_t *ngx_ssl_read_password_file(ngx_conf_t *cf, ngx_str_t *file);
193 ngx_array_t *ngx_ssl_preserve_passwords(ngx_conf_t *cf, 207 ngx_array_t *ngx_ssl_preserve_passwords(ngx_conf_t *cf,
194 ngx_array_t *passwords); 208 ngx_array_t *passwords);
286 300
287 extern int ngx_ssl_connection_index; 301 extern int ngx_ssl_connection_index;
288 extern int ngx_ssl_server_conf_index; 302 extern int ngx_ssl_server_conf_index;
289 extern int ngx_ssl_session_cache_index; 303 extern int ngx_ssl_session_cache_index;
290 extern int ngx_ssl_session_ticket_keys_index; 304 extern int ngx_ssl_session_ticket_keys_index;
305 extern int ngx_ssl_ocsp_index;
291 extern int ngx_ssl_certificate_index; 306 extern int ngx_ssl_certificate_index;
292 extern int ngx_ssl_next_certificate_index; 307 extern int ngx_ssl_next_certificate_index;
293 extern int ngx_ssl_certificate_name_index; 308 extern int ngx_ssl_certificate_name_index;
294 extern int ngx_ssl_stapling_index; 309 extern int ngx_ssl_stapling_index;
295 310