faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hash: add support for older nettle versions

Browse source 
Use nettle_hashes[] instead of nettle_get_hashes(), which is available
only in nettle >= 3.4. nettle_hashes[] is a symbol available in older
versions and may be renamed in future. In nettle >= 3.4 it is a macro
using nettle_get_hashes() for compatibility.
This commit is contained in:
Miroslav Lichvar 2018-03-15 08:18:29 +01:00
parent d34e611ec8
commit feca2399e4
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure vendored
View file

@ -867,7 +867,7 @@ if [ $feat_sechash = "1" ] && [ "x$HASH_LINK" = "x" ] && [ $try_nettle = "1" ];
test_link="`pkg_config --libs nettle`" test_link="`pkg_config --libs nettle`"
if test_code 'nettle' 'nettle/nettle-meta.h nettle/sha2.h' \ if test_code 'nettle' 'nettle/nettle-meta.h nettle/sha2.h' \
"$test_cflags" "$test_link" \ "$test_cflags" "$test_link" \
'return nettle_get_hashes()[0]->context_size;' 'return nettle_hashes[0]->context_size;'
then then
HASH_OBJ="hash_nettle.o" HASH_OBJ="hash_nettle.o"
HASH_LINK="$test_link" HASH_LINK="$test_link"

13
hash_nettle.c
View file

@ -58,7 +58,6 @@ static struct hash hashes[] = {
int int
HSH_GetHashId(const char *name) HSH_GetHashId(const char *name)
{ {
const struct nettle_hash *const *nhashes;
int id, nid; int id, nid;
for (id = 0; hashes[id].name; id++) { for (id = 0; hashes[id].name; id++) {
@ -72,19 +71,15 @@ HSH_GetHashId(const char *name)
if (hashes[id].context) if (hashes[id].context)
return id; return id;
nhashes = nettle_get_hashes(); for (nid = 0; nettle_hashes[nid]; nid++) {
if (!nhashes) if (!strcmp(hashes[id].int_name, nettle_hashes[nid]->name))
return -1;
for (nid = 0; nhashes[nid]; nid++) {
if (!strcmp(hashes[id].int_name, nhashes[nid]->name))
break; 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; 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); hashes[id].context = Malloc(hashes[id].nettle_hash->context_size);
return id; return id;