Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reflect Botan's NIST SP800-56r2 Changes #223

Merged
merged 2 commits into from
Jul 10, 2024
Merged

Reflect Botan's NIST SP800-56r2 Changes #223

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2936a27
Reflect Botan's NIST SP800-56r2 changes
FAlbertDev Jul 2, 2024
d4680ee
Merge branch 'main' into cryptodoc/sp800-56cr2
reneme Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/cryptodoc/src/00_01_changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,5 @@ Changelog
| | | | |
| | | - New PQC algorithms | |
| | | - HSS/LMS | |
| | | - NIST SP800-56Cr2 One-Step KDM with KMAC | |
+---------+----------+---------------------------------------------+------------+
20 changes: 14 additions & 6 deletions docs/cryptodoc/src/10_kdf.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,18 @@ The implementation of KDF in Double-Pipeline Iteration Mode uses the
optional counter *i* and fixes the length of :math:`[L]_2` and
:math:`[i]_2` (the value ``r``) to 32 bits.

NIST SP800-56C
--------------
NIST SP800-56Cr2 One-Step KDM
-----------------------------

NIST [SP800-56Cr2]_ defines a one-step key derivation method based on a hash
function, HMAC, or KMAC. All three of these options are supported. The
implementation can be found in
:srcref:`src/lib/kdf/sp800_56a/sp800_56c_one_step.cpp`.

NIST SP800-56Cr2 Two-Step KDM
-----------------------------

NIST [SP800-56C]_ defines a key derivation using extraction-then-expansion.
The implementation can be found in
:srcref:`src/lib/kdf/sp800_56c/sp800_56c.cpp`. The implementation fixes the
context value for the expansion step to the empty string.
NIST [SP800-56Cr2]_ defines a two-step key derivation using
extraction-then-expansion. The implementation can be found in
:srcref:`src/lib/kdf/sp800_56a/sp800_56c_two_step.cpp`. The implementation
fixes the context value for the expansion step to the empty string.
2 changes: 1 addition & 1 deletion docs/cryptodoc/src/90_bibliographie.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
https://csrc.nist.gov/publications/detail/sp/800-38e/final,
January 2010

.. [SP800-56C] NIST Special Publication SP 800-56C Rev. 2:
.. [SP800-56Cr2] NIST Special Publication SP 800-56C Rev. 2:
"Recommendation for Key-Derivation Methods in Key-Establishment Schemes",
https://csrc.nist.gov/publications/detail/sp/800-56c/rev-2/final,
August 2020
Expand Down
10 changes: 5 additions & 5 deletions docs/testspec/src/06_kdf.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,10 @@ test vectors are listed in :srcref:`src/tests/data/kdf/sp800_108_pipe.vec`.
| | result with the expected output value *Out* |
+------------------------+-------------------------------------------------------------------------+

SP 800-56C
----------
NIST SP 800-56Cr2 Two-Step KDM
------------------------------

The NIST SP 800-56C KDF is tested with the following constraints:
The NIST SP 800-56Cr2 Two-Step KDM is tested with the following constraints:

- Number of test cases: 40
- Source: Generated with PyCryptodome
Expand All @@ -245,11 +245,11 @@ test vectors are listed in :srcref:`src/tests/data/kdf/sp800_56c.vec`.
:widths: 20 80

+------------------------+-------------------------------------------------------------------------+
| **Test Case No.:** | KDF-NISTSP800-56C-1 |
| **Test Case No.:** | KDF-NISTSP800-56CR2-Two-Step-1 |
+========================+=========================================================================+
| **Type:** | Positive Test |
+------------------------+-------------------------------------------------------------------------+
| **Description:** | Derives a key from the NIST SP 800-56C KDF |
| **Description:** | Derives a key from the NIST SP 800-56C Two-Step KDM |
+------------------------+-------------------------------------------------------------------------+
| **Preconditions:** | None |
+------------------------+-------------------------------------------------------------------------+
Expand Down
Loading