feat: allow both boring and RustCrypto RSA via flags (#71)

Signed-off-by: Richard Zak <richard@profian.com>
WebAssembly · Aug 3, 2022 · 53f6d8f · 53f6d8f
1 parent 9b3a408
commit 53f6d8f
Show file tree

Hide file tree

Showing 8 changed files with 457 additions and 8 deletions.
diff --git a/implementations/hostcalls/rust/Cargo.toml b/implementations/hostcalls/rust/Cargo.toml
@@ -14,7 +14,7 @@ repository = "https://github.com/webassembly/wasi-crypto"
 aes-gcm = "0.9.4"
 anyhow = "1.0.58"
 bincode = "1.3.3"
-boring = "2.0.0"
+boring = {version = "2.0.0", optional = true }
 byteorder = "1.4.3"
 chacha20poly1305 = "0.9.1"
 curve25519-dalek = "=3.2.0" # updating is impossible due to a dependency on an older `zeroize` version
@@ -40,10 +40,16 @@ p384 = { version = "0.11.1", features = [
     "pkcs8",
     "pem",
 ] }
+rsa = { version = "0.6.1", features = [
+    "expose-internals",
+    "serde",
+    "std",
+    "pem"
+], optional = true }
 pqcrypto-traits = { version = "0.3.4", optional = true }
 pqcrypto-kyber = { version = "0.7.6", optional = true }
 
-rand_core = { version = "0.6.3", default-features = false, package = "rand_core" }
+rand_core = { version = "0.6.3", features = ["getrandom"], package = "rand_core" }
 rand_core_05 = { package = "rand_core", version = "0.5", default-features = false }
 serde = { version = "1.0.140", features = ["derive"] }
 sha2 = "0.10.2"
@@ -53,8 +59,9 @@ xoodyak = "0.7.3"
 zeroize = "1.5.7"
 
 [features]
-default = ["pqcrypto"]
+default = ["pqcrypto", "boring"]
 pqcrypto = ["pqcrypto-traits", "pqcrypto-kyber"]
+rcrypto = ["dep:rsa"]
 
 [badges]
 maintenance = { status = "experimental" }
diff --git a/implementations/hostcalls/rust/src/signatures/keypair.rs b/implementations/hostcalls/rust/src/signatures/keypair.rs
@@ -1,7 +1,7 @@
 use super::ecdsa::*;
 use super::eddsa::*;
 use super::publickey::*;
-use super::rsa::*;
+use super::rsa_impl::*;
 use super::*;
 use crate::asymmetric_common::*;
 use crate::error::*;

diff --git a/implementations/hostcalls/rust/src/signatures/mod.rs b/implementations/hostcalls/rust/src/signatures/mod.rs
@@ -2,7 +2,11 @@ mod ecdsa;
 mod eddsa;
 mod keypair;
 mod publickey;
-mod rsa;
+
+#[cfg_attr(feature = "boring", path = "rsa_boring.rs")]
+#[cfg_attr(feature = "rcrypto", path = "rsa_rcrypto.rs")]
+mod rsa_impl;
+
 mod secretkey;
 mod signature;
 

diff --git a/implementations/hostcalls/rust/src/signatures/publickey.rs b/implementations/hostcalls/rust/src/signatures/publickey.rs
@@ -1,6 +1,6 @@
 use super::ecdsa::*;
 use super::eddsa::*;
-use super::rsa::*;
+use super::rsa_impl::*;
 use super::*;
 use crate::asymmetric_common::*;
 use crate::error::*;

diff --git a/...ions/hostcalls/rust/src/signatures/rsa.rs → ...stcalls/rust/src/signatures/rsa_boring.rs b/...ions/hostcalls/rust/src/signatures/rsa.rs → ...stcalls/rust/src/signatures/rsa_boring.rs