From: Niels Möller Date: Fri, 4 Jun 2010 13:33:12 +0000 (+0200) Subject: Parameter rename. X-Git-Tag: camellia_32bit_20100720~29 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=730819200c3c91606fb52ddf00099ecfc4b24ce8;p=thirdparty%2Fnettle.git Parameter rename. Rev: nettle/bignum.h:1.8 Rev: nettle/der-iterator.c:1.2 --- diff --git a/bignum.h b/bignum.h index 9ebe1749..06287d2e 100644 --- a/bignum.h +++ b/bignum.h @@ -112,7 +112,7 @@ struct asn1_der_iterator; int nettle_asn1_der_get_bignum(struct asn1_der_iterator *iterator, - mpz_t x, unsigned limit); + mpz_t x, unsigned max_bits); #ifdef __cplusplus } diff --git a/der-iterator.c b/der-iterator.c index f137c446..a7244710 100644 --- a/der-iterator.c +++ b/der-iterator.c @@ -249,7 +249,7 @@ asn1_der_get_uint32(struct asn1_der_iterator *i, #if HAVE_LIBGMP int asn1_der_get_bignum(struct asn1_der_iterator *i, - mpz_t x, unsigned limit) + mpz_t x, unsigned max_bits) { if (i->length > 1 && ((i->data[0] == 0 && i->data[1] < 0x80) @@ -258,13 +258,13 @@ asn1_der_get_bignum(struct asn1_der_iterator *i, return 0; /* Allow some extra here, for leading sign octets. */ - if (limit && (8 * i->length > (16 + limit))) + if (max_bits && (8 * i->length > (16 + max_bits))) return 0; nettle_mpz_set_str_256_s(x, i->length, i->data); - /* FIXME: How to interpret a limit for negative numbers? */ - if (limit && mpz_sizeinbase(x, 2) > limit) + /* FIXME: How to interpret a max_bits for negative numbers? */ + if (max_bits && mpz_sizeinbase(x, 2) > max_bits) return 0; return 1;