diff options
Diffstat (limited to 'lib/fips.c')
| -rw-r--r-- | lib/fips.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/fips.c b/lib/fips.c index 2715af599f..0169ab171a 100644 --- a/lib/fips.c +++ b/lib/fips.c @@ -135,9 +135,9 @@ void _gnutls_fips_mode_reset_zombie(void) } } -#define GNUTLS_LIBRARY_NAME "libgnutls.so.28" -#define NETTLE_LIBRARY_NAME "libnettle.so.4" -#define HOGWEED_LIBRARY_NAME "libhogweed.so.2" +#define GNUTLS_LIBRARY_NAME "libgnutls.so.30" +#define NETTLE_LIBRARY_NAME "libnettle.so.6" +#define HOGWEED_LIBRARY_NAME "libhogweed.so.4" #define GMP_LIBRARY_NAME "libgmp.so.10" #define HMAC_SUFFIX ".hmac" @@ -250,6 +250,13 @@ static unsigned check_binary_integrity(const char* libname, const char* symbol) } hmac_size = hex_data_size(data.size); + + /* trim eventual newlines from the end of the data read from file */ + while ((data.size > 0) && (data.data[data.size - 1] == '\n')) { + data.data[data.size - 1] = 0; + data.size--; + } + ret = gnutls_hex_decode(&data, hmac, &hmac_size); gnutls_free(data.data); |