diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2019-07-22 12:21:29 +0000 |
---|---|---|
committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2019-07-22 12:21:29 +0000 |
commit | 419f0b4eaa0363050a63eed479ce536edac419eb (patch) | |
tree | bbf6116fc4d87a6bddfd02d13960c94bbb1ef6ba /lib/nettle/cipher.c | |
parent | c3083c9555296973b6dfd7b4561ebf2300815605 (diff) | |
parent | 5df63c6ffba10ecdb3660531ad67424eb14d8552 (diff) | |
download | gnutls-419f0b4eaa0363050a63eed479ce536edac419eb.tar.gz |
Merge branch 'fix-gost' into 'master'
nettle/gost: support building with GOST-enabled Nettle
See merge request gnutls/gnutls!1044
Diffstat (limited to 'lib/nettle/cipher.c')
-rw-r--r-- | lib/nettle/cipher.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/nettle/cipher.c b/lib/nettle/cipher.c index 632528140a..09032f353d 100644 --- a/lib/nettle/cipher.c +++ b/lib/nettle/cipher.c @@ -35,7 +35,11 @@ #include <nettle/des.h> #include <nettle/version.h> #if ENABLE_GOST +#ifndef HAVE_NETTLE_GOST28147_SET_KEY #include "gost/gost28147.h" +#else +#include <nettle/gost28147.h> +#endif #endif #include <nettle/nettle-meta.h> #include <nettle/cbc.h> |