Skip to content

Commit

Permalink
Merge pull request #30 from RustCrypto/hmac-v0.8
Browse files Browse the repository at this point in the history
Upgrade to hmac v0.8; sha2 v0.9 crate releases
  • Loading branch information
tarcieri authored Jun 10, 2020
2 parents 02f6308 + 8c5faec commit e02e069
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 18 deletions.
10 changes: 0 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,3 @@ members = [
"pbkdf2",
"scrypt",
]

[patch.crates-io]
block-buffer = { git = "https://github.com/RustCrypto/utils" }
crypto-mac = { git = "https://github.com/RustCrypto/traits" }
digest = { git = "https://github.com/RustCrypto/traits" }
hmac = { git = "https://github.com/RustCrypto/MACs" }
salsa20 = { git = "https://github.com/RustCrypto/stream-ciphers" }
sha-1 = { git = "https://github.com/RustCrypto/hashes" }
sha2 = { git = "https://github.com/RustCrypto/hashes" }
stream-cipher = { git = "https://github.com/RustCrypto/traits" }
10 changes: 5 additions & 5 deletions pbkdf2/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ byteorder = { version = "1", default-features = false }
rayon = { version = "1", optional = true }
base64 = { version = "0.9", optional = true }
rand = { version = "0.5", optional = true }
hmac = { version = "= 0.8.0-pre", optional = true }
sha2 = { version = "= 0.9.0-pre", optional = true }
hmac = { version = "0.8", optional = true }
sha2 = { version = "0.9", optional = true }
subtle = { version = "2", default-features = false , optional = true }

[dev-dependencies]
hmac = "= 0.8.0-pre"
sha-1 = "= 0.9.0-pre"
sha2 = "= 0.9.0-pre"
hmac = "0.8"
sha-1 = "0.9"
sha2 = "0.9"

[features]
default = ["include_simple"]
Expand Down
5 changes: 2 additions & 3 deletions scrypt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ edition = "2018"
base64 = { version = "0.9", optional = true }
byte-tools = "0.3"
byteorder = { version = "1", default-features = false }
hmac = "= 0.8.0-pre"
hmac = "0.8"
pbkdf2 = { version = "= 0.4.0-pre", default-features = false, path = "../pbkdf2" }
rand = { version = "0.5", optional = true }
sha2 = { version = "= 0.9.0-pre", default-features = false }
salsa20 = "= 0.5.0-pre"
sha2 = { version = "0.9", default-features = false }
subtle = { version = "2", default-features = false , optional = true }

[features]
Expand Down

0 comments on commit e02e069

Please sign in to comment.