diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-07-18 19:11:20 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-07-18 19:11:20 +0000 |
| commit | 74a5ddb47aef86bb07336713bb1ace0007c2d452 (patch) | |
| tree | 449c6ceb229b7646ef40417135c66843a677746b /src/http/modules/ngx_http_ssl_module.c | |
| parent | f38e046a0a2e7437f8232ef2a99cead69c4b9ebb (diff) | |
| download | nginx-74a5ddb47aef86bb07336713bb1ace0007c2d452.tar.gz nginx-74a5ddb47aef86bb07336713bb1ace0007c2d452.zip | |
nginx-0.0.7-2004-07-18-23:11:20 import
Diffstat (limited to 'src/http/modules/ngx_http_ssl_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_ssl_module.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c index 3a8b863a2..699bd8f6a 100644 --- a/src/http/modules/ngx_http_ssl_module.c +++ b/src/http/modules/ngx_http_ssl_module.c @@ -105,7 +105,8 @@ static char *ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, return NGX_CONF_ERROR; } - if (SSL_CTX_use_certificate_file(conf->ssl_ctx, conf->certificate.data, + if (SSL_CTX_use_certificate_file(conf->ssl_ctx, + (char *) conf->certificate.data, SSL_FILETYPE_PEM) == 0) { ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0, "SSL_CTX_use_certificate_file(\"%s\") failed", @@ -113,7 +114,8 @@ static char *ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, return NGX_CONF_ERROR; } - if (SSL_CTX_use_PrivateKey_file(conf->ssl_ctx, conf->certificate_key.data, + if (SSL_CTX_use_PrivateKey_file(conf->ssl_ctx, + (char *) conf->certificate_key.data, SSL_FILETYPE_PEM) == 0) { ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0, "SSL_CTX_use_PrivateKey_file(\"%s\") failed", |