gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Gate libsecp256k1 update (backport #18656) (#18701)

Browse Source 
* hijack secp256k1 enablement feature plumbing for libsecp256k1 upgrade

* bump libsecp256k1 to v0.5.0

* gate libsecp256k1 upgrade to v0.5.0

* ci: allow clippy::inconsistent_struct_constructor

Co-authored-by: Trent Nelson <trent@solana.com>
This commit is contained in:
mergify[bot]
2021-07-16 07:38:45 +00:00
committed by GitHub
parent 9b7fba69f4
commit c7c650fccc
21 changed files with 147 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
programs/bpf/Cargo.lock generated
View File

@@ -661,16 +661,6 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]]
name = "crypto-mac"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
dependencies = [
"generic-array 0.12.3",
"subtle 1.0.0",
]
[[package]]
name = "crypto-mac"
version = "0.8.0"
@@ -678,7 +668,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
dependencies = [
"generic-array 0.14.3",
"subtle 2.2.2",
"subtle",
]
[[package]]
@@ -688,7 +678,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca"
dependencies = [
"generic-array 0.14.3",
"subtle 2.2.2",
"subtle",
]
[[package]]
@@ -698,7 +688,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6"
dependencies = [
"generic-array 0.14.3",
"subtle 2.2.2",
"subtle",
]
[[package]]
@@ -710,7 +700,7 @@ dependencies = [
"byteorder 1.3.4",
"digest 0.8.1",
"rand_core 0.5.1",
"subtle 2.2.2",
"subtle",
"zeroize",
]
@@ -723,7 +713,7 @@ dependencies = [
"byteorder 1.3.4",
"digest 0.9.0",
"rand_core 0.5.1",
"subtle 2.2.2",
"subtle",
"zeroize",
]
@@ -844,7 +834,7 @@ dependencies = [
"rand 0.7.3",
"serde",
"serde_bytes",
"sha2 0.9.2",
"sha2",
"zeroize",
]
@@ -858,7 +848,7 @@ dependencies = [
"ed25519-dalek",
"failure",
"hmac 0.9.0",
"sha2 0.9.2",
"sha2",
]
[[package]]
@@ -1273,16 +1263,6 @@ dependencies = [
"pkg-config",
]
[[package]]
name = "hmac"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695"
dependencies = [
"crypto-mac 0.7.0",
"digest 0.8.1",
]
[[package]]
name = "hmac"
version = "0.8.1"
@@ -1313,17 +1293,6 @@ dependencies = [
"digest 0.9.0",
]
[[package]]
name = "hmac-drbg"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6e570451493f10f6581b48cdd530413b63ea9e780f544bfd3bdcaa0d89d1a7b"
dependencies = [
"digest 0.8.1",
"generic-array 0.12.3",
"hmac 0.7.1",
]
[[package]]
name = "hmac-drbg"
version = "0.3.0"
@@ -1574,22 +1543,6 @@ dependencies = [
"winapi 0.3.8",
]
[[package]]
name = "libsecp256k1"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fc1e2c808481a63dc6da2074752fdd4336a3c8fcc68b83db6f1fd5224ae7962"
dependencies = [
"arrayref",
"crunchy",
"digest 0.8.1",
"hmac-drbg 0.2.0",
"rand 0.7.3",
"sha2 0.8.2",
"subtle 2.2.2",
"typenum",
]
[[package]]
name = "libsecp256k1"
version = "0.5.0"
@@ -1599,13 +1552,13 @@ dependencies = [
"arrayref",
"base64 0.12.3",
"digest 0.9.0",
"hmac-drbg 0.3.0",
"hmac-drbg",
"libsecp256k1-core",
"libsecp256k1-gen-ecmult",
"libsecp256k1-gen-genmult",
"rand 0.7.3",
"serde",
"sha2 0.9.2",
"sha2",
"typenum",
]
@@ -1617,7 +1570,7 @@ checksum = "4ee11012b293ea30093c129173cac4335513064094619f4639a25b310fd33c11"
dependencies = [
"crunchy",
"digest 0.9.0",
"subtle 2.2.2",
"subtle",
]
[[package]]
@@ -2735,18 +2688,6 @@ dependencies = [
"opaque-debug 0.2.3",
]
[[package]]
name = "sha2"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69"
dependencies = [
"block-buffer 0.7.3",
"digest 0.8.1",
"fake-simd",
"opaque-debug 0.2.3",
]
[[package]]
name = "sha2"
version = "0.9.2"
@@ -2892,7 +2833,7 @@ version = "1.7.5"
dependencies = [
"bincode",
"byteorder 1.3.4",
"libsecp256k1 0.5.0",
"libsecp256k1",
"log",
"num-derive 0.3.0",
"num-traits",
@@ -3361,7 +3302,7 @@ dependencies = [
"rustc_version",
"serde",
"serde_derive",
"sha2 0.9.2",
"sha2",
"solana-frozen-abi-macro 1.7.1",
"solana-logger 1.7.1",
"thiserror",
@@ -3379,7 +3320,7 @@ dependencies = [
"rustc_version",
"serde",
"serde_derive",
"sha2 0.9.2",
"sha2",
"solana-frozen-abi-macro 1.7.5",
"solana-logger 1.7.5",
"thiserror",
@@ -3493,7 +3434,7 @@ dependencies = [
"serde",
"serde_bytes",
"serde_derive",
"sha2 0.9.2",
"sha2",
"sha3",
"solana-frozen-abi 1.7.1",
"solana-frozen-abi-macro 1.7.1",
@@ -3516,7 +3457,7 @@ dependencies = [
"hex",
"itertools 0.9.0",
"lazy_static",
"libsecp256k1 0.5.0",
"libsecp256k1",
"log",
"num-derive 0.3.0",
"num-traits",
@@ -3526,7 +3467,7 @@ dependencies = [
"serde",
"serde_bytes",
"serde_derive",
"sha2 0.9.2",
"sha2",
"sha3",
"solana-frozen-abi 1.7.5",
"solana-frozen-abi-macro 1.7.5",
@@ -3654,7 +3595,7 @@ dependencies = [
"hmac 0.10.1",
"itertools 0.9.0",
"lazy_static",
"libsecp256k1 0.3.5",
"libsecp256k1",
"log",
"memmap2",
"num-derive 0.3.0",
@@ -3670,7 +3611,7 @@ dependencies = [
"serde_bytes",
"serde_derive",
"serde_json",
"sha2 0.9.2",
"sha2",
"sha3",
"solana-crate-features",
"solana-frozen-abi 1.7.5",
@@ -3864,12 +3805,6 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "subtle"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
[[package]]
name = "subtle"
version = "2.2.2"
@@ -4053,7 +3988,7 @@ dependencies = [
"pbkdf2 0.4.0",
"rand 0.7.3",
"rustc-hash",
"sha2 0.9.2",
"sha2",
"thiserror",
"unicode-normalization",
"zeroize",