From: Niels Möller <nisse@lysator.liu.se>
Date: Fri, 23 Aug 2019 04:31:13 +0000 (+0200)
Subject: Merge branch 'block16-refactor' into master-updates
X-Git-Tag: nettle_3.6rc1~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7aa7ae63487c064b9b1eedfaaf6bbaf4868992f1;p=thirdparty%2Fnettle.git

Merge branch 'block16-refactor' into master-updates
---

7aa7ae63487c064b9b1eedfaaf6bbaf4868992f1
diff --cc ChangeLog
index 0e7cc359,c385ac06..e41d1898
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,9 +1,20 @@@
+ 2019-07-08  Niels Möller  <nisse@lysator.liu.se>
+ 
+ 	* nettle-types.h (union nettle_block16): Mark w member as deprecated.
+ 	* eax.c (block16_xor): Use uint64_t member of nettle_block16.
+ 	* gcm.c (gcm_gf_add, gcm_gf_shift, gcm_gf_shift_8): Likewise.
+ 
 +2019-07-10  Niels Möller  <nisse@lysator.liu.se>
 +
 +	From Dmitry Eremin-Solenikov:
 +	* cmac64.c (_cmac64_block_mulx, cmac64_set_key, cmac64_init)
 +	(cmac64_update, cmac64_digest): New file, new functions.
 +	* cmac-des3.c (cmac_des3_set_key, cmac_des3_update)
 +	(cmac_des3_digest): New file, new functions.
 +	* cmac.h: Add cmac64 and cmac_des3 declarations.
 +	* Makefile.in (nettle_SOURCES): Add cmac64.c and cmac-des3.c.
 +	* testsuite/cmac-test.c (test_main): Add tests for cmac_des3.
 +
  2019-07-02  Niels Möller  <nisse@lysator.liu.se>
  
  	From Dmitry Eremin-Solenikov: