Merge pull request #204 from ColtonWilley/wp_kbkdf

Implement KBKDF for wolfProvider

Author: padelsbach

include/wolfprovider/alg_funcs.h

@@ -50,6 +50,7 @@
     #include <wolfssl/wolfcrypt/kdf.h>
 #endif
 
+#include <wolfprovider/settings.h>
 #include <wolfprovider/internal.h>
 #include <wolfprovider/wp_logging.h>
 
@@ -146,6 +147,7 @@ typedef void (*DFUNC)(void);
 #define WP_NAMES_PKCS12KDF      "PKCS12KDF"
 #define WP_NAMES_TLS1_3_KDF     "TLS13-KDF"
 #define WP_NAMES_TLS1_PRF       "TLS1-PRF"
+#define WP_NAMES_KBKDF          "KBKDF"
 #define WP_NAMES_KRB5KDF        "KRB5KDF"
 
 /* Signature names. */
@@ -310,6 +312,7 @@ extern const OSSL_DISPATCH wp_kdf_pbkdf2_functions[];
 extern const OSSL_DISPATCH wp_kdf_pkcs12_functions[];
 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[];
 
 /* Signature implementations. */

include/wolfprovider/settings.h

@@ -163,6 +163,9 @@
 #ifdef HAVE_ED448
      #define WP_HAVE_ED448
 #endif
+#if !defined(NO_AES_CBC) && (defined(WP_HAVE_HMAC) || defined(WP_HAVE_CMAC))
+    #define WP_HAVE_KBKDF
+#endif
 #ifndef WP_NO_FORCE_FAIL
     #define WP_CHECK_FORCE_FAIL
 #endif

src/include.am

@@ -21,6 +21,7 @@ libwolfprov_la_SOURCES += src/wp_tls1_prf.c
 libwolfprov_la_SOURCES += src/wp_kdf_kmgmt.c
 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_rsa_kmgmt.c
 libwolfprov_la_SOURCES += src/wp_rsa_sig.c