Merge branch 'block16-refactor' into master-updates

diff --cc ChangeLog
index 0e7cc359c296c86b4aa4870c7591c7d45449526c,c385ac062fa7e1d9cbe20eccb88d1925c5789307..e41d18981790e7c49982b12b46c822304b452bb5
--- 1/ChangeLog
--- 2/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:

diff --cc nettle-types.h
Simple merge