From 5dc5945ccf6e64b7b36bb620f4b24e6fdb2364b1 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Mon, 16 May 2011 14:54:50 +0000 Subject: "$apr1", "{PLAIN}", and "{SSHA}" password methods in auth basic module patch by Maxim Dounin --- src/os/unix/ngx_user.c | 4 ++-- src/os/unix/ngx_user.h | 2 +- src/os/win32/ngx_user.c | 2 +- src/os/win32/ngx_user.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/os') diff --git a/src/os/unix/ngx_user.c b/src/os/unix/ngx_user.c index 165c6a46b..c46fb2bfd 100644 --- a/src/os/unix/ngx_user.c +++ b/src/os/unix/ngx_user.c @@ -23,7 +23,7 @@ #if (NGX_HAVE_GNU_CRYPT_R) ngx_int_t -ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) +ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) { char *value; size_t len; @@ -58,7 +58,7 @@ ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) #else ngx_int_t -ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) +ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) { char *value; size_t len; diff --git a/src/os/unix/ngx_user.h b/src/os/unix/ngx_user.h index 7cd944d01..68d1c6e5f 100644 --- a/src/os/unix/ngx_user.h +++ b/src/os/unix/ngx_user.h @@ -16,7 +16,7 @@ typedef uid_t ngx_uid_t; typedef gid_t ngx_gid_t; -ngx_int_t ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, +ngx_int_t ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted); diff --git a/src/os/win32/ngx_user.c b/src/os/win32/ngx_user.c index cc0760301..5167870c0 100644 --- a/src/os/win32/ngx_user.c +++ b/src/os/win32/ngx_user.c @@ -10,7 +10,7 @@ #if (NGX_CRYPT) ngx_int_t -ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) +ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) { /* STUB: a plain text password */ diff --git a/src/os/win32/ngx_user.h b/src/os/win32/ngx_user.h index 6e8c58bd2..fd30df218 100644 --- a/src/os/win32/ngx_user.h +++ b/src/os/win32/ngx_user.h @@ -17,7 +17,7 @@ #define ngx_gid_t ngx_int_t -ngx_int_t ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, +ngx_int_t ngx_libc_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted); -- cgit