Merge branch 'master' of github.com:ColtonWilley/wolfProvider into wp_openvpn_fixes

Author: ColtonWilley

include/wolfprovider/alg_funcs.h

@@ -120,6 +120,8 @@ typedef void (*DFUNC)(void);
 #define WP_NAMES_AES_128_WRAP \
     "AES-128-WRAP:id-aes128-wrap:AES128-WRAP:2.16.840.1.101.3.4.1.5"
 
+#define WP_NAMES_DES_EDE3_CBC "DES-EDE3-CBC:DES3:1.2.840.113549.3.7"
+
 /* Internal cipher flags. */
 #define WP_CIPHER_FLAG_AEAD             0x0001
 #define WP_CIPHER_FLAG_CUSTOM_IV        0x0002
@@ -277,6 +279,8 @@ extern const OSSL_DISPATCH wp_aes256wrap_functions[];
 extern const OSSL_DISPATCH wp_aes192wrap_functions[];
 extern const OSSL_DISPATCH wp_aes128wrap_functions[];
 
+extern const OSSL_DISPATCH wp_des3cbc_functions[];
+
 /* MAC implementations. */
 extern const OSSL_DISPATCH wp_hmac_functions[];
 extern const OSSL_DISPATCH wp_cmac_functions[];

include/wolfprovider/settings.h

@@ -82,6 +82,9 @@
 #ifndef NO_AES_CBC
     #define WP_HAVE_AESCBC
 #endif
+#ifndef NO_DES3
+    #define WP_HAVE_DES3CBC
+#endif
 #ifdef WOLFSSL_AES_COUNTER
     #define WP_HAVE_AESCTR
 #endif

src/include.am

@@ -10,6 +10,7 @@ libwolfprov_la_SOURCES += src/wp_aes_block.c
 libwolfprov_la_SOURCES += src/wp_aes_stream.c
 libwolfprov_la_SOURCES += src/wp_aes_aead.c
 libwolfprov_la_SOURCES += src/wp_aes_wrap.c
+libwolfprov_la_SOURCES += src/wp_des.c
 libwolfprov_la_SOURCES += src/wp_hmac.c
 libwolfprov_la_SOURCES += src/wp_cmac.c
 libwolfprov_la_SOURCES += src/wp_gmac.c