From: Niels Möller <nisse@lysator.liu.se>
Date: Mon, 6 Jul 2020 08:58:18 +0000 (+0200)
Subject: Merge branch 'bcrypt'
X-Git-Tag: nettle_3.7rc1~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdf2be4683be14dd5d570e1e3907402fbf92927a;p=thirdparty%2Fnettle.git

Merge branch 'bcrypt'
---

bdf2be4683be14dd5d570e1e3907402fbf92927a
diff --cc ChangeLog
index 79c3e6e9,28c79474..8a2a1981
--- a/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