mirror of https://github.com/zcash/zips.git
Fix the definition of P^shared.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
parent
91ecf4ff93
commit
e2d08d1073
Binary file not shown.
|
@ -164,7 +164,7 @@
|
||||||
\newcommand{\CRHbox}[1]{\CRH\left(\;\raisebox{-1.3ex}{\usebox{#1}}\;\right)}
|
\newcommand{\CRHbox}[1]{\CRH\left(\;\raisebox{-1.3ex}{\usebox{#1}}\;\right)}
|
||||||
\newcommand{\FullHash}{\mathtt{SHA256}}
|
\newcommand{\FullHash}{\mathtt{SHA256}}
|
||||||
\newcommand{\FullHashbox}[1]{\FullHash\left(\;\raisebox{-1.3ex}{\usebox{#1}}\;\right)}
|
\newcommand{\FullHashbox}[1]{\FullHash\left(\;\raisebox{-1.3ex}{\usebox{#1}}\;\right)}
|
||||||
\newcommand{\Justthebox}[1]{\;\raisebox{-1.3ex}{\usebox{#1}}\;}
|
\newcommand{\Justthebox}[2]{\;\raisebox{#2}{\usebox{#1}}\;}
|
||||||
\newcommand{\PRF}[2]{\mathsf{{PRF}^{#2}_\mathnormal{#1}}}
|
\newcommand{\PRF}[2]{\mathsf{{PRF}^{#2}_\mathnormal{#1}}}
|
||||||
\newcommand{\PRFaddr}[1]{\PRF{#1}{addr}}
|
\newcommand{\PRFaddr}[1]{\PRF{#1}{addr}}
|
||||||
\newcommand{\PRFsn}[1]{\PRF{#1}{sn}}
|
\newcommand{\PRFsn}[1]{\PRF{#1}{sn}}
|
||||||
|
@ -879,10 +879,13 @@ All of the resulting ciphertexts are combined to form a \coinsCiphertext.
|
||||||
\newsavebox{\sharedbox}
|
\newsavebox{\sharedbox}
|
||||||
\begin{lrbox}{\sharedbox}
|
\begin{lrbox}{\sharedbox}
|
||||||
\setchanged
|
\setchanged
|
||||||
\begin{bytefield}[bitwidth=0.045em]{768}
|
\begin{bytefield}[bitwidth=0.045em]{512}
|
||||||
\bitbox{256}{256 bit $\TransmitPublicNew{\mathrm{1}}$}
|
\bitbox{256}{256 bit $\TransmitKey{\mathrm{1}}$} &
|
||||||
\bitbox{40}{...}
|
\bitbox{40}{...} &
|
||||||
\bitbox{256}{256 bit $\TransmitPublicNew{\NNew}$}
|
\bitbox{256}{256 bit $\TransmitKey{\NNew}$} \\
|
||||||
|
\bitbox{256}{256 bit $\TransmitPublicNew{\mathrm{1}}$} &
|
||||||
|
\bitbox{40}{...} &
|
||||||
|
\bitbox{256}{256 bit $\TransmitPublicNew{\NNew}$} \\
|
||||||
\bitbox{256}{256 bit $\EphemeralPrivate$}
|
\bitbox{256}{256 bit $\EphemeralPrivate$}
|
||||||
\end{bytefield}
|
\end{bytefield}
|
||||||
\end{lrbox}
|
\end{lrbox}
|
||||||
|
@ -903,7 +906,7 @@ Define:
|
||||||
|
|
||||||
$\KDF(\DHSecret{i}, \EphemeralPublic, \TransmitPublicNew{i}, i) := \FullHashbox{\kdfbox}$.
|
$\KDF(\DHSecret{i}, \EphemeralPublic, \TransmitPublicNew{i}, i) := \FullHashbox{\kdfbox}$.
|
||||||
|
|
||||||
$\Nonce(\hSig, i) := \Justthebox{\noncebox}$.
|
$\Nonce(\hSig, i) := \Justthebox{\noncebox}{-1.3ex}$.
|
||||||
}
|
}
|
||||||
|
|
||||||
Let $\TransmitPublicNew{\mathrm{1}..\NNew}$ be the \changed{Curve25519} public keys
|
Let $\TransmitPublicNew{\mathrm{1}..\NNew}$ be the \changed{Curve25519} public keys
|
||||||
|
@ -917,8 +920,7 @@ Then to encrypt:
|
||||||
|
|
||||||
\begin{itemize}
|
\begin{itemize}
|
||||||
\changed{
|
\changed{
|
||||||
\item Let $\SharedPlaintext{} := \Justthebox{\sharedbox}$.
|
\item Let $\SharedPlaintext{} := \Justthebox{\sharedbox}{-9.5ex}$
|
||||||
\item \todo{$\SharedPlaintext{}$ needs to include $\TransmitKey{1..\NNew}$.}
|
|
||||||
\item Generate a new Curve25519 (public, private) key pair
|
\item Generate a new Curve25519 (public, private) key pair
|
||||||
$(\EphemeralPublic, \EphemeralPrivate)$, and a new $\SymSpecific$ key $\SharedKey{}$.
|
$(\EphemeralPublic, \EphemeralPrivate)$, and a new $\SymSpecific$ key $\SharedKey{}$.
|
||||||
\item For $i$ in $\{1..\NNew\}$,
|
\item For $i$ in $\{1..\NNew\}$,
|
||||||
|
|
Loading…
Reference in New Issue