diff --git a/.github/workflows/async-signature.yml b/.github/workflows/async-signature.yml index 9d7da9f11..41aba9707 100644 --- a/.github/workflows/async-signature.yml +++ b/.github/workflows/async-signature.yml @@ -3,6 +3,7 @@ name: async-signature on: pull_request: paths: + - "async-signature/**" - "signature/**" - "Cargo.*" push: @@ -10,7 +11,7 @@ on: defaults: run: - working-directory: signature/async + working-directory: async-signature env: CARGO_INCREMENTAL: 0 @@ -43,5 +44,5 @@ jobs: - run: cargo update -Z minimal-versions - uses: dtolnay/rust-toolchain@stable - uses: RustCrypto/actions/cargo-hack-install@master - - run: rm ../../Cargo.toml + - run: rm ../Cargo.toml - run: cargo hack test --release --feature-powerset diff --git a/.github/workflows/signature.yml b/.github/workflows/signature.yml index 43cd3651e..335d3516d 100644 --- a/.github/workflows/signature.yml +++ b/.github/workflows/signature.yml @@ -4,6 +4,7 @@ on: pull_request: paths: - "signature/**" + - "signature-derive/**" - "Cargo.*" push: branches: master @@ -78,7 +79,7 @@ jobs: with: toolchain: ${{ matrix.rust }} - run: cargo test --release - working-directory: signature/derive + working-directory: signature-derive doc: runs-on: ubuntu-latest diff --git a/Cargo.lock b/Cargo.lock index 8509c494b..02129cfd4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -59,7 +59,7 @@ name = "async-signature" version = "0.4.0-pre" dependencies = [ "async-trait", - "signature 2.2.0-pre", + "signature 2.1.0", ] [[package]] @@ -1161,6 +1161,9 @@ name = "signature" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +dependencies = [ + "digest 0.10.7", +] [[package]] name = "signature" diff --git a/Cargo.toml b/Cargo.toml index 01eb142f8..01ab3016c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,7 @@ resolver = "2" members = [ "aead", + "async-signature", "cipher", "crypto", "crypto-common", @@ -10,7 +11,7 @@ members = [ "kem", "password-hash", "signature", - "signature/async", + "signature-derive", "universal-hash", ] diff --git a/signature/async/CHANGELOG.md b/async-signature/CHANGELOG.md similarity index 100% rename from signature/async/CHANGELOG.md rename to async-signature/CHANGELOG.md diff --git a/signature/async/Cargo.toml b/async-signature/Cargo.toml similarity index 90% rename from signature/async/Cargo.toml rename to async-signature/Cargo.toml index 260e540b1..098a390aa 100644 --- a/signature/async/Cargo.toml +++ b/async-signature/Cargo.toml @@ -5,7 +5,7 @@ version = "0.4.0-pre" authors = ["RustCrypto Developers"] license = "Apache-2.0 OR MIT" documentation = "https://docs.rs/async-signature" -repository = "https://github.com/RustCrypto/traits/tree/master/signature/async" +repository = "https://github.com/RustCrypto/traits/tree/master/async-signature" readme = "README.md" keywords = ["crypto", "ecdsa", "ed25519", "signature", "signing"] categories = ["cryptography", "no-std"] @@ -14,7 +14,7 @@ rust-version = "1.60" [dependencies] async-trait = "0.1.9" -signature = { version = "=2.2.0-pre", path = ".." } +signature = ">= 2.0, <2.3" [features] digest = ["signature/digest"] diff --git a/signature/async/LICENSE-APACHE b/async-signature/LICENSE-APACHE similarity index 100% rename from signature/async/LICENSE-APACHE rename to async-signature/LICENSE-APACHE diff --git a/signature/async/LICENSE-MIT b/async-signature/LICENSE-MIT similarity index 100% rename from signature/async/LICENSE-MIT rename to async-signature/LICENSE-MIT diff --git a/signature/async/README.md b/async-signature/README.md similarity index 100% rename from signature/async/README.md rename to async-signature/README.md diff --git a/signature/async/src/lib.rs b/async-signature/src/lib.rs similarity index 100% rename from signature/async/src/lib.rs rename to async-signature/src/lib.rs diff --git a/signature/derive/CHANGELOG.md b/signature-derive/CHANGELOG.md similarity index 100% rename from signature/derive/CHANGELOG.md rename to signature-derive/CHANGELOG.md diff --git a/signature/derive/Cargo.toml b/signature-derive/Cargo.toml similarity index 96% rename from signature/derive/Cargo.toml rename to signature-derive/Cargo.toml index 35a1e8488..e12d1e084 100644 --- a/signature/derive/Cargo.toml +++ b/signature-derive/Cargo.toml @@ -5,7 +5,7 @@ authors = ["RustCrypto Developers"] license = "Apache-2.0 OR MIT" description = "Custom derive support for the 'signature' crate" documentation = "https://docs.rs/signature" -repository = "https://github.com/RustCrypto/traits/tree/master/signature/derive" +repository = "https://github.com/RustCrypto/traits/tree/master/signature-derive" readme = "README.md" edition = "2021" rust-version = "1.56" diff --git a/signature/derive/LICENSE-APACHE b/signature-derive/LICENSE-APACHE similarity index 100% rename from signature/derive/LICENSE-APACHE rename to signature-derive/LICENSE-APACHE diff --git a/signature/derive/LICENSE-MIT b/signature-derive/LICENSE-MIT similarity index 100% rename from signature/derive/LICENSE-MIT rename to signature-derive/LICENSE-MIT diff --git a/signature/derive/README.md b/signature-derive/README.md similarity index 100% rename from signature/derive/README.md rename to signature-derive/README.md diff --git a/signature/derive/src/lib.rs b/signature-derive/src/lib.rs similarity index 100% rename from signature/derive/src/lib.rs rename to signature-derive/src/lib.rs diff --git a/signature/Cargo.toml b/signature/Cargo.toml index b88f034c9..8790e28c3 100644 --- a/signature/Cargo.toml +++ b/signature/Cargo.toml @@ -13,7 +13,7 @@ edition = "2021" rust-version = "1.60" [dependencies] -derive = { package = "signature_derive", version = "2", optional = true, path = "derive" } +derive = { package = "signature_derive", version = "2", optional = true, path = "../signature-derive" } digest = { version = "0.10.6", optional = true, default-features = false } rand_core = { version = "0.6.4", optional = true, default-features = false }