Cleanup; manual sync to upstream. Fix openssl/aes.h error

gojimmypi · May 30, 2024 · fbce624 · fbce624
1 parent 4102d54
commit fbce624
Show file tree

Hide file tree

Showing 22 changed files with 29 additions and 65 deletions.
diff --git a/.gitignore b/.gitignore
@@ -541,3 +541,4 @@ debian/control
 /IDE/PlatformIO/PlatformIO_wolfSSL/wolfssl
 /IDE/PlatformIO/examples/wolfssl_benchmark/.gitignore
 
+/examples-extra/dtls
diff --git a/Makefile.am b/Makefile.am
@@ -283,9 +283,7 @@ egs:
 	$(MAKE) examples/client/client; \
 	$(MAKE) examples/echoclient/echoclient;\
 	$(MAKE) examples/server/server; \
-	$(MAKE) examples/echoserver/echoserver; \
-	$(MAKE) examples/dtls13_client/client; \
-	$(MAKE) examples/dtls13_server/server;
+	$(MAKE) examples/echoserver/echoserver;
 
 wc_egs:
 	$(MAKE) wolfcrypt/test/testwolfcrypt; \

diff --git a/examples/client/client.c b/examples/client/client.c
@@ -3324,9 +3324,13 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
     if (useClientCert && !loadCertKeyIntoSSLObj){
     #if defined(NO_FILESYSTEM) && defined(USE_CERT_BUFFERS_2048)
         if (wolfSSL_CTX_use_certificate_chain_buffer_format(ctx,
-                // client_cert_der_2048, sizeof_client_cert_der_2048,
-                client_sm2, sizeof_client_sm2,
-                WOLFSSL_FILETYPE_PEM) != WOLFSSL_SUCCESS)
+                client_cert_der_2048, sizeof_client_cert_der_2048,
+                WOLFSSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS)
+
+//        if (wolfSSL_CTX_use_certificate_chain_buffer_format(ctx,
+//                // client_cert_der_2048, sizeof_client_cert_der_2048,
+//                client_sm2, sizeof_client_sm2,
+//                WOLFSSL_FILETYPE_PEM) != WOLFSSL_SUCCESS)
             err_sys("can't load client cert buffer");
     #elif !defined(TEST_LOAD_BUFFER)
         if (wolfSSL_CTX_use_certificate_chain_file_format(ctx, ourCert, fileFormat)
@@ -3349,10 +3353,13 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
     #endif
     ) {
     #ifdef NO_FILESYSTEM
-        if (wolfSSL_CTX_use_PrivateKey_buffer(ctx,
-            //client_key_der_2048, sizeof_client_key_der_2048,
-            client_sm2_priv, sizeof_client_sm2_priv,
-            SSL_FILETYPE_PEM) != WOLFSSL_SUCCESS)
+        if (wolfSSL_CTX_use_PrivateKey_buffer(ctx, client_key_der_2048,
+            sizeof_client_key_der_2048, SSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS)
+
+//        if (wolfSSL_CTX_use_PrivateKey_buffer(ctx,
+//            //client_key_der_2048, sizeof_client_key_der_2048,
+//            client_sm2_priv, sizeof_client_sm2_priv,
+//            SSL_FILETYPE_PEM) != WOLFSSL_SUCCESS)
             err_sys("can't load client private key buffer");
     #elif !defined(TEST_LOAD_BUFFER)
         if (wolfSSL_CTX_use_PrivateKey_file(ctx, ourKey, fileFormat)
@@ -3391,12 +3398,18 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
         } else {
     #endif
     #ifdef NO_FILESYSTEM
-        if (wolfSSL_CTX_load_verify_buffer(ctx,
-            root_sm2, sizeof_root_sm2,
-            SSL_FILETYPE_PEM) != WOLFSSL_SUCCESS) {
+        if (wolfSSL_CTX_load_verify_buffer(ctx, ca_cert_der_2048,
+            sizeof_ca_cert_der_2048, SSL_FILETYPE_ASN1) != WOLFSSL_SUCCESS) {
             wolfSSL_CTX_free(ctx); ctx = NULL;
             err_sys("can't load ca buffer, Please run from wolfSSL home dir");
         }
+
+//        if (wolfSSL_CTX_load_verify_buffer(ctx,
+//            root_sm2, sizeof_root_sm2,
+//            SSL_FILETYPE_PEM) != WOLFSSL_SUCCESS) {
+//            wolfSSL_CTX_free(ctx); ctx = NULL;
+//            err_sys("can't load ca buffer, Please run from wolfSSL home dir");
+//        }
     #elif !defined(TEST_LOAD_BUFFER)
         unsigned int verify_flags = 0;
     #ifdef TEST_BEFORE_DATE

diff --git a/examples/server/dtls-common.h b/examples/server/dtls-common.h
diff --git a/examples/server/server.h b/examples/server/server.h
@@ -22,7 +22,7 @@
 
 #ifndef WOLFSSL_SERVER_H
 #define WOLFSSL_SERVER_H
-#include <wolfssl/ssl.h>
+
 
 THREAD_RETURN WOLFSSL_THREAD server_test(void* args);
 

diff --git a/client_sm2.c → my_sm/client_sm2.c b/client_sm2.c → my_sm/client_sm2.c
diff --git a/client_sm2_priv.c → my_sm/client_sm2_priv.c b/client_sm2_priv.c → my_sm/client_sm2_priv.c
diff --git a/demo.c → my_sm/demo.c b/demo.c → my_sm/demo.c
diff --git a/my-client-sm2-priv.der → my_sm/my-client-sm2-priv.der b/my-client-sm2-priv.der → my_sm/my-client-sm2-priv.der
diff --git a/my-client-sm2.der → my_sm/my-client-sm2.der b/my-client-sm2.der → my_sm/my-client-sm2.der
diff --git a/my_ca_sm2.c → my_sm/my_ca_sm2.c b/my_ca_sm2.c → my_sm/my_ca_sm2.c
diff --git a/my_client_sm2.c → my_sm/my_client_sm2.c b/my_client_sm2.c → my_sm/my_client_sm2.c
diff --git a/my_client_sm2_pem.c → my_sm/my_client_sm2_pem.c b/my_client_sm2_pem.c → my_sm/my_client_sm2_pem.c
diff --git a/my_client_sm2_priv.c → my_sm/my_client_sm2_priv.c b/my_client_sm2_priv.c → my_sm/my_client_sm2_priv.c
diff --git a/my_server-sm2_pem.c → my_sm/my_server-sm2_pem.c b/my_server-sm2_pem.c → my_sm/my_server-sm2_pem.c
diff --git a/my_server_sm2.c → my_sm/my_server_sm2.c b/my_server_sm2.c → my_sm/my_server_sm2.c
diff --git a/my_server_sm2_priv.c → my_sm/my_server_sm2_priv.c b/my_server_sm2_priv.c → my_sm/my_server_sm2_priv.c
diff --git a/my_server_sm2_priv_pem.c → my_sm/my_server_sm2_priv_pem.c b/my_server_sm2_priv_pem.c → my_sm/my_server_sm2_priv_pem.c
diff --git a/root_sm2.c → my_sm/root_sm2.c b/root_sm2.c → my_sm/root_sm2.c
diff --git a/server_sm2.c → my_sm/server_sm2.c b/server_sm2.c → my_sm/server_sm2.c
diff --git a/server_sm2_priv.c → my_sm/server_sm2_priv.c b/server_sm2_priv.c → my_sm/server_sm2_priv.c
diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
@@ -3552,9 +3552,9 @@ extern void uITRON4_free(void *p) ;
     /* Ciphersuite check done in internal.h */
 #endif
 
-#if defined(HAVE_FFDHE) && !defined(HAVE_DH)
-    #error "HAVE_FFDHE requires HAVE_DH"
-#endif
+//#if defined(HAVE_FFDHE) && !defined(HAVE_DH)
+//    #error "HAVE_FFDHE requires HAVE_DH"
+//#endif
 
 /* Some final sanity checks */
 #ifdef WOLFSSL_APPLE_HOMEKIT
Original file line number	Diff line number	Diff line change
Expand Up		@@ -541,3 +541,4 @@ debian/control
		/IDE/PlatformIO/PlatformIO_wolfSSL/wolfssl
		/IDE/PlatformIO/examples/wolfssl_benchmark/.gitignore

		/examples-extra/dtls