shachain: add shachain_next_index()

[ccan] / ccan / crypto / shachain / shachain.c

diff --git a/ccan/crypto/shachain/shachain.c b/ccan/crypto/shachain/shachain.c
index 6cfb7244f981472994c813eb8d91fb72df99fd75..d4508a05a0f7addf2e33442ff1f13d3564bab9e7 100644 (file)
--- a/ccan/crypto/shachain/shachain.c
+++ b/ccan/crypto/shachain/shachain.c
@@ -5,21 +5,19 @@
 #include <string.h>
 #include <assert.h>
 
-#define INDEX_BITS ((sizeof(shachain_index_t)) * CHAR_BIT)
-
 static void change_bit(unsigned char *arr, size_t index)
 {
        arr[index / CHAR_BIT] ^= (1 << (index % CHAR_BIT));
 }
 
-static int count_trailing_zeroes(shachain_index_t index)
+static unsigned int count_trailing_zeroes(shachain_index_t index)
 {
 #if HAVE_BUILTIN_CTZLL
-       return index ? __builtin_ctzll(index) : INDEX_BITS;
+       return index ? (unsigned int)__builtin_ctzll(index) : SHACHAIN_BITS;
 #else
-       int i;
+       unsigned int i;
 
-       for (i = 0; i < INDEX_BITS; i++) {
+       for (i = 0; i < SHACHAIN_BITS; i++) {
                if (index & (1ULL << i))
                        break;
        }
@@ -68,20 +66,25 @@ void shachain_from_seed(const struct sha256 *seed, shachain_index_t index,
        derive(0, index, seed, hash);
 }
 
+shachain_index_t shachain_next_index(const struct shachain *chain)
+{
+       return chain->min_index - 1;
+}
+
 void shachain_init(struct shachain *chain)
 {
        chain->num_valid = 0;
-       chain->min_index = 0;
+       /* This is 0 in the case where SHACHAIN_BITS is 64. */
+       chain->min_index = (shachain_index_t)((UINT64_MAX >> (64 - SHACHAIN_BITS)) + 1);
 }
 
 bool shachain_add_hash(struct shachain *chain,
                       shachain_index_t index, const struct sha256 *hash)
 {
-       int i, pos;
+       unsigned int i, pos;
 
        /* You have to insert them in order! */
-       assert(index == chain->min_index - 1 ||
-              (index == (shachain_index_t)(-1ULL) && chain->num_valid == 0));
+       assert(index == shachain_next_index(chain));
 
        pos = count_trailing_zeroes(index);
 
@@ -107,7 +110,7 @@ bool shachain_add_hash(struct shachain *chain,
 bool shachain_get_hash(const struct shachain *chain,
                       shachain_index_t index, struct sha256 *hash)
 {
-       int i;
+       unsigned int i;
 
        for (i = 0; i < chain->num_valid; i++) {
                /* If we can get from key to index only by resetting bits,