From 70d0ddf18a11d40b8fe97b299eb198be836ac347 Mon Sep 17 00:00:00 2001 From: Fabian Sauter Date: Mon, 27 Dec 2021 12:09:33 +0100 Subject: [PATCH 1/3] Fixed HMAC size for encryption --- xep-0384.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xep-0384.xml b/xep-0384.xml index 60a23140..96b1641a 100644 --- a/xep-0384.xml +++ b/xep-0384.xml @@ -330,7 +330,7 @@
  1. Use HKDF-SHA-256 to generate 80 bytes of output from the message key by providing mk as HKDF input, 256 zero-bits as HKDF salt and "OMEMO Message Key Material" as HKDF info.
  2. Divide the HKDF output into a 32-byte encryption key, a 32-byte authentication key and a 16 byte IV.
    3. -
  3. Encrypt the plaintext (which consists of a 32 bytes key and a 32 bytes HMAC as specified in the section about Message Encryption) using AES-256-CBC with PKCS#7 padding, using the encryption key and IV derived in the previous step.
    4. +
  4. Encrypt the plaintext (which consists of a 32 bytes key and a 16 bytes HMAC as specified in the section about Message Encryption) using AES-256-CBC with PKCS#7 padding, using the encryption key and IV derived in the previous step.
  5. Split the associated data as returned by CONCAT into the original ad and the OMEMOMessage.proto structure.
  6. Add the ciphertext to the OMEMOMessage.proto structure.
  7. Serialize the OMEMOMessage.proto structure into a parseable byte array. To avoid potential problems regarding non-uniqueness of the serialization, make sure to only serialize once and to use that exact byte sequence in the following steps.
    8. From 5d10cabf7b5b137fe0fdf302436e5bdfc7898c85 Mon Sep 17 00:00:00 2001 From: Fabian Sauter Date: Mon, 27 Dec 2021 12:16:44 +0100 Subject: [PATCH 2/3] Updated the revision to 0.8.2 --- xep-0384.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/xep-0384.xml b/xep-0384.xml index 96b1641a..16898ab5 100644 --- a/xep-0384.xml +++ b/xep-0384.xml @@ -58,8 +58,8 @@ jabber@larma.de - 0.8.1 - 2021-10-07 + 0.8.2 + 2021-12-27 melvo

    Adjust remaining namespaces:

    @@ -69,6 +69,14 @@     + + 0.8.1 + 2021-10-07 + fs + +

    Fixed HMAC size inconsitency (32 bytes vs 16 bytes)

    +     +     0.8.0 2021-09-28 From 929c38c9bef553f37b290d8f849990407d42177e Mon Sep 17 00:00:00 2001 From: Fabian Sauter Date: Mon, 27 Dec 2021 12:18:51 +0100 Subject: [PATCH 3/3] Fixed revisions... --- xep-0384.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xep-0384.xml b/xep-0384.xml index 16898ab5..436340d1 100644 --- a/xep-0384.xml +++ b/xep-0384.xml @@ -60,6 +60,14 @@ 0.8.2 2021-12-27 + fs + +

    Fixed HMAC size inconsitency (32 bytes vs 16 bytes)

    +     +     + + 0.8.1 + 2021-10-07 melvo

    Adjust remaining namespaces:

    @@ -69,14 +77,6 @@     - - 0.8.1 - 2021-10-07 - fs - -

    Fixed HMAC size inconsitency (32 bytes vs 16 bytes)

    -     -     0.8.0 2021-09-28