diff options
| author | Nikolay Sivov <nsivov@codeweavers.com> | 2020-09-01 19:15:02 +0300 |
|---|---|---|
| committer | Nikolay Sivov <nsivov@codeweavers.com> | 2020-09-01 19:22:35 +0300 |
| commit | e53fd9ba2510239fcd7f29ed8525e04137ef5cbc (patch) | |
| tree | 99637c060701cd846501f9a05ac8f720d2ef305b | |
| parent | 423a1565d280107edd92684714ee22356200b038 (diff) | |
| download | gnutls-e53fd9ba2510239fcd7f29ed8525e04137ef5cbc.tar.gz | |
Use symbols defined for RSA key parameter indices in more places.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
| -rw-r--r-- | lib/nettle/pk.c | 16 | ||||
| -rw-r--r-- | lib/x509/privkey.c | 10 |
2 files changed, 13 insertions, 13 deletions
diff --git a/lib/nettle/pk.c b/lib/nettle/pk.c index 588e9df502..94027bff86 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; } diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c index b26295e51b..3852064648 100644 --- a/lib/x509/privkey.c +++ b/lib/x509/privkey.c @@ -885,7 +885,7 @@ gnutls_x509_privkey_import_rsa_raw2(gnutls_x509_privkey_t key, gnutls_pk_params_init(&key->params); siz = m->size; - if (_gnutls_mpi_init_scan_nz(&key->params.params[0], m->data, siz)) { + if (_gnutls_mpi_init_scan_nz(&key->params.params[RSA_MODULUS], m->data, siz)) { gnutls_assert(); ret = GNUTLS_E_MPI_SCAN_FAILED; goto cleanup; @@ -893,7 +893,7 @@ gnutls_x509_privkey_import_rsa_raw2(gnutls_x509_privkey_t key, key->params.params_nr++; siz = e->size; - if (_gnutls_mpi_init_scan_nz(&key->params.params[1], e->data, siz)) { + if (_gnutls_mpi_init_scan_nz(&key->params.params[RSA_PUB], e->data, siz)) { gnutls_assert(); ret = GNUTLS_E_MPI_SCAN_FAILED; goto cleanup; @@ -901,7 +901,7 @@ gnutls_x509_privkey_import_rsa_raw2(gnutls_x509_privkey_t key, key->params.params_nr++; siz = d->size; - if (_gnutls_mpi_init_scan_nz(&key->params.params[2], d->data, siz)) { + if (_gnutls_mpi_init_scan_nz(&key->params.params[RSA_PRIV], d->data, siz)) { gnutls_assert(); ret = GNUTLS_E_MPI_SCAN_FAILED; goto cleanup; @@ -909,7 +909,7 @@ gnutls_x509_privkey_import_rsa_raw2(gnutls_x509_privkey_t key, key->params.params_nr++; siz = p->size; - if (_gnutls_mpi_init_scan_nz(&key->params.params[3], p->data, siz)) { + if (_gnutls_mpi_init_scan_nz(&key->params.params[RSA_PRIME1], p->data, siz)) { gnutls_assert(); ret = GNUTLS_E_MPI_SCAN_FAILED; goto cleanup; @@ -917,7 +917,7 @@ gnutls_x509_privkey_import_rsa_raw2(gnutls_x509_privkey_t key, key->params.params_nr++; siz = q->size; - if (_gnutls_mpi_init_scan_nz(&key->params.params[4], q->data, siz)) { + if (_gnutls_mpi_init_scan_nz(&key->params.params[RSA_PRIME2], q->data, siz)) { gnutls_assert(); ret = GNUTLS_E_MPI_SCAN_FAILED; goto cleanup; |