Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nginx/nginx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/event/ngx_event_openssl.c')
-rw-r--r--src/event/ngx_event_openssl.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index b65779088..d213eb158 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -20,8 +20,6 @@ static void ngx_ssl_read_handler(ngx_event_t *rev);
ngx_int_t
ngx_ssl_init(ngx_log_t *log)
{
- ENGINE *engine;
-
SSL_library_init();
SSL_load_error_strings();
ENGINE_load_builtin_engines();
@@ -36,11 +34,13 @@ ngx_ssl_create_session(ngx_ssl_ctx_t *ssl_ctx, ngx_connection_t *c,
{
ngx_ssl_t *ssl;
- if (!(ssl = ngx_pcalloc(c->pool, sizeof(ngx_ssl_t)))) {
+ ssl = ngx_pcalloc(c->pool, sizeof(ngx_ssl_t));
+ if (ssl == NULL) {
return NGX_ERROR;
}
- if (!(ssl->buf = ngx_create_temp_buf(c->pool, NGX_SSL_BUFSIZE))) {
+ ssl->buf = ngx_create_temp_buf(c->pool, NGX_SSL_BUFSIZE);
+ if (ssl->buf == NULL) {
return NGX_ERROR;
}
@@ -586,7 +586,7 @@ ngx_ssl_error(ngx_uint_t level, ngx_log_t *log, ngx_err_t err, char *fmt, ...)
p = ngx_vsnprintf(errstr, sizeof(errstr) - 1, fmt, args);
va_end(args);
- p = ngx_cpystrn(p, " (SSL: ", last - p);
+ p = ngx_cpystrn(p, (u_char *) " (SSL: ", last - p);
ERR_error_string_n(ERR_get_error(), (char *) p, last - p);