gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-06-29 10:54:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

swap out rust-crypto for RustCrypto libraries for key management (#1270)

Browse Source 
* swap out rust-crypto for RustCrypto libraries for key management

* change scrypt params unrwap to expect

* delete eth2 key derivation path file, fix error handling in eth2 keystore, pr updates
This commit is contained in:
realbigsean
2020-07-01 04:01:03 -04:00
committed by GitHub
parent 536728b975
commit 9dab928572
7 changed files with 262 additions and 813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

292
Cargo.lock generated
View File

@@ -51,7 +51,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4cf01b9b56e767bb57b94ebf91a58b338002963785cdd7013e21c0d4679471e4"
dependencies = [
"generic-array",
"generic-array 0.12.3",
]
[[package]]
@@ -60,8 +60,8 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54eb1d8fe354e5fc611daf4f2ea97dd45a765f4f1e4512306ec183ae2e8f20c9"
dependencies = [
"aes-soft",
"aesni",
"aes-soft 0.3.3",
"aesni 0.6.0",
"block-cipher-trait",
]
@@ -71,10 +71,22 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2e5b0458ea3beae0d1d8c0f3946564f8e10f90646cf78c06b4351052058d1ee"
dependencies = [
"aes-soft",
"aesni",
"ctr",
"stream-cipher",
"aes-soft 0.3.3",
"aesni 0.6.0",
"ctr 0.3.2",
"stream-cipher 0.3.2",
]
[[package]]
name = "aes-ctr"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92e60aeefd2a0243bd53a42e92444e039f67c3d7f0382c9813577696e7c10bf3"
dependencies = [
"aes-soft 0.4.0",
"aesni 0.7.0",
"ctr 0.4.0",
"stream-cipher 0.4.1",
]
[[package]]
@@ -102,6 +114,17 @@ dependencies = [
"opaque-debug",
]
[[package]]
name = "aes-soft"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4925647ee64e5056cf231608957ce7c81e12d6d6e316b9ce1404778cc1d35fa7"
dependencies = [
"block-cipher",
"byteorder",
"opaque-debug",
]
[[package]]
name = "aesni"
version = "0.6.0"
@@ -110,7 +133,18 @@ checksum = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100"
dependencies = [
"block-cipher-trait",
"opaque-debug",
"stream-cipher",
"stream-cipher 0.3.2",
]
[[package]]
name = "aesni"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d050d39b0b7688b3a3254394c3e30a9d66c41dcf9b05b0e2dbdc623f6505d264"
dependencies = [
"block-cipher",
"opaque-debug",
"stream-cipher 0.4.1",
]
[[package]]
@@ -397,8 +431,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330"
dependencies = [
"byte-tools",
"crypto-mac",
"digest",
"crypto-mac 0.7.0",
"digest 0.8.1",
"opaque-debug",
]
@@ -433,7 +467,28 @@ dependencies = [
"block-padding",
"byte-tools",
"byteorder",
"generic-array",
"generic-array 0.12.3",
]
[[package]]
name = "block-buffer"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbcf92448676f82bb7a334c58bbce8b0d43580fb5362a9d608b18879d12a3d31"
dependencies = [
"block-padding",
"byte-tools",
"byteorder",
"generic-array 0.14.2",
]
[[package]]
name = "block-cipher"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa136449e765dc7faa244561ccae839c394048667929af599b5d931ebe7b7f10"
dependencies = [
"generic-array 0.14.2",
]
[[package]]
@@ -442,7 +497,7 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774"
dependencies = [
"generic-array",
"generic-array 0.12.3",
]
[[package]]
@@ -609,7 +664,7 @@ version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6a7ae4c498f8447d86baef0fa0831909333f558866fabcb21600625ac5a31c7"
dependencies = [
"stream-cipher",
"stream-cipher 0.3.2",
"zeroize",
]
@@ -622,7 +677,7 @@ dependencies = [
"aead",
"chacha20",
"poly1305",
"stream-cipher",
"stream-cipher 0.3.2",
"zeroize",
]
@@ -936,10 +991,20 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
dependencies = [
"generic-array",
"generic-array 0.12.3",
"subtle 1.0.0",
]
[[package]]
name = "crypto-mac"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
dependencies = [
"generic-array 0.14.2",
"subtle 2.2.3",
]
[[package]]
name = "csv"
version = "1.1.3"
@@ -969,7 +1034,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "022cd691704491df67d25d006fe8eca083098253c4d43516c2206479c58c6736"
dependencies = [
"block-cipher-trait",
"stream-cipher",
"stream-cipher 0.3.2",
]
[[package]]
name = "ctr"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3592740fd55aaf61dd72df96756bd0d11e6037b89dcf30ae2e1895b267692be"
dependencies = [
"stream-cipher 0.4.1",
]
[[package]]
@@ -989,7 +1063,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d85653f070353a16313d0046f173f70d1aadd5b42600a14de626f0dfb3473a5"
dependencies = [
"byteorder",
"digest",
"digest 0.8.1",
"rand_core 0.5.1",
"subtle 2.2.3",
"zeroize",
@@ -1078,7 +1152,16 @@ version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
dependencies = [
"generic-array",
"generic-array 0.12.3",
]
[[package]]
name = "digest"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
dependencies = [
"generic-array 0.14.2",
]
[[package]]
@@ -1116,7 +1199,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66319abef3e2f4dc434bf0c9bcb5dee5907d7fece3327dfd7da82db905d02441"
dependencies = [
"arrayvec",
"digest",
"digest 0.8.1",
"enr",
"fnv",
"futures 0.3.5",
@@ -1133,7 +1216,7 @@ dependencies = [
"parking_lot 0.10.2",
"rand 0.7.3",
"rlp",
"sha2",
"sha2 0.8.2",
"smallvec 1.4.0",
"tokio 0.2.21",
"uint",
@@ -1161,7 +1244,7 @@ dependencies = [
"clear_on_drop",
"curve25519-dalek",
"rand 0.7.3",
"sha2",
"sha2 0.8.2",
]
[[package]]
@@ -1325,7 +1408,7 @@ dependencies = [
"lazy_static",
"ring",
"rustc-hex",
"sha2",
"sha2 0.8.2",
"wasm-bindgen-test",
]
@@ -1352,7 +1435,7 @@ dependencies = [
"hex 0.3.2",
"num-bigint-dig",
"ring",
"rust-crypto",
"sha2 0.9.0",
"zeroize",
]
@@ -1360,15 +1443,19 @@ dependencies = [
name = "eth2_keystore"
version = "0.1.0"
dependencies = [
"aes-ctr 0.4.0",
"bls",
"eth2_key_derivation",
"eth2_ssz",
"hex 0.3.2",
"hmac 0.8.0",
"pbkdf2 0.4.0",
"rand 0.7.3",
"rust-crypto",
"scrypt",
"serde",
"serde_json",
"serde_repr",
"sha2 0.9.0",
"tempfile",
"uuid",
"zeroize",
@@ -1398,7 +1485,7 @@ dependencies = [
"parking_lot 0.10.2",
"serde",
"serde_derive",
"sha2",
"sha2 0.8.2",
"slog",
"slog-async",
"slog-stdlog",
@@ -1811,6 +1898,16 @@ dependencies = [
"typenum",
]
[[package]]
name = "generic-array"
version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac746a5f3bbfdadd6106868134545e684693d54d9d44f6e9588a7d54af0bf980"
dependencies = [
"typenum",
"version_check 0.9.2",
]
[[package]]
name = "genesis"
version = "0.1.2"
@@ -1980,8 +2077,8 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fa08a006102488bd9cd5b8013aabe84955cf5ae22e304c2caf655b633aefae3"
dependencies = [
"digest",
"hmac",
"digest 0.8.1",
"hmac 0.7.1",
]
[[package]]
@@ -1990,8 +2087,18 @@ version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695"
dependencies = [
"crypto-mac",
"digest",
"crypto-mac 0.7.0",
"digest 0.8.1",
]
[[package]]
name = "hmac"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b87b580bd66811cc2324a27f3587de707cacf7525b96dca8122f7493e6cce0da"
dependencies = [
"crypto-mac 0.8.0",
"digest 0.9.0",
]
[[package]]
@@ -2000,9 +2107,9 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b"
dependencies = [
"digest",
"generic-array",
"hmac",
"digest 0.8.1",
"generic-array 0.12.3",
"hmac 0.7.1",
]
[[package]]
@@ -2469,7 +2576,7 @@ dependencies = [
"rand 0.7.3",
"ring",
"rw-stream-sink",
"sha2",
"sha2 0.8.2",
"smallvec 1.4.0",
"thiserror",
"unsigned-varint 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2502,7 +2609,7 @@ dependencies = [
"rand 0.7.3",
"ring",
"rw-stream-sink",
"sha2",
"sha2 0.8.2",
"smallvec 1.4.0",
"thiserror",
"unsigned-varint 0.4.0",
@@ -2547,7 +2654,7 @@ dependencies = [
"prost",
"prost-build",
"rand 0.7.3",
"sha2",
"sha2 0.8.2",
"smallvec 1.4.0",
"unsigned-varint 0.4.0",
"wasm-timer",
@@ -2596,7 +2703,7 @@ dependencies = [
"prost",
"prost-build",
"rand 0.7.3",
"sha2",
"sha2 0.8.2",
"snow",
"static_assertions",
"x25519-dalek",
@@ -2608,10 +2715,10 @@ name = "libp2p-secio"
version = "0.19.2"
source = "git+https://github.com/sigp/rust-libp2p?rev=a6232506278b9e686248f8d04b79400861b143c2#a6232506278b9e686248f8d04b79400861b143c2"
dependencies = [
"aes-ctr",
"ctr",
"aes-ctr 0.3.0",
"ctr 0.3.2",
"futures 0.3.5",
"hmac",
"hmac 0.7.1",
"js-sys",
"lazy_static",
"libp2p-core 0.19.2",
@@ -2624,7 +2731,7 @@ dependencies = [
"rand 0.7.3",
"ring",
"rw-stream-sink",
"sha2",
"sha2 0.8.2",
"static_assertions",
"twofish",
"wasm-bindgen",
@@ -2700,10 +2807,10 @@ checksum = "1fc1e2c808481a63dc6da2074752fdd4336a3c8fcc68b83db6f1fd5224ae7962"
dependencies = [
"arrayref",
"crunchy",
"digest",
"digest 0.8.1",
"hmac-drbg",
"rand 0.7.3",
"sha2",
"sha2 0.8.2",
"subtle 2.2.3",
"typenum",
]
@@ -3018,9 +3125,9 @@ checksum = "f75db05d738947aa5389863aadafbcf2e509d7ba099dc2ddcdf4fc66bf7a9e03"
dependencies = [
"blake2b_simd",
"blake2s_simd",
"digest",
"digest 0.8.1",
"sha-1",
"sha2",
"sha2 0.8.2",
"sha3",
"unsigned-varint 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
@@ -3423,7 +3530,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9"
dependencies = [
"byteorder",
"crypto-mac",
"crypto-mac 0.7.0",
]
[[package]]
name = "pbkdf2"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd"
dependencies = [
"crypto-mac 0.8.0",
]
[[package]]
@@ -3753,16 +3869,6 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac"
[[package]]
name = "rand"
version = "0.3.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c"
dependencies = [
"libc",
"rand 0.4.6",
]
[[package]]
name = "rand"
version = "0.4.6"
@@ -4112,19 +4218,6 @@ dependencies = [
"crossbeam-utils",
]
[[package]]
name = "rust-crypto"
version = "0.2.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a"
dependencies = [
"gcc",
"libc",
"rand 0.3.23",
"rustc-serialize",
"time 0.1.43",
]
[[package]]
name = "rustc-demangle"
version = "0.1.16"
@@ -4143,12 +4236,6 @@ version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
[[package]]
name = "rustc-serialize"
version = "0.3.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
[[package]]
name = "rustc_version"
version = "0.2.3"
@@ -4244,6 +4331,17 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
[[package]]
name = "scrypt"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83ecb7ed8e2266bd539feb932c52b9e7ce01d14384166ac50fecb173f762f1aa"
dependencies = [
"hmac 0.8.0",
"pbkdf2 0.4.0",
"sha2 0.9.0",
]
[[package]]
name = "sct"
version = "0.6.0"
@@ -4396,8 +4494,8 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
dependencies = [
"block-buffer",
"digest",
"block-buffer 0.7.3",
"digest 0.8.1",
"fake-simd",
"opaque-debug",
]
@@ -4414,8 +4512,20 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69"
dependencies = [
"block-buffer",
"digest",
"block-buffer 0.7.3",
"digest 0.8.1",
"fake-simd",
"opaque-debug",
]
[[package]]
name = "sha2"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72377440080fd008550fe9b441e854e43318db116f90181eef92e9ae9aedab48"
dependencies = [
"block-buffer 0.8.0",
"digest 0.9.0",
"fake-simd",
"opaque-debug",
]
@@ -4426,9 +4536,9 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd26bc0e7a2e3a7c959bc494caf58b72ee0c71d67704e9520f736ca7e4853ecf"
dependencies = [
"block-buffer",
"block-buffer 0.7.3",
"byte-tools",
"digest",
"digest 0.8.1",
"keccak",
"opaque-debug",
]
@@ -4658,7 +4768,7 @@ dependencies = [
"rand_core 0.5.1",
"ring",
"rustc_version",
"sha2",
"sha2 0.8.2",
"subtle 2.2.3",
"x25519-dalek",
]
@@ -4828,7 +4938,17 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8131256a5896cabcf5eb04f4d6dacbe1aefda854b0d9896e09cb58829ec5638c"
dependencies = [
"generic-array",
"generic-array 0.12.3",
]
[[package]]
name = "stream-cipher"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09f8ed9974042b8c3672ff3030a69fcc03b74c47c3d1ecb7755e8a3626011e88"
dependencies = [
"block-cipher",
"generic-array 0.14.2",
]
[[package]]
@@ -5060,12 +5180,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0165e045cc2ae1660270ca65e1676dbaab60feb0f91b10f7d0665e9b47e31f2"
dependencies = [
"failure",
"hmac",
"hmac 0.7.1",
"once_cell",
"pbkdf2",
"pbkdf2 0.3.0",
"rand 0.7.3",
"rustc-hash",
"sha2",
"sha2 0.8.2",
"unicode-normalization",
]
@@ -5632,7 +5752,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df0c900f2f9b4116803415878ff48b63da9edb268668e08cf9292d7503114a01"
dependencies = [
"generic-array",
"generic-array 0.12.3",
"subtle 2.2.3",
]