MTSR/minetest
3
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2024-09-19 23:10:46 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

SRP remove custom memory allocator

Browse Source
This commit is contained in:
red-001 2024-09-02 05:58:45 +01:00 committed by sfan5
parent 197d09cc53
commit 1527cdf6a4
2 changed files with 39 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/util/srp.cpp
View File

@ -71,20 +71,6 @@
printf("\n");
}*/
void *(*srp_alloc)(size_t) = &malloc;
void *(*srp_realloc)(void *, size_t) = &realloc;
void (*srp_free)(void *) = &free;
void srp_set_memory_functions(
void *(*new_srp_alloc)(size_t),
void *(*new_srp_realloc)(void *, size_t),
void (*new_srp_free)(void *))
{
srp_alloc = new_srp_alloc;
srp_realloc = new_srp_realloc;
srp_free = new_srp_free;
}
typedef struct {
mpz_t N;
mpz_t g;
@ -184,13 +170,13 @@ static void delete_ng(NGConstant *ng)
if (ng) {
mpz_clear(ng->N);
mpz_clear(ng->g);
srp_free(ng);
free(ng);
}
}
static NGConstant *new_ng(SRP_NGType ng_type, const char *n_hex, const char *g_hex)
{
NGConstant *ng = (NGConstant *)srp_alloc(sizeof(NGConstant));
NGConstant *ng = (NGConstant *)malloc(sizeof(NGConstant));
if (!ng) return 0;
@ -397,17 +383,17 @@ static SRP_Result H_nn(
size_t len_n1 = mpz_num_bytes(n1);
size_t len_n2 = mpz_num_bytes(n2);
size_t nbytes = len_N + len_N;
unsigned char *bin = (unsigned char *)srp_alloc(nbytes);
unsigned char *bin = (unsigned char *)malloc(nbytes);
if (!bin) return SRP_ERR;
if (len_n1 > len_N || len_n2 > len_N) {
srp_free(bin);
free(bin);
return SRP_ERR;
}
memset(bin, 0, nbytes);
mpz_to_bin(n1, bin + (len_N - len_n1));
mpz_to_bin(n2, bin + (len_N + len_N - len_n2));
hash(alg, bin, nbytes, buff);
srp_free(bin);
free(bin);
mpz_from_bin(buff, hash_length(alg), result);
return SRP_OK;
}
@ -417,12 +403,12 @@ static SRP_Result H_ns(mpz_t result, SRP_HashAlgorithm alg, const unsigned char
{
unsigned char buff[CSRP_MAX_HASH];
size_t nbytes = len_n + len_bytes;
unsigned char *bin = (unsigned char *)srp_alloc(nbytes);
unsigned char *bin = (unsigned char *)malloc(nbytes);
if (!bin) return SRP_ERR;
memcpy(bin, n, len_n);
memcpy(bin + len_n, bytes, len_bytes);
hash(alg, bin, nbytes, buff);
srp_free(bin);
free(bin);
mpz_from_bin(buff, hash_length(alg), result);
return SRP_OK;
}
@ -449,22 +435,22 @@ static int calculate_x(mpz_t result, SRP_HashAlgorithm alg, const unsigned char
static SRP_Result update_hash_n(SRP_HashAlgorithm alg, HashCTX *ctx, const mpz_t n)
{
size_t len = mpz_num_bytes(n);
unsigned char *n_bytes = (unsigned char *)srp_alloc(len);
unsigned char *n_bytes = (unsigned char *)malloc(len);
if (!n_bytes) return SRP_ERR;
mpz_to_bin(n, n_bytes);
hash_update(alg, ctx, n_bytes, len);
srp_free(n_bytes);
free(n_bytes);
return SRP_OK;
}
static SRP_Result hash_num(SRP_HashAlgorithm alg, const mpz_t n, unsigned char *dest)
{
int nbytes = mpz_num_bytes(n);
unsigned char *bin = (unsigned char *)srp_alloc(nbytes);
unsigned char *bin = (unsigned char *)malloc(nbytes);
if (!bin) return SRP_ERR;
mpz_to_bin(n, bin);
hash(alg, bin, nbytes, dest);
srp_free(bin);
free(bin);
return SRP_OK;
}
@ -529,10 +515,10 @@ static SRP_Result mpz_fill_random(mpz_t num)
/*void srp_dbg_num(mpz_t num, char * prevtext)
{
int len_num = mpz_num_bytes(num);
char *bytes_num = (char*) srp_alloc(len_num);
char *bytes_num = (char*) malloc(len_num);
mpz_to_bin(num, (unsigned char *) bytes_num);
srp_dbg_data(bytes_num, len_num, prevtext);
srp_free(bytes_num);
free(bytes_num);
}*/
@ -561,7 +547,7 @@ SRP_Result srp_create_salted_verification_key( SRP_HashAlgorithm alg,
if (*bytes_s == NULL) {
size_t size_to_fill = 16;
*len_s = size_to_fill;
*bytes_s = (unsigned char *)srp_alloc(size_to_fill);
*bytes_s = (unsigned char *)malloc(size_to_fill);
if (!*bytes_s) goto error_and_exit;
if (!porting::secure_rand_fill_buf(*bytes_s, size_to_fill))
goto error_and_exit;
@ -577,7 +563,7 @@ SRP_Result srp_create_salted_verification_key( SRP_HashAlgorithm alg,
*len_v = mpz_num_bytes(v);
*bytes_v = (unsigned char *)srp_alloc(*len_v);
*bytes_v = (unsigned char *)malloc(*len_v);
if (!*bytes_v) goto error_and_exit;
@ -626,16 +612,16 @@ struct SRPVerifier *srp_verifier_new(SRP_HashAlgorithm alg,
if (!ng) goto cleanup_and_exit;
ver = (struct SRPVerifier *)srp_alloc(sizeof(struct SRPVerifier));
ver = (struct SRPVerifier *)malloc(sizeof(struct SRPVerifier));
if (!ver) goto cleanup_and_exit;
ver->username = (char *)srp_alloc(ulen);
ver->username = (char *)malloc(ulen);
ver->hash_alg = alg;
ver->ng = ng;
if (!ver->username) {
srp_free(ver);
free(ver);
ver = 0;
goto cleanup_and_exit;
}
@ -680,7 +666,7 @@ struct SRPVerifier *srp_verifier_new(SRP_HashAlgorithm alg,
}
*len_B = mpz_num_bytes(B);
*bytes_B = (unsigned char *)srp_alloc(*len_B);
*bytes_B = (unsigned char *)malloc(*len_B);
if (!*bytes_B) {
*len_B = 0;
@ -691,7 +677,7 @@ struct SRPVerifier *srp_verifier_new(SRP_HashAlgorithm alg,
ver->bytes_B = *bytes_B;
} else {
srp_free(ver);
free(ver);
ver = 0;
}
@ -708,8 +694,8 @@ cleanup_and_exit:
mpz_clear(tmp3);
return ver;
ver_cleanup_and_exit:
srp_free(ver->username);
srp_free(ver);
free(ver->username);
free(ver);
ver = 0;
goto cleanup_and_exit;
}
@ -718,10 +704,10 @@ void srp_verifier_delete(struct SRPVerifier *ver)
{
if (ver) {
delete_ng(ver->ng);
srp_free(ver->username);
srp_free(ver->bytes_B);
free(ver->username);
free(ver->bytes_B);
memset(ver, 0, sizeof(*ver));
srp_free(ver);
free(ver);
}
}
@ -765,7 +751,7 @@ struct SRPUser *srp_user_new(SRP_HashAlgorithm alg, SRP_NGType ng_type,
const unsigned char *bytes_password, size_t len_password, const char *n_hex,
const char *g_hex)
{
struct SRPUser *usr = (struct SRPUser *)srp_alloc(sizeof(struct SRPUser));
struct SRPUser *usr = (struct SRPUser *)malloc(sizeof(struct SRPUser));
size_t ulen = strlen(username) + 1;
size_t uvlen = strlen(username_for_verifier) + 1;
@ -780,9 +766,9 @@ struct SRPUser *srp_user_new(SRP_HashAlgorithm alg, SRP_NGType ng_type,
if (!usr->ng) goto err_exit;
usr->username = (char *)srp_alloc(ulen);
usr->username_verifier = (char *)srp_alloc(uvlen);
usr->password = (unsigned char *)srp_alloc(len_password);
usr->username = (char *)malloc(ulen);
usr->username_verifier = (char *)malloc(uvlen);
usr->password = (unsigned char *)malloc(len_password);
usr->password_len = len_password;
if (!usr->username || !usr->password || !usr->username_verifier) goto err_exit;
@ -803,13 +789,13 @@ err_exit:
mpz_clear(usr->A);
mpz_clear(usr->S);
delete_ng(usr->ng);
srp_free(usr->username);
srp_free(usr->username_verifier);
free(usr->username);
free(usr->username_verifier);
if (usr->password) {
memset(usr->password, 0, usr->password_len);
srp_free(usr->password);
free(usr->password);
}
srp_free(usr);
free(usr);
}
return 0;
@ -826,14 +812,14 @@ void srp_user_delete(struct SRPUser *usr)
memset(usr->password, 0, usr->password_len);
srp_free(usr->username);
srp_free(usr->username_verifier);
srp_free(usr->password);
free(usr->username);
free(usr->username_verifier);
free(usr->password);
if (usr->bytes_A) srp_free(usr->bytes_A);
if (usr->bytes_A) free(usr->bytes_A);
memset(usr, 0, sizeof(*usr));
srp_free(usr);
free(usr);
}
}
@ -872,7 +858,7 @@ SRP_Result srp_user_start_authentication(struct SRPUser *usr, char **username,
mpz_powm(usr->A, usr->ng->g, usr->a, usr->ng->N);
*len_A = mpz_num_bytes(usr->A);
*bytes_A = (unsigned char *)srp_alloc(*len_A);
*bytes_A = (unsigned char *)malloc(*len_A);
if (!*bytes_A) goto error_and_exit;

9
src/util/srp.h
View File

@ -79,15 +79,6 @@ typedef enum {
SRP_OK,
} SRP_Result;
/* Sets the memory functions used by srp.
* Note: this doesn't set the memory functions used by gmp,
* but it is supported to have different functions for srp and gmp.
* Don't call this after you have already allocated srp structures.
*/
void srp_set_memory_functions(
void *(*new_srp_alloc) (size_t),
void *(*new_srp_realloc) (void *, size_t),
void (*new_srp_free) (void *));
/* Out: bytes_v, len_v
*