Merge pull request #13 from sigp/submodule-amcl

Convert amcl to a submodule
sigp · Jan 19, 2020 · f01a8b6 · f01a8b6
2 parents 39f3bcb + 7eaf18a
commit f01a8b6
Show file tree

Hide file tree

Showing 52 changed files with 39 additions and 21,300 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "incubator-milagro-crypto-rust"]
+	path = incubator-milagro-crypto-rust
+	url = https://github.com/sigp/incubator-milagro-crypto-rust
+	branch = master
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: rust
 script:
   - cargo build --verbose --all
   - cargo test --verbose --all
-  - cargo fmt --all -- --check
+  - cargo fmt -- --check
   - |
     if [[ "$TRAVIS_RUST_VERSION" == nightly* ]]; then
       cargo build --no-default-features

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "milagro_bls"
-version = "0.11.0"
+version = "0.11.2"
 authors = ["Lovesh Harchandani <lovesh.bond@gmail.com>", "Kirk Baird <kirk@sigmaprime.io>", "Paul Hauner <paul@sigmaprime.io>"]
 description = "BLS12-381 signatures using the Apache Milagro curve library, targeting Ethereum 2.0"
 license = "Apache-2.0"
@@ -10,7 +10,7 @@ name = "bls381_benches"
 harness = false
 
 [dependencies]
-amcl = { path = "./amcl", default-features = false }
+amcl = { path = "./incubator-milagro-crypto-rust", default-features = false, features = ["bls381"]}
 hex = { version = "0.4.0", optional = true }
 lazy_static = { version = "1.4.0", optional = true }
 rand = { version = "0.7.2", default-features = false }
@@ -25,7 +25,6 @@ criterion = { version = "0.3.0", optional = true }
 default = ["std"]
 bench = ["criterion"]
 std = [
-  "amcl/std",
   "rand/std",
   "lazy_static",
   "hex",

diff --git a/amcl/Cargo.toml b/amcl/Cargo.toml
diff --git a/amcl/src/aes.rs b/amcl/src/aes.rs
diff --git a/amcl/src/arch.rs b/amcl/src/arch.rs