Skip to content

Commit 8580ef8

Browse files
authored
Merge pull request #458 from flavio/remove-ring
chore(deps): do not require ring
2 parents 9edbe19 + 2470df9 commit 8580ef8

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ default = ["full", "native-tls"]
1616

1717
bundle = ["sign", "verify"]
1818
cached-client = ["dep:cached"]
19-
cert = ["dep:ring"]
19+
cert = ["dep:aws-lc-rs", "rustls-webpki/aws-lc-rs"]
2020
cosign = [
2121
"cert",
2222
"dep:async-trait",
@@ -88,6 +88,7 @@ wasm = ["chrono/wasmbind", "getrandom/js", "ring?/wasm32_unknown_unknown_js"]
8888

8989
[dependencies]
9090
async-trait = { version = "0.1", optional = true, default-features = false }
91+
aws-lc-rs = { version = "1", optional = true, default-features = false }
9192
base64 = { version = "0.22", default-features = false, features = ["std"] }
9293
cached = { version = "0.55", optional = true, features = ["async"] }
9394
cfg-if = { version = "1.0.0", optional = true, default-features = false }
@@ -168,7 +169,6 @@ reqwest = { version = "0.12", default-features = false, features = [
168169
ring = { version = "0.17", default-features = false, optional = true }
169170
rsa = { version = "0.9", default-features = false, features = ["std"] }
170171
rustls-webpki = { version = "0.103", default-features = false, features = [
171-
"ring",
172172
"std",
173173
] }
174174
scrypt = { version = "0.11", default-features = false, features = [

src/crypto/keyring.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
use std::collections::HashMap;
1616

17+
use aws_lc_rs::{signature as aws_lc_rs_signature, signature::UnparsedPublicKey};
1718
use const_oid::db::rfc5912::{ID_EC_PUBLIC_KEY, RSA_ENCRYPTION, SECP_256_R_1};
1819
use digest::Digest;
19-
use ring::{signature as ring_signature, signature::UnparsedPublicKey};
2020
use thiserror::Error;
2121
use x509_cert::{
2222
der,
@@ -66,7 +66,7 @@ impl Key {
6666
// TODO(tnytown): should we also accept ed25519, p384, ... ?
6767
(ID_EC_PUBLIC_KEY, SECP_256_R_1) => Ok(Key {
6868
inner: UnparsedPublicKey::new(
69-
&ring_signature::ECDSA_P256_SHA256_ASN1,
69+
&aws_lc_rs_signature::ECDSA_P256_SHA256_ASN1,
7070
spki.subject_public_key.raw_bytes().to_owned(),
7171
),
7272
fingerprint: {

0 commit comments

Comments
 (0)