DH support: add KDF handling support
Subsystems (2)
PATCH v6 1/1 DH support: add KDF handling support
Hi David,
Changes v6:
* addition of man/keyctl.1 documentation for dh_compute_kdf and dh_compute_kdf_oi
* change use of .priv instead of .private to compile the code
Thanks
Stephan
---8<---
Add the interface logic to support DH with KDF handling support.
The dh_compute code now allows the following options:
- no KDF support / output of raw DH shared secret:
dh_compute <private> <prime> <base>
- KDF support without "other information" string:
dh_compute_kdf <private> <prime> <base> <output length> <hash_type>
- KDF support with "other information string:
dh_compute_kdf_oi <private> <prime> <base> <output length> <hash_type> where the OI string is provided on STDIN.
The test to verify the code is based on a test vector used for the CAVS testing of SP800-56A.
--- Makefile | 1 + keyctl.c | 133 ++++++++++++++++++++++++ keyutils.c | 14 +++ keyutils.h | 11 ++ man/keyctl.1 | 26 +++++ man/keyctl_dh_compute.3 | 57 +++++++++++ tests/keyctl/dh_compute/valid/runtest.sh | 168 +++++++++++++++++++++++++++++++ tests/toolbox.inc.sh | 44 ++++++++ version.lds | 2 + 9 files changed, 456 insertions(+)
Makefile +1 -0
@@ -195,6 +195,7 @@ endif $(LNS) keyctl_read.3 $(DESTDIR)$(MAN3)/keyctl_read_alloc.3 $(LNS) recursive_key_scan.3 $(DESTDIR)$(MAN3)/recursive_session_key_scan.3 $(LNS) keyctl_dh_compute.3 $(DESTDIR)$(MAN3)/keyctl_dh_compute_alloc.3 + $(LNS) keyctl_dh_compute.3 $(DESTDIR)$(MAN3)/keyctl_dh_compute_kdf.3 $(INSTALL) -D -m 0644 keyutils.h $(DESTDIR)$(INCLUDEDIR)/keyutils.h ###############################################################################
keyctl.c +133 -0
163 lines not on this page · raw message
keyutils.c +14 -0
@@ -244,6 +244,20 @@ long keyctl_dh_compute(key_serial_t priv, key_serial_t prime,return keyctl (KEYCTL_DH_COMPUTE , ¶ms, buffer, buflen,0 ); } +long keyctl_dh_compute_kdf (key_serial_t private,key_serial_t prime, +key_serial_t base,char *hashname,char *otherinfo, +size_t otherinfolen,char *buffer,size_t buflen) +{ +struct keyctl_dh_params params = { .priv = private, + .prime = prime, + .base = base }; +struct keyctl_kdf_params kdfparams = { .hashname = hashname, + .otherinfo = otherinfo, + .otherinfolen = otherinfolen }; + +return keyctl (KEYCTL_DH_COMPUTE , ¶ms, buffer, buflen, &kdfparams); +} +/*****************************************************************************/ /* * fetch key description into an allocated buffer
keyutils.h +11 -0
@@ -108,6 +108,13 @@ struct keyctl_dh_params {key_serial_t base; }; +struct keyctl_kdf_params { +char *hashname; +char *otherinfo; +uint32_t otherinfolen; +uint32_t __spare[8 ]; +}; +/* * syscall wrappers */
@@ -163,6 +170,10 @@ extern long keyctl_invalidate(key_serial_t id);extern long keyctl_get_persistent (uid_t uid,key_serial_t id);extern long keyctl_dh_compute (key_serial_t priv,key_serial_t prime,key_serial_t base,char *buffer,size_t buflen); +extern long keyctl_dh_compute_kdf (key_serial_t private,key_serial_t prime, +key_serial_t base,char *hashname, +char *otherinfo,size_t otherinfolen, +char *buffer,size_t buflen);/* * utilities
man/keyctl.1 +26 -0
@@ -92,6 +92,10 @@ keyctl \- key management facility control \fBkeyctl\fR get_persistent <keyring> [<uid>] .br \fBkeyctl\fR dh_compute <private> <prime> <base> +.br +\fBkeyctl\fR dh_compute_kdf <private> <prime> <base> <output_length> <hash_type> +.br +\fBkeyctl\fR dh_compute_kdf_oi <private> <prime> <base> <output_length> <hash_type> .SH DESCRIPTION This program is used to control the key management facility in various ways using a variety of subcommands.
@@ -702,6 +706,28 @@ The result is printed to stdout as a hex dump. $ keyctl dh_compute $1 $2 $3 8 bytes of data in result: 00010203 04050607 +.SS Compute a Diffie-Hellman shared secret and derive key material +\fBkeyctl\fR dh_compute_kdf <private> <prime> <base> <output_length> <hash_type> + +This command computes a Diffie-Hellman shared secret and derives +key material from the shared secret using a key derivation function (KDF). +The shared secret is derived as outlined above and is input to the KDF +using the specified hash type. The hash type must point to a hash name +known to the kernel crypto API. + +The operation derves key material of the length specified by the caller. + +The operation is compliant to the specification of SP800-56A. + +The result is printed to stdout as hex dump. +.SS Compute a Diffie-Hellman shared secret and apply KDF with other input +\fBkeyctl\fR dh_compute_kdf_oi <private> <prime> <base> <output_length> <hash_type> + +This command is identical to the command +.IR dh_compute_kdf +to generate a Diffie-Hellman shared secret followed by a key derivation +operation. This command allows the caller to provide the other input data +(OI data) compliant to SP800-56A via stdin. .fi .RE .SH ERRORS
man/keyctl_dh_compute.3 +57 -0
81 lines not on this page · raw message
tests/keyctl/dh_compute/valid/runtest.sh +168 -0
173 lines not on this page · raw message
tests/toolbox.inc.sh +44 -0
50 lines not on this page · raw message
version.lds +2 -0
@@ -66,5 +66,7 @@ KEYUTILS_1.6 { /* management functions */ keyctl_dh_compute; keyctl_dh_compute_alloc; + keyctl_dh_compute_kdf; + keyctl_dh_compute_kdf_alloc; } KEYUTILS_1.5;
Signature · 1 line
2.9.3
Pulled.