[taler-anastasis] 10/12: merge

[gnunet]

This is an automated email from the git hooks/post-receive script.

dennis-neufeld pushed a commit to branch master
in repository anastasis.

commit 7ab8f4110be44a41f808fe0211306eee356615e0
Merge: 3060e53 f3a0f2e
Author: Dennis Neufeld <address@hidden>
AuthorDate: Mon Apr 20 06:14:00 2020 +0000

    merge

 doc/thesis/design.tex   |   2 +-
 src/include/anastasis.h |  24 +++++++--
 src/lib/anastasis.c     | 141 ++++++++++++++++++++++++++++++++++++++++--------
 3 files changed, 139 insertions(+), 28 deletions(-)

diff --cc doc/thesis/design.tex
index 8bd3e54,8bd3e54..10f1239
--- a/doc/thesis/design.tex
+++ b/doc/thesis/design.tex
@@@ -98,7 -98,7 +98,7 @@@ Before every encryption a 32-byte nonc
  (iv0, key0) = HKDF(key_id, nonce0, "erd", keysize + ivsize)
  (encrypted_recovery_document, aes_gcm_tag) = AES256_GCM(recovery_document, 
key0, iv0) 
  (iv_i, key_i) = HKDF(key_id, nonce_i, "eks", [optional data], keysize + 
ivsize) 
--(encrypted_key_share_i, aes_gcm_tag_i) = AES256_GCM(key_share_i, key_i, iv_i) 
++(encrypted_keyshare_i, aes_gcm_tag_i) = AES256_GCM(key_share_i, key_i, iv_i) 
  \end{lstlisting}
  
  \textbf{encrypted\_recovery\_document}: The encrypted recovery document which 
contains the escrow methods, policies and the encrypted core secret. \\

-- 
To stop receiving notification emails like this one, please contact
address@hidden.