From: Niels Möller <nisse@lysator.liu.se>
Date: Tue, 2 Jul 2019 12:28:04 +0000 (+0200)
Subject: Merge branch 'siv-mode' into master-updates
X-Git-Tag: nettle_3.6rc1~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98bc919114f2272a8b2537467213de4a0fb776e4;p=thirdparty%2Fnettle.git

Merge branch 'siv-mode' into master-updates
---

98bc919114f2272a8b2537467213de4a0fb776e4
diff --cc ChangeLog
index 59014632,436ee556..1bc2549a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,21 -1,61 +1,79 @@@
+ 2019-06-06  Niels Möller  <nisse@lysator.liu.se>
+ 
 -	Update for cmac changes, enabling const for the _message fucntions.
++	Update for cmac changes, enabling const for the _message functions.
+ 	* siv-cmac.c (_siv_s2v): Take a const struct cmac128_key as argument,
+ 	and use a local struct cmac128_ctx for message-specific state.
+ 	(siv_cmac_set_key): Take a struct cmac128_key as argument. Updated
+ 	callers.
+ 	(siv_cmac_encrypt_message, siv_cmac_decrypt_message): Take a const
+ 	struct cmac128_key as argument. Updated callers.
+ 
+ 	* siv-cmac.h (SIV_CMAC_CTX): Changed to use struct cmac128_key
+ 	rather than struct cmac128_ctx.
+ 
+ 	* siv-cmac-aes256.c (siv_cmac_aes256_encrypt_message)
+ 	(siv_cmac_aes256_decrypt_message): Likewise.
+ 	* siv-cmac-aes128.c (siv_cmac_aes128_encrypt_message)
+ 	(siv_cmac_aes128_decrypt_message): The ctx argument made const.
+ 
+ 2019-05-15  Niels Möller  <nisse@lysator.liu.se>
+ 
+ 	* siv-cmac.h (SIV_CMAC_AES128_KEY_SIZE, SIV_CMAC_AES256_KEY_SIZE):
+ 	New constants.
+ 	* testsuite/siv-test.c: Simplify tests a little.
+ 
+ 	* siv-cmac.h (SIV_MIN_NONCE_SIZE): New constant, 1.
+ 	* siv-cmac.c (_siv_s2v): Require non-empty nonce.
+ 	* nettle.texinfo (SIV-CMAC): Update documentation.
+ 
+ 2019-05-06  Niels Möller  <nisse@lysator.liu.se>
+ 
+ 	SIV-CMAC mode, based on patch by Nikos Mavrogiannopoulos:
+ 	* siv-cmac.h (SIV_BLOCK_SIZE, SIV_DIGEST_SIZE): New constants.
+ 	(SIV_CMAC_CTX): New macro.
+ 	(struct siv_cmac_aes128_ctx, struct siv_cmac_aes256_ctx): New
+ 	context structs.
+ 	* siv-cmac.c (_siv_s2v, siv_cmac_set_key)
+ 	(siv_cmac_encrypt_message)
+ 	(siv_cmac_decrypt_message): New file, new functions.
+ 	* siv-cmac-aes128.c (siv_cmac_aes128_set_key)
+ 	(siv_cmac_aes128_encrypt_message)
+ 	(siv_cmac_aes128_decrypt_message): New file, new functions.
+ 	* siv-cmac-aes256.c (siv_cmac_aes256_set_key)
+ 	(siv_cmac_aes256_encrypt_message)
+ 	(siv_cmac_aes256_decrypt_message): New file, new functions.
+ 	* Makefile.in (nettle_SOURCES): Add siv-cmac source files.
+ 	(HEADERS): Add siv-cmac.h.
+ 	* testsuite/siv-test.c: New file.
+ 	* testsuite/Makefile.in (TS_NETTLE_SOURCES): Added siv-test.c
+ 	* nettle.texinfo (SIV-CMAC): Documentation.
+ 
+ 2019-04-30  Niels Möller  <nisse@lysator.liu.se>
+ 
+ 	Based on a patch contributed by Nikos Mavrogiannopoulos.
+ 	* cmac.c (_cmac128_block_mulx): Renamed function...
+ 	(block_mulx): ... from old name.
+ 	* cmac-internal.h (_cmac128_block_mulx): New file, declare function.
+ 	* Makefile.in (DISTFILES): Added cmac-internal.h.
+ 
 +2019-06-26  Niels Möller  <nisse@lysator.liu.se>
 +
 +	* Released nettle-3.5.1.
 +
 +	* configure.ac: Update version number to 3.5.1.
 +
 +	* Makefile.in (distdir): Add x86_64/sha_ni to list of distributed
 +	directories.
 +
 +	* Released nettle-3.5.
 +
 +2019-06-25  Niels Möller  <nisse@lysator.liu.se>
 +
 +	* config.sub: Update to 2019-05-23 version, from savannah's
 +	config.git.
 +	* config.guess: Update to 2019-06-10 version, from savannah's
 +	config.git. Adds recognition of mips R6 and riscv.
 +
  2019-06-05  Niels Möller  <nisse@lysator.liu.se>
  
  	Further separation of CMAC per-message state from the