commit 9e4cb9f31216fa71729bf370660b32c2bb13a337
parent a04ab06f79e6522e18bed456f70c8a71cdf7d312
Author: Schanzenbach, Martin <mschanzenbach@posteo.de>
Date: Fri, 4 Oct 2019 16:21:41 +0200
update aes mode
Diffstat:
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/draft-schanzen-gns.html b/draft-schanzen-gns.html
@@ -1694,9 +1694,9 @@ async function addMetadata(){try{const e=document.styleSheets[0].cssRules;for(le
<figcaption><a href="#figure-9" class="selfRef">Figure 9</a></figcaption></figure>
</div>
<p id="section-4.3-7">
- The symmetric keys and IVs are used for a AES+TWOFISH combined
- cipher. Both ciphers are used in Cipher FeedBack (CFB) mode
- (<span>[<a href="#RFC3826" class="xref">RFC3826</a>]</span>).<a href="#section-4.3-7" class="pilcrow">¶</a></p>
+ The keys and IVs are used for a CFB128-AES-128 and
+ CFB128-TWOFISH-128 chained symmetric cipher. Both ciphers are used in
+ Cipher FeedBack (CFB) mode <span>[<a href="#RFC3826" class="xref">RFC3826</a>]</span>.<a href="#section-4.3-7" class="pilcrow">¶</a></p>
<div class="artwork art-text alignLeft" id="section-4.3-8">
<pre>
RDATA := AES(AES KEY, AES IV, TWOFISH(TWOFISH KEY, TWOFISH IV, BDATA))
diff --git a/draft-schanzen-gns.txt b/draft-schanzen-gns.txt
@@ -78,7 +78,7 @@ Table of Contents
9. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 12
10. Test Vectors . . . . . . . . . . . . . . . . . . . . . . . . 12
11. Normative References . . . . . . . . . . . . . . . . . . . . 15
- Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 15
+ Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 16
1. Introduction
@@ -489,8 +489,8 @@ Internet-Draft The GNU Name System July 2019
SHA256 for the expansion phase. The output keying material is 64
octets (512 bit) for the symmetric keys and 32 octets (256 bit) for
the initialization vectors. We divide the resulting keying material
- "K" into a 256-bit AES key and a 256-bit TWOFISH key:
-
+ "K" into a 256-bit AES [RFC3826] key and a 256-bit TWOFISH [TWOFISH]
+ key:
@@ -535,9 +535,9 @@ Internet-Draft The GNU Name System July 2019
Figure 9
- The symmetric keys and IVs are used for a AES+TWOFISH combined
- cipher. Both ciphers are used in Cipher FeedBack (CFB) mode
- ([RFC3826]).
+ The keys and IVs are used for a CFB128-AES-128 and CFB128-TWOFISH-128
+ chained symmetric cipher. Both ciphers are used in Cipher FeedBack
+ (CFB) mode [RFC3826].
RDATA := AES(AES KEY, AES IV, TWOFISH(TWOFISH KEY, TWOFISH IV, BDATA))
BDATA := TWOFISH(TWOFISH KEY, TWOFISH IV, AES(AES KEY, AES IV, RDATA))
@@ -830,10 +830,10 @@ Internet-Draft The GNU Name System July 2019
DOI 10.17487/RFC8032, January 2017,
<https://www.rfc-editor.org/info/rfc8032>.
-Authors' Addresses
+ [TWOFISH] Schneier, B., "The Twofish Encryptions Algorithm: A
+ 128-Bit Block Cipher, 1st Edition", March 1999.
+
- Martin Schanzenbach
- GNUnet e.V.
@@ -842,6 +842,10 @@ Schanzenbach, et al. Expires 24 January 2020 [Page 15]
Internet-Draft The GNU Name System July 2019
+Authors' Addresses
+
+ Martin Schanzenbach
+ GNUnet e.V.
Boltzmannstrasse 3
85748 Garching
Germany
@@ -889,8 +893,4 @@ Internet-Draft The GNU Name System July 2019
-
-
-
-
Schanzenbach, et al. Expires 24 January 2020 [Page 16]
diff --git a/draft-schanzen-gns.xml b/draft-schanzen-gns.xml
@@ -573,8 +573,8 @@
</figure>
<t>
- The keys and IVs are used for a CFB128-AES-128 and
- CFB128-TWOFISH-128 chained symmetric cipher. Both ciphers are used in
+ The keys and IVs are used for a CFB128-AES-256 and
+ CFB128-TWOFISH-256 chained symmetric cipher. Both ciphers are used in
Cipher FeedBack (CFB) mode <xref target="RFC3826" />.
</t>
<artwork name="" type="" align="left" alt=""><