From 47eae4be510778d8fe461d9f722a34adb596439c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se> Date: Fri, 26 Apr 2013 14:51:49 +0200 Subject: [PATCH] Use size_t for ecc functions. --- ecc-ecdsa-sign.c | 2 +- ecc-ecdsa-verify.c | 2 +- ecc-hash.c | 4 ++-- ecc-internal.h | 2 +- ecdsa-sign.c | 2 +- ecdsa-verify.c | 2 +- ecdsa.h | 8 ++++---- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ecc-ecdsa-sign.c b/ecc-ecdsa-sign.c index cdf37746..c17a9ecc 100644 --- a/ecc-ecdsa-sign.c +++ b/ecc-ecdsa-sign.c @@ -48,7 +48,7 @@ ecc_ecdsa_sign (const struct ecc_curve *ecc, /* Random nonce, must be invertible mod ecc group order. */ const mp_limb_t *kp, - unsigned length, const uint8_t *digest, + size_t length, const uint8_t *digest, mp_limb_t *rp, mp_limb_t *sp, mp_limb_t *scratch) { diff --git a/ecc-ecdsa-verify.c b/ecc-ecdsa-verify.c index f24eff37..9b0dd6f7 100644 --- a/ecc-ecdsa-verify.c +++ b/ecc-ecdsa-verify.c @@ -62,7 +62,7 @@ ecc_ecdsa_verify_itch (const struct ecc_curve *ecc) int ecc_ecdsa_verify (const struct ecc_curve *ecc, const mp_limb_t *pp, /* Public key */ - unsigned length, const uint8_t *digest, + size_t length, const uint8_t *digest, const mp_limb_t *rp, const mp_limb_t *sp, mp_limb_t *scratch) { diff --git a/ecc-hash.c b/ecc-hash.c index f63544fb..7b8a0a76 100644 --- a/ecc-hash.c +++ b/ecc-hash.c @@ -41,9 +41,9 @@ void ecc_hash (const struct ecc_curve *ecc, mp_limb_t *hp, - unsigned length, const uint8_t *digest) + size_t length, const uint8_t *digest) { - if (length > ((unsigned) ecc->bit_size + 7) / 8) + if (length > ((size_t) ecc->bit_size + 7) / 8) length = (ecc->bit_size + 7) / 8; mpn_set_base256 (hp, ecc->size + 1, digest, length); diff --git a/ecc-internal.h b/ecc-internal.h index e8974fe4..014716da 100644 --- a/ecc-internal.h +++ b/ecc-internal.h @@ -202,7 +202,7 @@ ecc_mod (mp_limb_t *rp, mp_size_t rn, mp_size_t mn, void ecc_hash (const struct ecc_curve *ecc, mp_limb_t *hp, - unsigned length, const uint8_t *digest); + size_t length, const uint8_t *digest); void cnd_copy (int cnd, mp_limb_t *rp, const mp_limb_t *ap, mp_size_t n); diff --git a/ecdsa-sign.c b/ecdsa-sign.c index 2ee019c8..13d8cac1 100644 --- a/ecdsa-sign.c +++ b/ecdsa-sign.c @@ -36,7 +36,7 @@ void ecdsa_sign (const struct ecc_scalar *key, void *random_ctx, nettle_random_func *random, - unsigned digest_length, + size_t digest_length, const uint8_t *digest, struct dsa_signature *signature) { diff --git a/ecdsa-verify.c b/ecdsa-verify.c index d889d780..7aa72008 100644 --- a/ecdsa-verify.c +++ b/ecdsa-verify.c @@ -34,7 +34,7 @@ int ecdsa_verify (const struct ecc_point *pub, - unsigned length, const uint8_t *digest, + size_t length, const uint8_t *digest, const struct dsa_signature *signature) { mp_limb_t size = pub->ecc->size; diff --git a/ecdsa.h b/ecdsa.h index 17267a92..ec6ac921 100644 --- a/ecdsa.h +++ b/ecdsa.h @@ -48,13 +48,13 @@ extern "C" { void ecdsa_sign (const struct ecc_scalar *key, void *random_ctx, nettle_random_func *random, - unsigned digest_length, + size_t digest_length, const uint8_t *digest, struct dsa_signature *signature); int ecdsa_verify (const struct ecc_point *pub, - unsigned length, const uint8_t *digest, + size_t length, const uint8_t *digest, const struct dsa_signature *signature); void @@ -72,7 +72,7 @@ ecc_ecdsa_sign (const struct ecc_curve *ecc, /* Random nonce, must be invertible mod ecc group order. */ const mp_limb_t *kp, - unsigned length, const uint8_t *digest, + size_t length, const uint8_t *digest, mp_limb_t *rp, mp_limb_t *sp, mp_limb_t *scratch); @@ -82,7 +82,7 @@ ecc_ecdsa_verify_itch (const struct ecc_curve *ecc); int ecc_ecdsa_verify (const struct ecc_curve *ecc, const mp_limb_t *pp, /* Public key */ - unsigned length, const uint8_t *digest, + size_t length, const uint8_t *digest, const mp_limb_t *rp, const mp_limb_t *sp, mp_limb_t *scratch); -- GitLab