bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2026-05-13 13:30:12 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Use blake2 hashsize

Browse Source
This commit is contained in:
Vladimir Dubrovin 2026-05-08 19:14:28 +03:00
parent 6286bfcd6e
commit 95029e9e41
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/auth.c
View File

@ -231,14 +231,12 @@ int strongauth(struct clientparam * param){
if(!strncmp(pass + 1, (char *)param->password, pwl_table.recsize - 1)) return 0; if(!strncmp(pass + 1, (char *)param->password, pwl_table.recsize - 1)) return 0;
} else { } else {
blake2b_state S; blake2b_state S;
unsigned char _b2tmp[64];
unsigned hashsz; unsigned hashsz;
hashsz = pwl_table.recsize - 1 < 64 ? pwl_table.recsize - 1 : 64; hashsz = pwl_table.recsize - 1 < 64 ? pwl_table.recsize - 1 : 64;
memset(buf, 0, pwl_table.recsize - 1); memset(buf, 0, pwl_table.recsize - 1);
blake2b_init(&S, 64); blake2b_init(&S, hashsz);
blake2b_update(&S, param->password, pwlen + 1); blake2b_update(&S, param->password, pwlen + 1);
blake2b_final(&S, _b2tmp, 64); blake2b_final(&S, buf, hashsz);
memcpy(buf, _b2tmp, hashsz);
if(!memcmp(pass + 1, buf, pwl_table.recsize - 1)) return 0; if(!memcmp(pass + 1, buf, pwl_table.recsize - 1)) return 0;
} }
return 6; return 6;

19
src/hashtables.c
View File

@ -10,11 +10,9 @@ static void char_index2hash(const struct hashtable *ht, void *index, uint8_t *ha
memset(hash, 0, ht->hash_size); memset(hash, 0, ht->hash_size);
if(len <= ht->hash_size) memcpy(hash, index, len); if(len <= ht->hash_size) memcpy(hash, index, len);
else { else {
unsigned char _b2tmp[64]; blake2b_init(&S, ht->hash_size);
blake2b_init(&S, 64);
blake2b_update(&S, index, strlen((const char*)index) + 1); blake2b_update(&S, index, strlen((const char*)index) + 1);
blake2b_final(&S, _b2tmp, 64); blake2b_final(&S, hash, ht->hash_size);
memcpy(hash, _b2tmp, ht->hash_size);
} }
} }
@ -51,8 +49,7 @@ static void param2hash_add(const struct hashtable *ht, void *index, uint8_t *has
if((type & 2048)){ memcpy(hash + offset, SAPORT(&param->srv->intsa), p2len); offset += 2; } if((type & 2048)){ memcpy(hash + offset, SAPORT(&param->srv->intsa), p2len); offset += 2; }
} }
else { else {
unsigned char _b2tmp[64]; blake2b_init(&S, ht->hash_size);
blake2b_init(&S, 64);
if((type & 2) && param->username)blake2b_update(&S, param->username, ulen); if((type & 2) && param->username)blake2b_update(&S, param->username, ulen);
if((type & 4) && param->password)blake2b_update(&S, param->password, plen); if((type & 4) && param->password)blake2b_update(&S, param->password, plen);
if((type & 1) && !(type & 8))blake2b_update(&S, SAADDR(&param->sincr), a1len); if((type & 1) && !(type & 8))blake2b_update(&S, SAADDR(&param->sincr), a1len);
@ -63,10 +60,8 @@ static void param2hash_add(const struct hashtable *ht, void *index, uint8_t *has
if((type & 512))blake2b_update(&S, &param->operation, sizeof(param->operation)); if((type & 512))blake2b_update(&S, &param->operation, sizeof(param->operation));
if((type & 1024))blake2b_update(&S, SAADDR(&param->srv->intsa), a3len); if((type & 1024))blake2b_update(&S, SAADDR(&param->srv->intsa), a3len);
if((type & 2048))blake2b_update(&S, SAPORT(&param->srv->intsa), 2); if((type & 2048))blake2b_update(&S, SAPORT(&param->srv->intsa), 2);
blake2b_final(&S, _b2tmp, 64); blake2b_final(&S, hash, ht->hash_size);
memcpy(hash, _b2tmp, ht->hash_size);
} }
memcpy(param->hash, hash, ht->hash_size);
} }
void param2hash_search(const struct hashtable *ht, void *index, uint8_t *hash){ void param2hash_search(const struct hashtable *ht, void *index, uint8_t *hash){
@ -78,14 +73,12 @@ void param2hash_search(const struct hashtable *ht, void *index, uint8_t *hash){
static void udpparam2hash(const struct hashtable *ht, void *index, uint8_t *hash){ static void udpparam2hash(const struct hashtable *ht, void *index, uint8_t *hash){
struct clientparam *param = (struct clientparam *)index; struct clientparam *param = (struct clientparam *)index;
blake2b_state S; blake2b_state S;
unsigned char _b2tmp[64]; blake2b_init(&S, ht->hash_size);
blake2b_init(&S, 64);
blake2b_update(&S, SAADDR(&param->srv->intsa), SAADDRLEN(&param->srv->intsa)); blake2b_update(&S, SAADDR(&param->srv->intsa), SAADDRLEN(&param->srv->intsa));
blake2b_update(&S, SAPORT(&param->srv->intsa), 2); blake2b_update(&S, SAPORT(&param->srv->intsa), 2);
blake2b_update(&S, SAADDR(&param->sincr), SAADDRLEN(&param->sincr)); blake2b_update(&S, SAADDR(&param->sincr), SAADDRLEN(&param->sincr));
blake2b_update(&S, SAPORT(&param->sincr), 2); blake2b_update(&S, SAPORT(&param->sincr), 2);
blake2b_final(&S, _b2tmp, 64); blake2b_final(&S, hash, ht->hash_size);
memcpy(hash, _b2tmp, ht->hash_size);
} }
struct hashtable dns_table = {char_index2hash, char_index2hash, 4, 32}; struct hashtable dns_table = {char_index2hash, char_index2hash, 4, 32};