applications/tg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add check that BN_is_prime return value is not negative

Browse Source 
fix memory leak (BN_clear doesn't release allocated memory)
This commit is contained in:
antma 2014-01-21 18:24:40 +04:00
parent 32d7286640
commit 364fe4ebe4
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mtproto-client.c
View File

@ -428,6 +428,12 @@ int process_respq_answer (struct connection *c, char *packet, int len) {
return rpc_send_packet (c); return rpc_send_packet (c);
} }
int check_prime (BIGNUM *p) {
int r = BN_is_prime (p, BN_prime_checks, 0, BN_ctx, 0);
ensure (r >= 0);
return r;
}
int check_DH_params (BIGNUM *p, int g) { int check_DH_params (BIGNUM *p, int g) {
if (g < 2 || g > 7) { return -1; } if (g < 2 || g > 7) { return -1; }
BIGNUM t; BIGNUM t;
@ -440,7 +446,7 @@ int check_DH_params (BIGNUM *p, int g) {
int x = BN_get_word (&t); int x = BN_get_word (&t);
assert (x >= 0 && x < 4 * g); assert (x >= 0 && x < 4 * g);
BN_clear (&dh_g); BN_free (&dh_g);
switch (g) { switch (g) {
case 2: case 2:
@ -462,15 +468,15 @@ int check_DH_params (BIGNUM *p, int g) {
break; break;
} }
if (!BN_is_prime (p, BN_prime_checks, 0, BN_ctx, 0)) { return -1; } if (!check_prime (p)) { return -1; }
BIGNUM b; BIGNUM b;
BN_init (&b); BN_init (&b);
ensure (BN_set_word (&b, 2)); ensure (BN_set_word (&b, 2));
ensure (BN_div (&t, 0, p, &b, BN_ctx)); ensure (BN_div (&t, 0, p, &b, BN_ctx));
if (!BN_is_prime (&t, BN_prime_checks, 0, BN_ctx, 0)) { return -1; } if (!check_prime (&t)) { return -1; }
BN_clear (&b); BN_free (&b);
BN_clear (&t); BN_free (&t);
return 0; return 0;
} }