Merge pull request #9433 from holtrop/rust-conditional-compilation

Rust wrapper: enable conditional compilation based on C library build options

Author: JacobBarthelmeh

wolfcrypt/src/dh.c

@@ -3228,6 +3228,7 @@ int wc_DhGenerateParams(WC_RNG *rng, int modSz, DhKey *dh)
     return ret;
 }
 
+#endif /* WOLFSSL_KEY_GEN */
 
 /* Export raw DH parameters from DhKey structure
  *
@@ -3325,6 +3326,4 @@ int wc_DhExportParamsRaw(DhKey* dh, byte* p, word32* pSz,
     return ret;
 }
 
-#endif /* WOLFSSL_KEY_GEN */
-
 #endif /* NO_DH */

wolfssl/wolfcrypt/dh.h

@@ -196,11 +196,12 @@ WOLFSSL_API int wc_DhCheckPrivKey_ex(DhKey* key, const byte* priv,
         word32 privSz, const byte* prime, word32 primeSz);
 WOLFSSL_API int wc_DhCheckKeyPair(DhKey* key, const byte* pub, word32 pubSz,
                         const byte* priv, word32 privSz);
+#ifdef WOLFSSL_KEY_GEN
 WOLFSSL_API int wc_DhGenerateParams(WC_RNG *rng, int modSz, DhKey *dh);
+#endif
 WOLFSSL_API int wc_DhExportParamsRaw(DhKey* dh, byte* p, word32* pSz,
                        byte* q, word32* qSz, byte* g, word32* gSz);
 
-
 #ifdef __cplusplus
     } /* extern "C" */
 #endif

wolfssl/wolfcrypt/ecc.h

@@ -913,9 +913,11 @@ int wc_ecc_export_point_der_ex(const int curve_idx, ecc_point* point, byte* out,
 WOLFSSL_API
 int wc_ecc_export_point_der(const int curve_idx, ecc_point* point,
                             byte* out, word32* outLen);
+#ifdef HAVE_COMP_KEY
 WOLFSSL_LOCAL
 int wc_ecc_export_point_der_compressed(const int curve_idx, ecc_point* point,
                                        byte* out, word32* outLen);
+#endif /* HAVE_COMP_KEY */
 #endif /* HAVE_ECC_KEY_EXPORT */
 
 

wrapper/rust/Makefile

@@ -1,6 +1,5 @@
 .PHONY: all
 all:
-	+$(MAKE) -C wolfssl-sys
 	+$(MAKE) -C wolfssl
 
 .PHONY: test
@@ -9,5 +8,4 @@ test:
 
 .PHONY: clean
 clean:
-	+$(MAKE) -C wolfssl-sys clean
 	+$(MAKE) -C wolfssl clean

wrapper/rust/README.md

@@ -17,7 +17,6 @@ Run tests with:
 | Repository Directory | Description |
 | --- | --- |
 | `/wrapper/rust` | Top level container for all Rust wrapper functionality. |
-| `/wrapper/rust/wolfssl` | Top level for the `wolfssl` library crate. This crate contains high-level Rust sources that use the bindings from the `wolfssl-sys` crate. |
+| `/wrapper/rust/wolfssl` | Top level for the `wolfssl` library crate. |
 | `/wrapper/rust/wolfssl/src` | Source directory for `wolfssl` crate top-level modules. |
 | `/wrapper/rust/wolfssl/src/wolfcrypt` | Source directory for submodules of `wolfssl::wolfcrypt` module. |
-| `/wrapper/rust/wolfssl-sys` | Top level for the `wolfssl-sys` library crate. This crate contains only automatically generated bindings to the `wolfssl` C library. |

wrapper/rust/include.am

@@ -4,16 +4,11 @@
 
 EXTRA_DIST += wrapper/rust/Makefile
 EXTRA_DIST += wrapper/rust/README.md
-EXTRA_DIST += wrapper/rust/wolfssl-sys/Cargo.lock
-EXTRA_DIST += wrapper/rust/wolfssl-sys/Cargo.toml
-EXTRA_DIST += wrapper/rust/wolfssl-sys/Makefile
-EXTRA_DIST += wrapper/rust/wolfssl-sys/build.rs
-EXTRA_DIST += wrapper/rust/wolfssl-sys/headers.h
-EXTRA_DIST += wrapper/rust/wolfssl-sys/src/lib.rs
 EXTRA_DIST += wrapper/rust/wolfssl/Cargo.lock
 EXTRA_DIST += wrapper/rust/wolfssl/Cargo.toml
 EXTRA_DIST += wrapper/rust/wolfssl/Makefile
 EXTRA_DIST += wrapper/rust/wolfssl/build.rs
+EXTRA_DIST += wrapper/rust/wolfssl/headers.h
 EXTRA_DIST += wrapper/rust/wolfssl/src/lib.rs
 EXTRA_DIST += wrapper/rust/wolfssl/src/wolfcrypt.rs
 EXTRA_DIST += wrapper/rust/wolfssl/src/wolfcrypt/aes.rs