Fix the definition of P^shared.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood 2016-02-25 23:39:20 +00:00
parent 91ecf4ff93
commit e2d08d1073
2 changed files with 10 additions and 8 deletions

Binary file not shown.

View File

@ -164,7 +164,7 @@
\newcommand{\CRHbox}[1]{\CRH\left(\;\raisebox{-1.3ex}{\usebox{#1}}\;\right)}
\newcommand{\FullHash}{\mathtt{SHA256}}
\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{\PRFaddr}[1]{\PRF{#1}{addr}}
\newcommand{\PRFsn}[1]{\PRF{#1}{sn}}
@ -879,10 +879,13 @@ All of the resulting ciphertexts are combined to form a \coinsCiphertext.
\newsavebox{\sharedbox}
\begin{lrbox}{\sharedbox}
\setchanged
\begin{bytefield}[bitwidth=0.045em]{768}
\bitbox{256}{256 bit $\TransmitPublicNew{\mathrm{1}}$}
\bitbox{40}{...}
\bitbox{256}{256 bit $\TransmitPublicNew{\NNew}$}
\begin{bytefield}[bitwidth=0.045em]{512}
\bitbox{256}{256 bit $\TransmitKey{\mathrm{1}}$} &
\bitbox{40}{...} &
\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$}
\end{bytefield}
\end{lrbox}
@ -903,7 +906,7 @@ Define:
$\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
@ -917,8 +920,7 @@ Then to encrypt:
\begin{itemize}
\changed{
\item Let $\SharedPlaintext{} := \Justthebox{\sharedbox}$.
\item \todo{$\SharedPlaintext{}$ needs to include $\TransmitKey{1..\NNew}$.}
\item Let $\SharedPlaintext{} := \Justthebox{\sharedbox}{-9.5ex}$
\item Generate a new Curve25519 (public, private) key pair
$(\EphemeralPublic, \EphemeralPrivate)$, and a new $\SymSpecific$ key $\SharedKey{}$.
\item For $i$ in $\{1..\NNew\}$,