diff --git a/configure b/configure index d8b876e..a97ac78 100755 --- a/configure +++ b/configure @@ -867,7 +867,7 @@ if [ $feat_sechash = "1" ] && [ "x$HASH_LINK" = "x" ] && [ $try_nettle = "1" ]; test_link="`pkg_config --libs nettle`" if test_code 'nettle' 'nettle/nettle-meta.h nettle/sha2.h' \ "$test_cflags" "$test_link" \ - 'return nettle_get_hashes()[0]->context_size;' + 'return nettle_hashes[0]->context_size;' then HASH_OBJ="hash_nettle.o" HASH_LINK="$test_link" diff --git a/hash_nettle.c b/hash_nettle.c index cc9b8ad..2c3501d 100644 --- a/hash_nettle.c +++ b/hash_nettle.c @@ -58,7 +58,6 @@ static struct hash hashes[] = { int HSH_GetHashId(const char *name) { - const struct nettle_hash *const *nhashes; int id, nid; for (id = 0; hashes[id].name; id++) { @@ -72,19 +71,15 @@ HSH_GetHashId(const char *name) if (hashes[id].context) return id; - nhashes = nettle_get_hashes(); - if (!nhashes) - return -1; - - for (nid = 0; nhashes[nid]; nid++) { - if (!strcmp(hashes[id].int_name, nhashes[nid]->name)) + for (nid = 0; nettle_hashes[nid]; nid++) { + if (!strcmp(hashes[id].int_name, nettle_hashes[nid]->name)) break; } - if (!nhashes[nid] || !nhashes[nid]->context_size || !nhashes[nid]->init) + if (!nettle_hashes[nid] || !nettle_hashes[nid]->context_size || !nettle_hashes[nid]->init) return -1; - hashes[id].nettle_hash = nhashes[nid]; + hashes[id].nettle_hash = nettle_hashes[nid]; hashes[id].context = Malloc(hashes[id].nettle_hash->context_size); return id;