git.bettercrypto.org
/
ach-master.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9c52c0a
)
+for
author
Aaron Zauner
<azet@azet.org>
Tue, 17 Dec 2013 12:26:25 +0000
(13:26 +0100)
committer
Aaron Zauner
<azet@azet.org>
Tue, 17 Dec 2013 12:26:25 +0000
(13:26 +0100)
src/practical_settings/vpn.tex
patch
|
blob
|
history
diff --git
a/src/practical_settings/vpn.tex
b/src/practical_settings/vpn.tex
index
d7f42cc
..
d69c500
100644
(file)
--- a/
src/practical_settings/vpn.tex
+++ b/
src/practical_settings/vpn.tex
@@
-129,7
+129,7
@@
parameters are shown in table \ref{tab:IPSEC_ph2_params}.
&
\parbox[t]{5cm}{\raggedright
\mbox{AES-GCM-16}, \mbox{AES-CTR}, \mbox{AES-CCM-16}, \mbox{AES-256}, \mbox{CAMELLIA-256}, \mbox{AES-128}, \mbox{CAMELLIA-128}} \\
- Hash & SHA2-* (or none AEAD) & SHA2-*, SHA1 (or none for AEAD) \\
+ Hash & SHA2-* (or none
for
AEAD) & SHA2-*, SHA1 (or none for AEAD) \\
DH Group & Same as Phase 1 & Same as Phase 1 \\
% Lifetime & \todo{need recommendations; 1-8 hours is common} & \\
\bottomrule