diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7fe69f7..7b13916 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.58.1 + toolchain: 1.71.0 default: true profile: minimal components: rustfmt, clippy diff --git a/src/ecdsa.rs b/src/ecdsa.rs index 52bb392..4589fcd 100644 --- a/src/ecdsa.rs +++ b/src/ecdsa.rs @@ -196,8 +196,8 @@ impl PublicKeyToJwk for EcdsaPrivateKey { kty: "EC".into(), use_: Some("sig".into()), crv: Some(self.algorithm.curve_name().into()), - x: Some(base64::encode_config(&x, url_safe_trailing_bits())), - y: Some(base64::encode_config(&y, url_safe_trailing_bits())), + x: Some(base64::encode_config(x, url_safe_trailing_bits())), + y: Some(base64::encode_config(y, url_safe_trailing_bits())), ..Default::default() }) } @@ -211,9 +211,9 @@ impl PrivateKeyToJwk for EcdsaPrivateKey { kty: "EC".into(), use_: Some("sig".into()), crv: Some(self.algorithm.curve_name().into()), - d: Some(base64::encode_config(&d, url_safe_trailing_bits())), - x: Some(base64::encode_config(&x, url_safe_trailing_bits())), - y: Some(base64::encode_config(&y, url_safe_trailing_bits())), + d: Some(base64::encode_config(d, url_safe_trailing_bits())), + x: Some(base64::encode_config(x, url_safe_trailing_bits())), + y: Some(base64::encode_config(y, url_safe_trailing_bits())), ..Default::default() }) } @@ -307,8 +307,8 @@ impl PublicKeyToJwk for EcdsaPublicKey { kty: "EC".into(), use_: Some("sig".into()), crv: Some(self.algorithm.curve_name().into()), - x: Some(base64::encode_config(&x, url_safe_trailing_bits())), - y: Some(base64::encode_config(&y, url_safe_trailing_bits())), + x: Some(base64::encode_config(x, url_safe_trailing_bits())), + y: Some(base64::encode_config(y, url_safe_trailing_bits())), ..Default::default() }) } diff --git a/src/eddsa.rs b/src/eddsa.rs index 88f1be1..8b207d8 100644 --- a/src/eddsa.rs +++ b/src/eddsa.rs @@ -100,7 +100,7 @@ impl PublicKeyToJwk for Ed25519PrivateKey { Ok(Jwk { kty: "OKP".into(), crv: Some("Ed25519".into()), - x: Some(base64::encode_config(&bytes, url_safe_trailing_bits())), + x: Some(base64::encode_config(bytes, url_safe_trailing_bits())), ..Jwk::default() }) } @@ -113,8 +113,8 @@ impl PrivateKeyToJwk for Ed25519PrivateKey { Ok(Jwk { kty: "OKP".into(), crv: Some("Ed25519".into()), - d: Some(base64::encode_config(&d, url_safe_trailing_bits())), - x: Some(base64::encode_config(&x, url_safe_trailing_bits())), + d: Some(base64::encode_config(d, url_safe_trailing_bits())), + x: Some(base64::encode_config(x, url_safe_trailing_bits())), ..Jwk::default() }) } @@ -181,7 +181,7 @@ impl PublicKeyToJwk for Ed25519PublicKey { Ok(Jwk { kty: "OKP".into(), crv: Some("Ed25519".into()), - x: Some(base64::encode_config(&bytes, url_safe_trailing_bits())), + x: Some(base64::encode_config(bytes, url_safe_trailing_bits())), ..Jwk::default() }) } diff --git a/src/jwk.rs b/src/jwk.rs index ee95311..dd1f285 100644 --- a/src/jwk.rs +++ b/src/jwk.rs @@ -350,8 +350,8 @@ impl JwkSetVerifier { } else if !self.require_kid { if let Some(res) = self .keys - .iter() - .map(|(_, key)| verifier(token, key)) + .values() + .map(|key| verifier(token, key)) .find_map(|res| res.ok()) { Ok(res)