[taler-anastasis] branch master updated (6da74eb -> 72e3029)

[gnunet]

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

grothoff pushed a change to branch master
in repository anastasis.

 discard 6da74eb  worked on fixing uuid issue... still something wrong rebase 
.gitignore vgcore
 discard a0af88a  fix wrong GNUNET_assert usage...
 discard 7ab8f41  merge
 discard f3a0f2e  uncrustify
 discard c04ec7d  secretshare
 discard 3060e53  .gitignore
 discard c82c6fe  .gitignore
 discard 54869f6  worked on keyshare lookup api
 discard 4b0bea5  worked on keyshare lookup testing
 discard 1351ceb  fixed compiling warnings
 discard 9f62d6c  fixed compiling errors
 discard 3d9ffee  worked on keyshare request
 discard b40824e  worked on keyshare request
 discard e9b747b  modified header
 discard fc60a08  modified salt request again :D
     new 72e3029  modified salt request again :D

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (6da74eb)
            \
             N -- N -- N   refs/heads/master (72e3029)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 doc/thesis/design.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/thesis/design.tex b/doc/thesis/design.tex
index 10f1239..8bd3e54 100644
--- a/doc/thesis/design.tex
+++ b/doc/thesis/design.tex
@@ -98,7 +98,7 @@ Before every encryption a 32-byte nonce is generated. From 
this the symmetric ke
 (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_keyshare_i, aes_gcm_tag_i) = AES256_GCM(key_share_i, key_i, iv_i) 
+(encrypted_key_share_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.