mpi: remove unnecessary integer size conversion

The following pattern:

```c
size_t siz = prime->size;
if (_gnutls_mpi_init_scan_nz(&tmp_prime, prime->data, siz)) {
  ...
}
```

was previously written as:

```c
size_t siz = prime->size;
if (_gnutls_mpi_scan_nz (&tmp_prime, prime->data, &siz))
  ...
}
```

Now that _gnutls_mpi_init_scan_nz takes an immediate integer instead
of a pointer, we don't need to account for the integere size and thus
no conversion should be necessary.

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/lib/dh.c b/lib/dh.c
index 9fa6fb2772662a2c01e49d486ebed3a6ff83ba7b..baf68d271eb67cf8f0b22ea422ca24ce4928b173 100644 (file)
--- a/lib/dh.c
+++ b/lib/dh.c
@@ -315,16 +315,14 @@ int gnutls_dh_params_import_raw2(gnutls_dh_params_t dh_params,
                                 unsigned key_bits)
 {
        bigint_t tmp_prime, tmp_g;
-       size_t siz;
 
-       siz = prime->size;
-       if (_gnutls_mpi_init_scan_nz(&tmp_prime, prime->data, siz)) {
+       if (_gnutls_mpi_init_scan_nz(&tmp_prime, prime->data, prime->size)) {
                gnutls_assert();
                return GNUTLS_E_MPI_SCAN_FAILED;
        }
 
-       siz = generator->size;
-       if (_gnutls_mpi_init_scan_nz(&tmp_g, generator->data, siz)) {
+       if (_gnutls_mpi_init_scan_nz(&tmp_g, generator->data,
+                                    generator->size)) {
                _gnutls_mpi_release(&tmp_prime);
                gnutls_assert();
                return GNUTLS_E_MPI_SCAN_FAILED;

diff --git a/lib/pubkey.c b/lib/pubkey.c
index ca58ccc7c676cd64739223999b73ee759954890a..42d2f724f8744aeb38ef3534cf6bcf04e94d27ac 100644 (file)
--- a/lib/pubkey.c
+++ b/lib/pubkey.c
@@ -1894,8 +1894,6 @@ int gnutls_pubkey_import_dsa_raw(gnutls_pubkey_t key, const gnutls_datum_t *p,
                                 const gnutls_datum_t *g,
                                 const gnutls_datum_t *y)
 {
-       size_t siz = 0;
-
        if (key == NULL) {
                gnutls_assert();
                return GNUTLS_E_INVALID_REQUEST;
@@ -1904,29 +1902,29 @@ int gnutls_pubkey_import_dsa_raw(gnutls_pubkey_t key, const gnutls_datum_t *p,
        gnutls_pk_params_release(&key->params);
        gnutls_pk_params_init(&key->params);
 
-       siz = p->size;
-       if (_gnutls_mpi_init_scan_nz(&key->params.params[0], p->data, siz)) {
+       if (_gnutls_mpi_init_scan_nz(&key->params.params[0], p->data,
+                                    p->size)) {
                gnutls_assert();
                return GNUTLS_E_MPI_SCAN_FAILED;
        }
 
-       siz = q->size;
-       if (_gnutls_mpi_init_scan_nz(&key->params.params[1], q->data, siz)) {
+       if (_gnutls_mpi_init_scan_nz(&key->params.params[1], q->data,
+                                    q->size)) {
                gnutls_assert();
                _gnutls_mpi_release(&key->params.params[0]);
                return GNUTLS_E_MPI_SCAN_FAILED;
        }
 
-       siz = g->size;
-       if (_gnutls_mpi_init_scan_nz(&key->params.params[2], g->data, siz)) {
+       if (_gnutls_mpi_init_scan_nz(&key->params.params[2], g->data,
+                                    g->size)) {
                gnutls_assert();
                _gnutls_mpi_release(&key->params.params[1]);
                _gnutls_mpi_release(&key->params.params[0]);
                return GNUTLS_E_MPI_SCAN_FAILED;
        }
 
-       siz = y->size;
-       if (_gnutls_mpi_init_scan_nz(&key->params.params[3], y->data, siz)) {
+       if (_gnutls_mpi_init_scan_nz(&key->params.params[3], y->data,
+                                    y->size)) {
                gnutls_assert();
                _gnutls_mpi_release(&key->params.params[2]);
                _gnutls_mpi_release(&key->params.params[1]);

diff --git a/lib/x509/crq.c b/lib/x509/crq.c
index 0c5585b979effd9166ab49939c589d0493e26089..5576b6b49c2879a1dd34d13c1b3cc6d34523f71d 100644 (file)
--- a/lib/x509/crq.c
+++ b/lib/x509/crq.c
@@ -729,7 +729,6 @@ int gnutls_x509_crq_set_key_rsa_raw(gnutls_x509_crq_t crq,
                                    const gnutls_datum_t *e)
 {
        int result, ret;
-       size_t siz = 0;
        gnutls_pk_params_st temp_params;
 
        gnutls_pk_params_init(&temp_params);
@@ -741,15 +740,15 @@ int gnutls_x509_crq_set_key_rsa_raw(gnutls_x509_crq_t crq,
 
        memset(&temp_params, 0, sizeof(temp_params));
 
-       siz = m->size;
-       if (_gnutls_mpi_init_scan_nz(&temp_params.params[0], m->data, siz)) {
+       if (_gnutls_mpi_init_scan_nz(&temp_params.params[0], m->data,
+                                    m->size)) {
                gnutls_assert();
                ret = GNUTLS_E_MPI_SCAN_FAILED;
                goto error;
        }
 
-       siz = e->size;
-       if (_gnutls_mpi_init_scan_nz(&temp_params.params[1], e->data, siz)) {
+       if (_gnutls_mpi_init_scan_nz(&temp_params.params[1], e->data,
+                                    e->size)) {
                gnutls_assert();
                ret = GNUTLS_E_MPI_SCAN_FAILED;
                goto error;

diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index a7804ccabef33ede9776d234c38ef939b712a953..b575a776c76d07423723f8620c83c8fd7096f550 100644 (file)
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -876,7 +876,6 @@ int gnutls_x509_privkey_import_rsa_raw2(
        const gnutls_datum_t *e2)
 {
        int ret;
-       size_t siz = 0;
 
        if (key == NULL) {
                gnutls_assert();
@@ -885,18 +884,16 @@ int gnutls_x509_privkey_import_rsa_raw2(
 
        gnutls_pk_params_init(&key->params);
 
-       siz = m->size;
        if (_gnutls_mpi_init_scan_nz(&key->params.params[RSA_MODULUS], m->data,
-                                    siz)) {
+                                    m->size)) {
                gnutls_assert();
                ret = GNUTLS_E_MPI_SCAN_FAILED;
                goto cleanup;
        }
        key->params.params_nr++;
 
-       siz = e->size;
        if (_gnutls_mpi_init_scan_nz(&key->params.params[RSA_PUB], e->data,
-                                    siz)) {
+                                    e->size)) {
                gnutls_assert();
                ret = GNUTLS_E_MPI_SCAN_FAILED;
                goto cleanup;
@@ -904,9 +901,8 @@ int gnutls_x509_privkey_import_rsa_raw2(
        key->params.params_nr++;
 
        if (d) {
-               siz = d->size;
                if (_gnutls_mpi_init_scan_nz(&key->params.params[RSA_PRIV],
-                                            d->data, siz)) {
+                                            d->data, d->size)) {
                        gnutls_assert();
                        ret = GNUTLS_E_MPI_SCAN_FAILED;
                        goto cleanup;
@@ -914,18 +910,16 @@ int gnutls_x509_privkey_import_rsa_raw2(
                key->params.params_nr++;
        }
 
-       siz = p->size;
        if (_gnutls_mpi_init_scan_nz(&key->params.params[RSA_PRIME1], p->data,
-                                    siz)) {
+                                    p->size)) {
                gnutls_assert();
                ret = GNUTLS_E_MPI_SCAN_FAILED;
                goto cleanup;
        }
        key->params.params_nr++;
 
-       siz = q->size;
        if (_gnutls_mpi_init_scan_nz(&key->params.params[RSA_PRIME2], q->data,
-                                    siz)) {
+                                    q->size)) {
                gnutls_assert();
                ret = GNUTLS_E_MPI_SCAN_FAILED;
                goto cleanup;
@@ -933,9 +927,8 @@ int gnutls_x509_privkey_import_rsa_raw2(
        key->params.params_nr++;
 
        if (u) {
-               siz = u->size;
                if (_gnutls_mpi_init_scan_nz(&key->params.params[RSA_COEF],
-                                            u->data, siz)) {
+                                            u->data, u->size)) {
                        gnutls_assert();
                        ret = GNUTLS_E_MPI_SCAN_FAILED;
                        goto cleanup;
@@ -944,18 +937,16 @@ int gnutls_x509_privkey_import_rsa_raw2(
        }
 
        if (e1 && e2) {
-               siz = e1->size;
                if (_gnutls_mpi_init_scan_nz(&key->params.params[RSA_E1],
-                                            e1->data, siz)) {
+                                            e1->data, e1->size)) {
                        gnutls_assert();
                        ret = GNUTLS_E_MPI_SCAN_FAILED;
                        goto cleanup;
                }
                key->params.params_nr++;
 
-               siz = e2->size;
                if (_gnutls_mpi_init_scan_nz(&key->params.params[RSA_E2],
-                                            e2->data, siz)) {
+                                            e2->data, e2->size)) {
                        gnutls_assert();
                        ret = GNUTLS_E_MPI_SCAN_FAILED;
                        goto cleanup;
@@ -1012,7 +1003,6 @@ int gnutls_x509_privkey_import_dsa_raw(gnutls_x509_privkey_t key,
                                       const gnutls_datum_t *x)
 {
        int ret;
-       size_t siz = 0;
 
        if (key == NULL) {
                gnutls_assert();
@@ -1021,39 +1011,38 @@ int gnutls_x509_privkey_import_dsa_raw(gnutls_x509_privkey_t key,
 
        gnutls_pk_params_init(&key->params);
 
-       siz = p->size;
-       if (_gnutls_mpi_init_scan_nz(&key->params.params[0], p->data, siz)) {
+       if (_gnutls_mpi_init_scan_nz(&key->params.params[0], p->data,
+                                    p->size)) {
                gnutls_assert();
                ret = GNUTLS_E_MPI_SCAN_FAILED;
                goto cleanup;
        }
 
-       siz = q->size;
-       if (_gnutls_mpi_init_scan_nz(&key->params.params[1], q->data, siz)) {
+       if (_gnutls_mpi_init_scan_nz(&key->params.params[1], q->data,
+                                    q->size)) {
                gnutls_assert();
                ret = GNUTLS_E_MPI_SCAN_FAILED;
                goto cleanup;
        }
 
-       siz = g->size;
-       if (_gnutls_mpi_init_scan_nz(&key->params.params[2], g->data, siz)) {
+       if (_gnutls_mpi_init_scan_nz(&key->params.params[2], g->data,
+                                    g->size)) {
                gnutls_assert();
                ret = GNUTLS_E_MPI_SCAN_FAILED;
                goto cleanup;
        }
 
        if (y) {
-               siz = y->size;
                if (_gnutls_mpi_init_scan_nz(&key->params.params[3], y->data,
-                                            siz)) {
+                                            y->size)) {
                        gnutls_assert();
                        ret = GNUTLS_E_MPI_SCAN_FAILED;
                        goto cleanup;
                }
        }
 
-       siz = x->size;
-       if (_gnutls_mpi_init_scan_nz(&key->params.params[4], x->data, siz)) {
+       if (_gnutls_mpi_init_scan_nz(&key->params.params[4], x->data,
+                                    x->size)) {
                gnutls_assert();
                ret = GNUTLS_E_MPI_SCAN_FAILED;
                goto cleanup;