Skip to content

Commit

Permalink
Update to upstream wolfssl 5.7.2
Browse files Browse the repository at this point in the history
Moving from v5.6.6-stable we are picking up:
https://github.com/wolfSSL/wolfssl/releases/tag/v5.7.0-stable
https://github.com/wolfSSL/wolfssl/releases/tag/v5.7.2-stable
(there was no 5.7.1)

Our `disable-falcon-dilithium.patch` required an update, likely due to the
changes in wolfSSL/wolfssl#7622.
  • Loading branch information
xv-ian-c committed Sep 3, 2024
1 parent d964fc3 commit 2bfc136
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 5 deletions.
2 changes: 2 additions & 0 deletions wolfssl-sys/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ fn build_wolfssl(wolfssl_src: &Path) -> PathBuf {
.enable("supportedcurves", None)
// Enable TLS/1.3
.enable("tls13", None)
// Enable liboqs, etc
.enable("experimental", None)
// CFLAGS
.cflag("-g")
.cflag("-fPIC")
Expand Down
25 changes: 21 additions & 4 deletions wolfssl-sys/patches/disable-falcon-dilithium.patch
Original file line number Diff line number Diff line change
@@ -1,15 +1,32 @@
diff --git a/wolfssl/internal.h b/wolfssl/internal.h
index 390b21b54..98458c780 100644
--- a/wolfssl/internal.h
+++ b/wolfssl/internal.h
@@ -3429,7 +3429,7 @@ typedef struct KeyShareEntry {
word32 keyLen; /* Key size (bytes) */
byte* pubKey; /* Public key */
word32 pubKeyLen; /* Public key length */
-#if !defined(NO_DH) || defined(HAVE_FALCON) || defined(HAVE_DILITHIUM)
+#if !defined(NO_DH) || defined(HAVE_PQC)
byte* privKey; /* Private key - DH and PQ KEMs only */
word32 privKeyLen;/* Only for PQ KEMs. */
#endif
diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
index 5eacd6c87..ab8632744 100644
index a4302c700..f1ddb2231 100644
--- a/wolfssl/wolfcrypt/settings.h
+++ b/wolfssl/wolfcrypt/settings.h
@@ -3070,8 +3070,8 @@ extern void uITRON4_free(void *p) ;
@@ -3351,10 +3351,10 @@ extern void uITRON4_free(void *p) ;
* group */
#ifdef HAVE_LIBOQS
#define HAVE_PQC
-#define HAVE_FALCON
-#define HAVE_DILITHIUM
-#ifndef HAVE_DILITHIUM
- #define HAVE_DILITHIUM
-#endif
+// #define HAVE_FALCON
+// #define HAVE_DILITHIUM
+// #ifndef HAVE_DILITHIUM
+// #define HAVE_DILITHIUM
+// #endif
#ifndef WOLFSSL_NO_SPHINCS
#define HAVE_SPHINCS
#endif
2 changes: 1 addition & 1 deletion wolfssl-sys/wolfssl-src
Submodule wolfssl-src updated 668 files

0 comments on commit 2bfc136

Please sign in to comment.