add ffi c edwards25519

WeBankBlockchain · Sep 20, 2023 · 6b6a338 · 6b6a338
1 parent dad9db9
commit 6b6a338
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 21 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,6 +26,7 @@ members = [
     "ffi/ffi_c/ffi_c_crypto_binary",
     "ffi/ffi_c/ffi_c_fisco_bcos",
     "ffi/ffi_c/ffi_c_zkp",
+    "ffi/ffi_c/ffi_c_ecc_edwards25519",
     "ffi/ffi_common",
     "ffi/ffi_java/ffi_java_crypto",
     "ffi/ffi_java/ffi_java_crypto_binary",
@@ -34,7 +35,7 @@ members = [
     "protos",
     "third_party/fisco_bcos",
     "third_party/fisco_bcos_java_sdk",
-    "crypto/ecc/ecc_ed25519",
-    "crypto/ecc/ffi_java_ecc_ed25519",
-    "crypto/ecc/ffi_wasm_ecc_ed25519",
+    "crypto/ecc/ecc_edwards25519",
+    "ffi/ffi_java/ffi_java_ecc_edwards25519",
+    "ffi/ffi_wasm/ffi_wasm_ecc_edwards25519",
 ]
diff --git a/crypto/ecc/ecc_ed25519/Cargo.toml → crypto/ecc/ecc_edwards25519/Cargo.toml b/crypto/ecc/ecc_ed25519/Cargo.toml → crypto/ecc/ecc_edwards25519/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ecc_ed25519"
+name = "ecc_edwards25519"
 version = "0.1.0"
 edition = "2021"
 

diff --git a/crypto/ecc/ecc_ed25519/src/lib.rs → crypto/ecc/ecc_edwards25519/src/lib.rs b/crypto/ecc/ecc_ed25519/src/lib.rs → crypto/ecc/ecc_edwards25519/src/lib.rs
diff --git a/crypto/ecc/ffi_java_ecc_ed25519/Cargo.toml → ...java/ffi_java_ecc_edwards25519/Cargo.toml b/crypto/ecc/ffi_java_ecc_ed25519/Cargo.toml → ...java/ffi_java_ecc_edwards25519/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
-name = "ffi_java_ecc_ed25519"
+name = "ffi_java_ecc_edwards25519"
 version = "0.1.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]
-name = "ffi_java_ecc_ed25519"
+name = "ffi_java_ecc_edwards25519"
 crate-type = [ "cdylib", "staticlib" ]
 
 [dependencies]
 jni = "0.13.0"
-ecc_ed25519 = { path = "../ecc_ed25519"}
+ecc_edwards25519 = { path = "../../../crypto/ecc/ecc_edwards25519" }
diff --git a/crypto/ecc/ffi_java_ecc_ed25519/src/lib.rs → ...java/ffi_java_ecc_edwards25519/src/lib.rs b/crypto/ecc/ffi_java_ecc_ed25519/src/lib.rs → ...java/ffi_java_ecc_edwards25519/src/lib.rs
@@ -1,8 +1,6 @@
 extern crate jni;
 
-use ecc_ed25519::{
-    hash_to_curve, point_scalar_multi, random_scalar,
-};
+use ecc_edwards25519::{hash_to_curve, point_scalar_multi, random_scalar};
 
 use jni::{objects::JClass, sys::jbyteArray, JNIEnv};
 

diff --git a/crypto/ecc/ffi_wasm_ecc_ed25519/Cargo.toml → ...wasm/ffi_wasm_ecc_edwards25519/Cargo.toml b/crypto/ecc/ffi_wasm_ecc_ed25519/Cargo.toml → ...wasm/ffi_wasm_ecc_edwards25519/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
-name = "ffi_wasm_ecc_ed25519"
+name = "ffi_wasm_ecc_edwards25519"
 version = "0.1.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
-name = "ffi_wasm_ecc_ed25519"
+name = "ffi_wasm_ecc_edwards25519"
 crate-type = ["rlib", "cdylib"]
 
 [dependencies]
 wasm-bindgen = "0.2"
 getrandom = { version = "0.2", features = ["js"] }
-ecc_ed25519 = { path = "../ecc_ed25519"}
+ecc_edwards25519 = { path = "../../../crypto/ecc/ecc_edwards25519" }
diff --git a/crypto/ecc/ffi_wasm_ecc_ed25519/readme.md → ..._wasm/ffi_wasm_ecc_edwards25519/readme.md b/crypto/ecc/ffi_wasm_ecc_ed25519/readme.md → ..._wasm/ffi_wasm_ecc_edwards25519/readme.md
diff --git a/crypto/ecc/ffi_wasm_ecc_ed25519/src/lib.rs → ...wasm/ffi_wasm_ecc_edwards25519/src/lib.rs b/crypto/ecc/ffi_wasm_ecc_ed25519/src/lib.rs → ...wasm/ffi_wasm_ecc_edwards25519/src/lib.rs
@@ -1,8 +1,6 @@
 extern crate wasm_bindgen;
 
-use ecc_ed25519::{
-    hash_to_curve, point_scalar_multi, random_scalar,
-};
+use ecc_edwards25519::{hash_to_curve, point_scalar_multi, random_scalar};
 use wasm_bindgen::prelude::wasm_bindgen;
 
 #[wasm_bindgen]