Skip to content

Initial implementation of SSHKDF for wolfprovider #382

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

Merged
padelsbach merged 4 commits into from
Apr 21, 2026
Merged

Initial implementation of SSHKDF for wolfprovider #382

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f5fa85
Initial implementation of SSHKDF for wolfprovider
ColtonWilley Apr 2, 2026
049977d
Add private key lock/unlock for FIPS
ColtonWilley Apr 2, 2026
08b2826
Extract new logic to helper function, unify into internal.c, add new …
ColtonWilley Apr 20, 2026
9177976
Merge remote-tracking branch 'origin/master' into wp_sshkdf
ColtonWilley Apr 21, 2026
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
2 changes: 2 additions & 0 deletions include/wolfprovider/alg_funcs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ typedef void (*DFUNC)(void);
#define WP_NAMES_TLS1_PRF "TLS1-PRF"
#define WP_NAMES_KBKDF "KBKDF"
#define WP_NAMES_KRB5KDF "KRB5KDF"
#define WP_NAMES_SSHKDF "SSHKDF"

/* Signature names. */
#define WP_NAMES_RSA "RSA:rsaEncryption:1.2.840.113549.1.1.1"
Expand Down Expand Up @@ -315,6 +316,7 @@ extern const OSSL_DISPATCH wp_kdf_tls1_3_kdf_functions[];
extern const OSSL_DISPATCH wp_kdf_tls1_prf_functions[];
extern const OSSL_DISPATCH wp_kdf_kbkdf_functions[];
extern const OSSL_DISPATCH wp_kdf_krb5kdf_functions[];
extern const OSSL_DISPATCH wp_kdf_sshkdf_functions[];

/* Signature implementations. */
extern const OSSL_DISPATCH wp_rsa_signature_functions[];
Expand Down
3 changes: 3 additions & 0 deletions include/wolfprovider/settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@
#ifndef NO_PWDBASED
#define WP_HAVE_PBE
#endif
#ifdef WOLFSSL_WOLFSSH
#define WP_HAVE_SSHKDF
#endif

#ifndef NO_DH
#define WP_HAVE_DH
Expand Down
4 changes: 3 additions & 1 deletion include/wolfprovider/wp_logging.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@
#define WP_LOG_COMP_X448 0x4000000 /* X448 operations */
#define WP_LOG_COMP_QUERY 0x8000000 /* wolfprov_query operations */
#define WP_LOG_COMP_TLS1_PRF 0x10000000 /* TLS1 PRF operations */
#define WP_LOG_COMP_SSHKDF 0x20000000 /* SSHKDF operations */

/* log all components */
#define WP_LOG_COMP_ALL ( \
Expand Down Expand Up @@ -217,7 +218,8 @@
WP_LOG_COMP_X25519 | \
WP_LOG_COMP_X448 | \
WP_LOG_COMP_QUERY | \
WP_LOG_COMP_TLS1_PRF )
WP_LOG_COMP_TLS1_PRF | \
WP_LOG_COMP_SSHKDF )

/* default components logged */
#define WP_LOG_COMP_DEFAULT WP_LOG_COMP_ALL
Expand Down
1 change: 1 addition & 0 deletions src/include.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ libwolfprov_la_SOURCES += src/wp_kdf_exch.c
libwolfprov_la_SOURCES += src/wp_pbkdf2.c
libwolfprov_la_SOURCES += src/wp_kbkdf.c
libwolfprov_la_SOURCES += src/wp_krb5kdf.c
libwolfprov_la_SOURCES += src/wp_sshkdf.c
libwolfprov_la_SOURCES += src/wp_rsa_kmgmt.c
libwolfprov_la_SOURCES += src/wp_rsa_sig.c
libwolfprov_la_SOURCES += src/wp_rsa_asym.c
Expand Down
1 change: 1 addition & 0 deletions src/wp_logging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ static void wolfProv_LogComponentToMask(const char* level, size_t len, void* ctx
{ "WP_LOG_COMP_X448", XSTRLEN("WP_LOG_COMP_X448"), WP_LOG_COMP_X448 },
{ "WP_LOG_COMP_QUERY", XSTRLEN("WP_LOG_COMP_QUERY"), WP_LOG_COMP_QUERY },
{ "WP_LOG_COMP_TLS1_PRF", XSTRLEN("WP_LOG_COMP_TLS1_PRF"), WP_LOG_COMP_TLS1_PRF },
{ "WP_LOG_COMP_SSHKDF", XSTRLEN("WP_LOG_COMP_SSHKDF"), WP_LOG_COMP_SSHKDF },
{ "WP_LOG_COMP_ALL",
XSTRLEN("WP_LOG_COMP_ALL"),
WP_LOG_COMP_ALL },
Expand Down
Loading
Loading