diff options
| -rw-r--r-- | bignum-random.c | 2 | ||||
| -rw-r--r-- | dsa-keygen.c | 4 | ||||
| -rw-r--r-- | dsa.c | 2 | ||||
| -rw-r--r-- | pgp-encode.c | 2 | ||||
| -rw-r--r-- | rsa-compat.c | 32 | ||||
| -rw-r--r-- | rsa-encrypt.c | 2 | ||||
| -rw-r--r-- | rsa_md5.c | 2 | ||||
| -rw-r--r-- | rsa_sha1.c | 2 |
8 files changed, 24 insertions, 24 deletions
diff --git a/bignum-random.c b/bignum-random.c index 24dd7c21..145ed9b0 100644 --- a/bignum-random.c +++ b/bignum-random.c @@ -43,7 +43,7 @@ nettle_mpz_random_size(mpz_t x, random(ctx, length, data); - nettle_mpz_set_str_256(x, length, data); + nettle_mpz_set_str_256_u(x, length, data); if (bits % 8) mpz_fdiv_r_2exp(x, x, bits); diff --git a/dsa-keygen.c b/dsa-keygen.c index f5ef6000..abadb4d8 100644 --- a/dsa-keygen.c +++ b/dsa-keygen.c @@ -102,7 +102,7 @@ dsa_nist_gen(mpz_t p, mpz_t q, h1[0] |= 0x80; h1[SHA1_DIGEST_SIZE - 1] |= 1; - nettle_mpz_set_str_256(q, SHA1_DIGEST_SIZE, h1); + nettle_mpz_set_str_256_u(q, SHA1_DIGEST_SIZE, h1); /* The spec says that we should use 18 iterations of * miller-rabin. For performance, we want to do some trial @@ -134,7 +134,7 @@ dsa_nist_gen(mpz_t p, mpz_t q, mpz_add_ui(t, t, j + k); hash(t, buffer + ( (n-k) * SHA1_DIGEST_SIZE)); } - nettle_mpz_set_str_256(p, size, buffer); + nettle_mpz_set_str_256_u(p, size, buffer); mpz_fdiv_r_2exp(p, p, L); mpz_setbit(p, L-1); @@ -85,7 +85,7 @@ _dsa_hash(mpz_t x, struct sha1_ctx *hash) uint8_t digest[SHA1_DIGEST_SIZE]; sha1_digest(hash, sizeof(digest), digest); - nettle_mpz_set_str_256(x, sizeof(digest), digest); + nettle_mpz_set_str_256_u(x, sizeof(digest), digest); } #endif /* WITH_PUBLIC_KEY */ diff --git a/pgp-encode.c b/pgp-encode.c index 297f20b5..744326ef 100644 --- a/pgp-encode.c +++ b/pgp-encode.c @@ -72,7 +72,7 @@ pgp_put_mpi(struct nettle_buffer *buffer, mpz_t x) if (!p) return 0; - nettle_mpz_set_str_256(x, octets, p); + nettle_mpz_set_str_256_u(x, octets, p); return 1; } diff --git a/rsa-compat.c b/rsa-compat.c index 29c29b8c..79e3858f 100644 --- a/rsa-compat.c +++ b/rsa-compat.c @@ -61,16 +61,16 @@ R_SignFinal(R_SIGNATURE_CTX *ctx, struct rsa_private_key k; int res; - nettle_mpz_init_set_str_256(k.p, - MAX_RSA_MODULUS_LEN, key->prime[0]); - nettle_mpz_init_set_str_256(k.q, - MAX_RSA_MODULUS_LEN, key->prime[1]); - nettle_mpz_init_set_str_256(k.a, - MAX_RSA_MODULUS_LEN, key->primeExponent[0]); - nettle_mpz_init_set_str_256(k.b, - MAX_RSA_MODULUS_LEN, key->primeExponent[1]); - nettle_mpz_init_set_str_256(k.c, - MAX_RSA_MODULUS_LEN, key->coefficient); + nettle_mpz_init_set_str_256_u(k.p, + MAX_RSA_MODULUS_LEN, key->prime[0]); + nettle_mpz_init_set_str_256_u(k.q, + MAX_RSA_MODULUS_LEN, key->prime[1]); + nettle_mpz_init_set_str_256_u(k.a, + MAX_RSA_MODULUS_LEN, key->primeExponent[0]); + nettle_mpz_init_set_str_256_u(k.b, + MAX_RSA_MODULUS_LEN, key->primeExponent[1]); + nettle_mpz_init_set_str_256_u(k.c, + MAX_RSA_MODULUS_LEN, key->coefficient); if (rsa_prepare_private_key(&k) && (k.size <= MAX_RSA_MODULUS_LEN)) { @@ -124,17 +124,17 @@ R_VerifyFinal(R_SIGNATURE_CTX *ctx, struct rsa_public_key k; int res; - nettle_mpz_init_set_str_256(k.n, - MAX_RSA_MODULUS_LEN, key->modulus); - nettle_mpz_init_set_str_256(k.e, - MAX_RSA_MODULUS_LEN, key->exponent); + nettle_mpz_init_set_str_256_u(k.n, + MAX_RSA_MODULUS_LEN, key->modulus); + nettle_mpz_init_set_str_256_u(k.e, + MAX_RSA_MODULUS_LEN, key->exponent); if (rsa_prepare_public_key(&k) && (k.size == length)) { mpz_t s; - nettle_mpz_init_set_str_256(s, - k.size, signature); + nettle_mpz_init_set_str_256_u(s, + k.size, signature); res = rsa_md5_verify(&k, &ctx->hash, s) ? RE_SUCCESS : RE_SIGNATURE; diff --git a/rsa-encrypt.c b/rsa-encrypt.c index 285f974d..ef2e72f3 100644 --- a/rsa-encrypt.c +++ b/rsa-encrypt.c @@ -70,7 +70,7 @@ rsa_encrypt(const struct rsa_public_key *key, memcpy(em + 1 + padding, message, length); - nettle_mpz_set_str_256(gibbberish, key->size - 1, em); + nettle_mpz_set_str_256_u(gibbberish, key->size - 1, em); mpz_powm(gibbberish, gibbberish, key->e, key->n); return 1; @@ -128,7 +128,7 @@ pkcs1_encode_md5(mpz_t m, unsigned length, struct md5_ctx *hash) em[0] = 1; memset(em + 1, 0xff, i - 1); - nettle_mpz_set_str_256(m, length, em); + nettle_mpz_set_str_256_u(m, length, em); } #endif /* WITH_PUBLIC_KEY */ @@ -128,7 +128,7 @@ pkcs1_encode_sha1(mpz_t m, unsigned length, struct sha1_ctx *hash) em[0] = 1; memset(em + 1, 0xff, i - 1); - nettle_mpz_set_str_256(m, length, em); + nettle_mpz_set_str_256_u(m, length, em); } #endif /* WITH_PUBLIC_KEY */ |