diff options
| author | Daiki Ueno <ueno@gnu.org> | 2020-09-03 16:27:56 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2020-09-03 16:27:56 +0000 |
| commit | 939683e5f8797f5baaf610f75e0f1fd31ca08567 (patch) | |
| tree | 06719b23b93f6f604670daeb2e24ceb493077cb1 /lib/nettle/pk.c | |
| parent | 423a1565d280107edd92684714ee22356200b038 (diff) | |
| parent | 27d552cd36bba22cae9ef9e65e861de507f85c5f (diff) | |
| download | gnutls-939683e5f8797f5baaf610f75e0f1fd31ca08567.tar.gz | |
Merge branch 'rsa_privkey_import' into 'master'
Fix optional arguments handling in gnutls_privkey_import_rsa_raw()
See merge request gnutls/gnutls!1318
Diffstat (limited to 'lib/nettle/pk.c')
| -rw-r--r-- | lib/nettle/pk.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/nettle/pk.c b/lib/nettle/pk.c index 588e9df502..e9a380857c 100644 --- a/lib/nettle/pk.c +++ b/lib/nettle/pk.c @@ -3275,22 +3275,22 @@ static int calc_rsa_exp(gnutls_pk_params_st * params) return GNUTLS_E_INTERNAL_ERROR; } - params->params[6] = params->params[7] = NULL; + params->params[RSA_E1] = params->params[RSA_E2] = NULL; - ret = _gnutls_mpi_init_multi(&tmp, ¶ms->params[6], ¶ms->params[7], NULL); + ret = _gnutls_mpi_init_multi(&tmp, ¶ms->params[RSA_E1], ¶ms->params[RSA_E2], NULL); if (ret < 0) return gnutls_assert_val(ret); /* [6] = d % p-1, [7] = d % q-1 */ - _gnutls_mpi_sub_ui(tmp, params->params[3], 1); + _gnutls_mpi_sub_ui(tmp, params->params[RSA_PRIME1], 1); ret = - _gnutls_mpi_modm(params->params[6], params->params[2] /*d */ , tmp); + _gnutls_mpi_modm(params->params[RSA_E1], params->params[RSA_PRIV] /*d */ , tmp); if (ret < 0) goto fail; - _gnutls_mpi_sub_ui(tmp, params->params[4], 1); + _gnutls_mpi_sub_ui(tmp, params->params[RSA_PRIME2], 1); ret = - _gnutls_mpi_modm(params->params[7], params->params[2] /*d */ , tmp); + _gnutls_mpi_modm(params->params[RSA_E2], params->params[RSA_PRIV] /*d */ , tmp); if (ret < 0) goto fail; @@ -3300,8 +3300,8 @@ static int calc_rsa_exp(gnutls_pk_params_st * params) fail: zrelease_mpi_key(&tmp); - zrelease_mpi_key(¶ms->params[6]); - zrelease_mpi_key(¶ms->params[7]); + zrelease_mpi_key(¶ms->params[RSA_E1]); + zrelease_mpi_key(¶ms->params[RSA_E2]); return ret; } @@ -3346,6 +3346,8 @@ wrap_nettle_pk_fixup(gnutls_pk_algorithm_t algo, zrelease_mpi_key(¶ms->params[RSA_E1]); zrelease_mpi_key(¶ms->params[RSA_E2]); + /* marks RSA_COEF as present */ + params->params_nr = RSA_PRIVATE_PARAMS - 2; ret = calc_rsa_exp(params); if (ret < 0) return gnutls_assert_val(ret); |