IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Crypt: fixed handling of corrupted SSHA entries in password file.

Browse Source 
Found by Coverity.
This commit is contained in:
Maxim Dounin 2012-08-16 12:05:58 +00:00
parent 3587e2be23
commit 89bd5f038a
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/ngx_crypt.c
View File

@ -194,6 +194,7 @@ static ngx_int_t
ngx_crypt_ssha(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) ngx_crypt_ssha(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
{ {
size_t len; size_t len;
ngx_int_t rc;
ngx_str_t encoded, decoded; ngx_str_t encoded, decoded;
ngx_sha1_t sha1; ngx_sha1_t sha1;
@ -204,12 +205,18 @@ ngx_crypt_ssha(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
encoded.data = salt + sizeof("{SSHA}") - 1; encoded.data = salt + sizeof("{SSHA}") - 1;
encoded.len = ngx_strlen(encoded.data); encoded.len = ngx_strlen(encoded.data);
decoded.data = ngx_pnalloc(pool, ngx_base64_decoded_length(encoded.len)); len = ngx_max(ngx_base64_decoded_length(encoded.len), 20);
decoded.data = ngx_pnalloc(pool, len);
if (decoded.data == NULL) { if (decoded.data == NULL) {
return NGX_ERROR; return NGX_ERROR;
} }
ngx_decode_base64(&decoded, &encoded); rc = ngx_decode_base64(&decoded, &encoded);
if (rc != NGX_OK || decoded.len < 20) {
decoded.len = 20;
}
/* update SHA1 from key and salt */ /* update SHA1 from key and salt */