lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2026-10-24 03:48:58 +03:00
Code Activity

crypto: constify ssh2_dh_validate() args

Browse Source 
Ref: #2402
Follow-up to fcf830788d #2239

Closes #2436
This commit is contained in:
Viktor Szakats
2026-07-27 13:55:37 +02:00
parent 505f7b2b06
commit 199a459634
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/crypto.h
View File

@@ -310,7 +310,7 @@ int ssh2_bn_to_bin(const ssh2_bn *bn, unsigned char *bin);
void ssh2_dh_init(ssh2_dh_ctx *dhctx);
int ssh2_dh_key_pair(ssh2_dh_ctx *dhctx, ssh2_bn *pub, ssh2_bn *g,
ssh2_bn *p, int group_order, ssh2_bn_ctx *bnctx);
int ssh2_dh_validate(ssh2_bn *f, ssh2_bn *p); /* for unit tests */
int ssh2_dh_validate(const ssh2_bn *f, const ssh2_bn *p); /* for unit tests */
int ssh2_dh_secret(ssh2_dh_ctx *dhctx, ssh2_bn *secret, ssh2_bn *f,
ssh2_bn *p, ssh2_bn_ctx *bnctx);
void ssh2_dh_dtor(ssh2_dh_ctx *dhctx);

13
src/libgcrypt.c
View File

@@ -696,26 +696,27 @@ int ssh2_dh_key_pair(ssh2_dh_ctx *dhctx, ssh2_bn *pub, ssh2_bn *g,
return 0;
}
int ssh2_dh_validate(ssh2_bn *f, ssh2_bn *p)
int ssh2_dh_validate(const ssh2_bn *f, const ssh2_bn *p)
{
gcry_mpi_t tmp;
unsigned int n, i, bits_set;
if(gcry_mpi_cmp_ui(f, 1) <= 0)
if(gcry_mpi_cmp_ui(SSH2_UNCONST(f), 1) <= 0)
return -1; /* f <= 1 */
tmp = gcry_mpi_new(0);
if(!tmp)
return -4;
gcry_mpi_sub_ui(tmp, p, 1);
if(gcry_mpi_cmp(f, tmp) >= 0) {
gcry_mpi_sub_ui(tmp, SSH2_UNCONST(p), 1);
if(gcry_mpi_cmp(SSH2_UNCONST(f), tmp) >= 0) {
gcry_mpi_release(tmp);
return -2; /* f >= p - 1 (== f > p - 2) */
}
gcry_mpi_release(tmp);
for(i = 0, n = gcry_mpi_get_nbits(f), bits_set = 0; i < n; ++i)
if(gcry_mpi_test_bit(f, i))
for(i = 0, n = gcry_mpi_get_nbits(SSH2_UNCONST(f)), bits_set = 0; i < n;
++i)
if(gcry_mpi_test_bit(SSH2_UNCONST(f), i))
++bits_set;
if(bits_set < 4)

2
src/mbedtls.c
View File

@@ -696,7 +696,7 @@ int ssh2_dh_key_pair(ssh2_dh_ctx *dhctx, ssh2_bn *pub, ssh2_bn *g,
return 0;
}
int ssh2_dh_validate(ssh2_bn *f, ssh2_bn *p)
int ssh2_dh_validate(const ssh2_bn *f, const ssh2_bn *p)
{
mbedtls_mpi one, tmp;
size_t n, i, bits_set;

2
src/openssl.c
View File

@@ -3624,7 +3624,7 @@ int ssh2_dh_key_pair(ssh2_dh_ctx *dhctx, ssh2_bn *pub, ssh2_bn *g,
return 0;
}
int ssh2_dh_validate(ssh2_bn *f, ssh2_bn *p)
int ssh2_dh_validate(const ssh2_bn *f, const ssh2_bn *p)
{
BIGNUM *tmp;
int n, i, bits_set;