Mercurial > hg > nginx-vendor-current
diff src/core/ngx_crypt.c @ 628:83b58b182b76 NGINX_1_0_4
nginx 1.0.4
*) Change: now regular expressions case sensitivity in the "map"
directive is given by prefixes "~" or "~*".
*) Feature: now shared zones and caches use POSIX semaphores on Linux.
Thanks to Denis F. Latypoff.
*) Bugfix: "stalled" cache updating" alert.
*) Bugfix: nginx could not be built --without-http_auth_basic_module;
the bug had appeared in 1.0.3.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Wed, 01 Jun 2011 00:00:00 +0400 |
parents | a7a5fa2e395b |
children | 5cb5db9975ba |
line wrap: on
line diff
--- a/src/core/ngx_crypt.c +++ b/src/core/ngx_crypt.c @@ -12,6 +12,8 @@ #endif +#if (NGX_CRYPT) + static ngx_int_t ngx_crypt_apr1(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted); static ngx_int_t ngx_crypt_plain(ngx_pool_t *pool, u_char *key, u_char *salt, @@ -73,7 +75,7 @@ ngx_crypt_apr1(ngx_pool_t *pool, u_char ngx_md5_init(&md5); ngx_md5_update(&md5, key, keylen); - ngx_md5_update(&md5, "$apr1$", sizeof("$apr1$") - 1); + ngx_md5_update(&md5, (u_char *) "$apr1$", sizeof("$apr1$") - 1); ngx_md5_update(&md5, salt, saltlen); ngx_md5_init(&ctx1); @@ -232,3 +234,5 @@ ngx_crypt_ssha(ngx_pool_t *pool, u_char } #endif /* NGX_HAVE_SHA1 */ + +#endif /* NGX_CRYPT */