~ubuntu-branches/debian/squeeze/nginx/squeeze

« back to all changes in this revision

Viewing changes to src/mail/ngx_mail_ssl_module.c

Committer: Bazaar Package Importer
Author(s): Fabio Tranchitella
Date: 2009-11-08 09:53:46 UTC
mfrom: (1.1.13 upstream)
Revision ID: james.westby@ubuntu.com-20091108095346-yt4eypw2l176tl53

Tags: 0.7.63-1

New upstream release.

files added:
auto/lib/geoip

auto/lib/geoip/conf

src/http/modules/ngx_http_geoip_module.c

files modified:
CHANGES

CHANGES.ru

auto/lib/conf

auto/modules

auto/options

auto/sources

debian/changelog

src/core/nginx.c

src/core/nginx.h

src/core/ngx_cycle.c

src/core/ngx_file.c

src/core/ngx_file.h

src/core/ngx_hash.c

src/core/ngx_output_chain.c

src/core/ngx_string.c

src/event/modules/ngx_devpoll_module.c

src/event/modules/ngx_epoll_module.c

src/event/modules/ngx_eventport_module.c

src/event/modules/ngx_kqueue_module.c

src/event/modules/ngx_rtsig_module.c

src/event/ngx_event.c

src/event/ngx_event_openssl.c

src/event/ngx_event_openssl.h

src/http/modules/ngx_http_access_module.c

src/http/modules/ngx_http_addition_filter_module.c

src/http/modules/ngx_http_auth_basic_module.c

src/http/modules/ngx_http_autoindex_module.c

src/http/modules/ngx_http_browser_module.c

src/http/modules/ngx_http_charset_filter_module.c

src/http/modules/ngx_http_dav_module.c

src/http/modules/ngx_http_fastcgi_module.c

src/http/modules/ngx_http_geo_module.c

src/http/modules/ngx_http_gzip_filter_module.c

src/http/modules/ngx_http_gzip_static_module.c

src/http/modules/ngx_http_headers_filter_module.c

src/http/modules/ngx_http_image_filter_module.c

src/http/modules/ngx_http_index_module.c

src/http/modules/ngx_http_limit_req_module.c

src/http/modules/ngx_http_limit_zone_module.c

src/http/modules/ngx_http_log_module.c

src/http/modules/ngx_http_map_module.c

src/http/modules/ngx_http_memcached_module.c

src/http/modules/ngx_http_proxy_module.c

src/http/modules/ngx_http_random_index_module.c

src/http/modules/ngx_http_realip_module.c

src/http/modules/ngx_http_referer_module.c

src/http/modules/ngx_http_rewrite_module.c

src/http/modules/ngx_http_secure_link_module.c

src/http/modules/ngx_http_ssi_filter_module.c

src/http/modules/ngx_http_ssl_module.c

src/http/modules/ngx_http_ssl_module.h

src/http/modules/ngx_http_sub_filter_module.c

src/http/modules/ngx_http_userid_filter_module.c

src/http/modules/ngx_http_xslt_filter_module.c

src/http/modules/perl/nginx.pm

src/http/modules/perl/ngx_http_perl_module.c

src/http/ngx_http_cache.h

src/http/ngx_http_core_module.c

src/http/ngx_http_core_module.h

src/http/ngx_http_file_cache.c

src/http/ngx_http_parse.c

src/http/ngx_http_request.c

src/http/ngx_http_request.h

src/http/ngx_http_script.c

src/http/ngx_http_upstream.c

src/http/ngx_http_upstream.h

src/http/ngx_http_write_filter_module.c

src/mail/ngx_mail_auth_http_module.c

src/mail/ngx_mail_core_module.c

src/mail/ngx_mail_proxy_module.c

src/mail/ngx_mail_ssl_module.c

src/os/unix/ngx_errno.h

src/os/unix/ngx_files.h

src/os/unix/ngx_process.c

src/os/unix/ngx_process.h

src/os/unix/ngx_process_cycle.c

src/os/unix/ngx_process_cycle.h

Show diffs side-by-side

added added

removed removed

src/mail/ngx_mail_ssl_module.c

static char *ngx_mail_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd,

void *conf);

#if !defined (SSL_OP_CIPHER_SERVER_PREFERENCE)

static char *ngx_mail_ssl_nosupported(ngx_conf_t *cf, ngx_command_t *cmd,

void *conf);

static char ngx_mail_ssl_openssl097[] = "OpenSSL 0.9.7 and higher";

#endif

static ngx_conf_enum_t ngx_http_starttls_state[] = {

{ ngx_string("off"), NGX_MAIL_STARTTLS_OFF },

102

103

{ ngx_string("ssl_prefer_server_ciphers"),

104

NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_FLAG,

105

#ifdef SSL_OP_CIPHER_SERVER_PREFERENCE

106

ngx_conf_set_flag_slot,

107

NGX_MAIL_SRV_CONF_OFFSET,

108

offsetof(ngx_mail_ssl_conf_t, prefer_server_ciphers),

109

NULL },

110

#else

111

ngx_mail_ssl_nosupported, 0, 0, ngx_mail_ssl_openssl097 },

112

#endif

113

100

114

101

{ ngx_string("ssl_session_cache"),

115

102

NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE12,

166

153

167

154

scf = ngx_pcalloc(cf->pool, sizeof(ngx_mail_ssl_conf_t));

168

155

if (scf == NULL) {

169

return NGX_CONF_ERROR;

156

return NULL;

170

157

}

171

158

172

159

297

284

}

298

285

}

299

286

300

#ifdef SSL_OP_CIPHER_SERVER_PREFERENCE

301

302

287

if (conf->prefer_server_ciphers) {

303

288

SSL_CTX_set_options(conf->ssl.ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);

304

289

}

305

290

306

#endif

307

308

291

if (ngx_ssl_generate_rsa512_key(&conf->ssl) != NGX_OK) {

309

292

return NGX_CONF_ERROR;

310

293

}

492

475

493

476

return NGX_CONF_ERROR;

494

477

}

495

496

497

#if !defined (SSL_OP_CIPHER_SERVER_PREFERENCE)

498

499

static char *

500

ngx_mail_ssl_nosupported(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)

501

{

502

ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,

503

"\"%V\" directive is available only in %s,",

504

&cmd->name, cmd->post);

505

506

return NGX_CONF_ERROR;

507

}

508

509

#endif

Older »