Merge branch 'bcrypt'

diff --cc ChangeLog
index 79c3e6e9b1581ee4d6b3b1fd86666f742d72efe5,28c79474420cafb97f76b1525014ec8cc4b1effd..8a2a19813dc63bd0125e131bef93a546f5db4456
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,19 -1,15 +1,31 @@@
+ 2020-07-01  Niels Möller  <nisse@lysator.liu.se>
+ 
+       * testsuite/bcrypt-test.c: New file. Moved bcrypt tests here.
+ 
+       Support for bcrypt, contributed by Stephen R. van den Berg.
+       * blowfish-bcrypt.c (blowfish_bcrypt_hash)
+       (blowfish_bcrypt_verify): New file, new functions.
+       * blowfish-internal.h: New header file, declaring internals needed
+       for bcrypt.
+       * testsuite/blowfish-test.c: Add bcrypt tests.
+       * nettle.texinfo (Cipher functions): Document bcrypt.
+ 
 +2020-06-30  Niels Möller  <nisse@lysator.liu.se>
 +
 +      * nettle.texinfo (Miscellaneous hash functions): New section, with
 +      Streebog documentation, contributed by Dmitry Baryshkov.
 +      (Top): Added some missing entries to the detailed node listing
 +
 +2020-06-29  Niels Möller  <nisse@lysator.liu.se>
 +
 +      * .gitlab-ci.yml: Add cross tests for powerpc64le, based on patch
 +      by Maamoun TK.
 +
 +2020-06-25  Niels Möller  <nisse@lysator.liu.se>
 +
 +      * x86_64/chacha-core-internal.asm (QROUND): Fix use of macro
 +      arguments. Spotted by Torbjörn Granlund.
 +
  2020-06-02  Niels Möller  <nisse@lysator.liu.se>
  
        * examples/nettle-benchmark.c (main): Delete call to

diff --cc nettle.texinfo
Simple merge