Skip to content

Commit

Permalink
global: move cryptography-message-syntax, pgp-cleartext, x509-certifi…
Browse files Browse the repository at this point in the history
…cate to own repository

I'm splitting up the monorepo.

In order to move the `apple-*` crates out of this repo, we need to move
crates they depend on as well in order to avoid the diamond dependency
problem.

I have moved the `cryptographic-message-syntax`, `pgp-cleartext`, and
`x509-certificate` crates to
https://github.com/indygreg/cryptography-rs.

This commit deletes those crates from this repository and updates
references to use the latest published versions, which should be
identical to the in-repo versions previously referenced.
  • Loading branch information
indygreg committed Sep 18, 2022
1 parent b71b1d2 commit 64a251e
Show file tree
Hide file tree
Showing 54 changed files with 17 additions and 14,130 deletions.
12 changes: 9 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@ members = [
'apple-flat-package',
'apple-xar',
'cpio-archive',
'cryptographic-message-syntax',
'debian-packaging',
"debian-repo-tool",
'linux-package-analyzer',
'pgp-cleartext',
'pyembed-bench',
'pyembed',
'pyoxidizer',
Expand All @@ -30,6 +28,5 @@ members = [
'tugger-windows',
'tugger-windows-codesign',
'tugger-wix',
'x509-certificate',
]
resolver = "2"
10 changes: 2 additions & 8 deletions apple-codesign/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ bitflags = "1.2"
bytes = "1.0"
clap = "3.1"
chrono = "0.4"
cryptographic-message-syntax = "0.18"
der = "0.6"
dialoguer = "0.10"
difference = "2.0"
Expand Down Expand Up @@ -71,6 +72,7 @@ thiserror = "1.0"
tokio = { version = "1.19", features = ["rt"] }
tungstenite = { version = "0.17", features = ["rustls-tls-native-roots"] }
uuid = { version = "1.1", features = ["v4"] }
x509-certificate = "0.15"
x509 = "0.2"
xml-rs = "0.8"
yasna = "0.5"
Expand All @@ -91,18 +93,10 @@ version = "0.10.0-pre"
path = "../apple-xar"
version = "0.10.0-pre"

[dependencies.cryptographic-message-syntax]
path = "../cryptographic-message-syntax"
version = "0.19.0-pre"

[dependencies.tugger-apple]
path = "../tugger-apple"
version = "0.8.0-pre"

[dependencies.x509-certificate]
path = "../x509-certificate"
version = "0.16.0-pre"

[target.'cfg(target_os = "macos")'.dependencies]
security-framework = { version = "2.6", features = ["OSX_10_12"] }

Expand Down
10 changes: 2 additions & 8 deletions apple-xar/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ base64 = "0.13"
bcder = "0.7"
bzip2 = "0.4"
chrono = { version = "0.4", features = ["serde"] }
cryptographic-message-syntax = "0.18"
digest = "0.10"
log = "0.4"
md-5 = "0.10"
Expand All @@ -29,13 +30,6 @@ sha2 = "0.10"
signature = "1.3"
thiserror = "1.0"
url = "2.2"
x509-certificate = "0.15"
xml-rs = "0.8"
xz2 = { version = "0.1", features = ["static"] }

[dependencies.cryptographic-message-syntax]
path = "../cryptographic-message-syntax"
version = "0.19.0-pre"

[dependencies.x509-certificate]
path = "../x509-certificate"
version = "0.16.0-pre"
26 changes: 0 additions & 26 deletions cryptographic-message-syntax/CHANGELOG.rst

This file was deleted.

26 changes: 0 additions & 26 deletions cryptographic-message-syntax/Cargo.toml

This file was deleted.

20 changes: 0 additions & 20 deletions cryptographic-message-syntax/README.md

This file was deleted.

10 changes: 0 additions & 10 deletions cryptographic-message-syntax/src/asn1/mod.rs

This file was deleted.

Loading

0 comments on commit 64a251e

Please sign in to comment.