Skip to content

Commit 9ae22ed

Browse files
committed
Revert dependency configuration changes
1 parent a04feab commit 9ae22ed

File tree

6 files changed

+28
-57
lines changed

6 files changed

+28
-57
lines changed

Cargo.toml

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,3 @@ members = [
77
"openssl-sys",
88
"systest",
99
]
10-
11-
[workspace.dependencies]
12-
aws-lc-fips-sys = { version = "0.13", features = ["ssl", "bindgen"] }
13-
aws-lc-sys = { version = "0.30.0", features = ["ssl"] }
14-
bitflags = "2.2.1"
15-
bssl-sys = { version = "0.1.0" }
16-
cfg-if = "1.0"
17-
foreign-types = "0.3.1"
18-
hex = "0.4"
19-
libc = "0.2"
20-
once_cell = "1.5.2"
21-
proc-macro2 = "1"
22-
quote = "1"
23-
syn = { version = "2", features = ["full"] }
24-
25-
# Build dependencies
26-
bindgen = { version = "0.72.0", features = ["experimental"] }
27-
cc = "1.0.61"
28-
openssl-src = { version = "300.2.0", features = ["legacy"] }
29-
pkg-config = "0.3.9"
30-
vcpkg = "0.2.8"
31-
ctest = "0.4.11"
32-
33-
# Workspace dependencies
34-
openssl-macros = { path = "./openssl-macros" }
35-
openssl-sys = { path = "./openssl-sys" }
36-
openssl = { path = "./openssl" }
37-
ffi = { package = "openssl-sys", path = "./openssl-sys" }

openssl-errors/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ categories = ["api-bindings"]
1111
rust-version = "1.70.0"
1212

1313
[dependencies]
14-
cfg-if.workspace = true
15-
libc.workspace = true
14+
cfg-if = "1.0"
15+
libc = "0.2"
1616

17-
openssl-sys.workspace = true
17+
openssl-sys = { version = "0.9.64", path = "../openssl-sys" }
1818

1919
[dev-dependencies]
20-
openssl.workspace = true
20+
openssl = { version = "0.10.19", path = "../openssl" }

openssl-macros/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ rust-version = "1.70.0"
1111
proc-macro = true
1212

1313
[dependencies]
14-
proc-macro2.workspace = true
15-
quote.workspace = true
16-
syn.workspace = true
14+
proc-macro2 = "1"
15+
quote = "1"
16+
syn = { version = "2", features = ["full"] }

openssl-sys/Cargo.toml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,19 @@ vendored = ['openssl-src']
2020
unstable_boringssl = ['bssl-sys']
2121
aws-lc = ['dep:aws-lc-sys']
2222
aws-lc-fips = ['dep:aws-lc-fips-sys']
23-
bindgen = ['dep:bindgen']
2423

2524
[dependencies]
26-
libc.workspace = true
27-
bssl-sys = { workspace = true, optional = true}
28-
aws-lc-sys = { workspace = true, optional = true}
29-
aws-lc-fips-sys = { workspace = true, optional = true}
25+
libc = "0.2"
26+
bssl-sys = { version = "0.1.0", optional = true }
27+
aws-lc-sys = { version = "0.27", features = ["ssl"], optional = true }
28+
aws-lc-fips-sys = { version = "0.13", features = ["ssl", "bindgen"], optional = true }
3029

3130
[build-dependencies]
32-
bindgen = { workspace = true, optional = true }
33-
cc.workspace = true
34-
openssl-src = { workspace = true, optional = true }
35-
pkg-config.workspace = true
36-
vcpkg.workspace = true
31+
bindgen = { version = "0.72.0", optional = true, features = ["experimental"] }
32+
cc = "1.0.61"
33+
openssl-src = { version = "300.2.0", optional = true, features = ["legacy"] }
34+
pkg-config = "0.3.9"
35+
vcpkg = "0.2.8"
3736

3837
# We don't actually use metadeps for annoying reasons but this is still here for tooling
3938
[package.metadata.pkg-config]

openssl/Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ aws-lc-fips = ["ffi/aws-lc-fips"]
2626
default = []
2727

2828
[dependencies]
29-
bitflags.workspace = true
30-
cfg-if.workspace = true
31-
foreign-types.workspace = true
32-
libc.workspace = true
33-
once_cell.workspace = true
29+
bitflags = "2.2.1"
30+
cfg-if = "1.0"
31+
foreign-types = "0.3.1"
32+
libc = "0.2"
33+
once_cell = "1.5.2"
3434

35-
openssl-macros.workspace = true
36-
ffi.workspace = true # 0.9.109 => -
35+
openssl-macros = { version = "0.1.1", path = "../openssl-macros" }
36+
ffi = { package = "openssl-sys", version = "0.9.109", path = "../openssl-sys" }
3737

3838
[dev-dependencies]
39-
hex.workspace = true
39+
hex = "0.4"

systest/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
name = "systest"
33
version = "0.1.0"
44
authors = ["Alex Crichton <[email protected]>"]
5-
edition = "2021"
5+
edition = "2018"
66

77
[dependencies]
8-
libc.workspace = true
9-
openssl-sys.workspace = true
8+
libc = "0.2"
9+
openssl-sys = { path = "../openssl-sys" }
1010

1111
[build-dependencies]
12-
ctest.workspace = true
12+
ctest = "0.4.11"
1313

1414
[features]
1515
vendored = ['openssl-sys/vendored']

0 commit comments

Comments
 (0)