merge with head of branch

2017-02-01 15:03:57 +01:00
parent 00ebfbb0bc 396d59ff22
commit 094ac2f3ea
5 changed files with 5 additions and 27 deletions
@@ -192,7 +192,7 @@ int stream_encrypt_eea2(stream_cipher_t *stream_cipher, uint8_t **out)
  }
 #endif

-#if NETTLE_VERSION_MAJOR < 3
+#if !defined(NETTLE_VERSION_MAJOR) || NETTLE_VERSION_MAJOR < 3
  nettle_aes128.set_encrypt_key(ctx, stream_cipher->key_length,
                                stream_cipher->key);
 #else