Add support for P-521 curve with SHA-256/SHA-384 digests

Cargo.toml

@@ -79,7 +79,7 @@ ring = ["dep:ring"]
 std = ["alloc", "pki-types/std"]
 
 [dependencies]
-aws-lc-rs = { version = "1", optional = true, default-features = false, features = ["aws-lc-sys"] }
+aws-lc-rs = { version = "1.8.1", optional = true, default-features = false, features = ["aws-lc-sys"] }
 pki-types = { package = "rustls-pki-types", version = "1.7", default-features = false }
 ring = { version = "0.17", default-features = false, optional = true }
 untrusted = "0.9"

src/aws_lc_rs_algs.rs

@@ -67,6 +67,20 @@ pub static ECDSA_P384_SHA384: &dyn SignatureVerificationAlgorithm = &AwsLcRsAlgo
  verification_alg: &signature::ECDSA_P384_SHA384_ASN1,
 };
 
+/// ECDSA signatures using the P-521 curve and SHA-256.
+pub static ECDSA_P521_SHA256: &dyn SignatureVerificationAlgorithm = &AwsLcRsAlgorithm {
+ public_key_alg_id: alg_id::ECDSA_P521,
+ signature_alg_id: alg_id::ECDSA_SHA256,
+ verification_alg: &signature::ECDSA_P521_SHA256_ASN1,
+};
+
+/// ECDSA signatures using the P-521 curve and SHA-384.
+pub static ECDSA_P521_SHA384: &dyn SignatureVerificationAlgorithm = &AwsLcRsAlgorithm {
+ public_key_alg_id: alg_id::ECDSA_P521,
+ signature_alg_id: alg_id::ECDSA_SHA384,
+ verification_alg: &signature::ECDSA_P521_SHA384_ASN1,
+};
+
 /// ECDSA signatures using the P-521 curve and SHA-512.
 pub static ECDSA_P521_SHA512: &dyn SignatureVerificationAlgorithm = &AwsLcRsAlgorithm {
  public_key_alg_id: alg_id::ECDSA_P521,
@@ -151,6 +165,8 @@ mod tests {
  // Reasonable algorithms.
  super::ECDSA_P256_SHA256,
  super::ECDSA_P384_SHA384,
+ super::ECDSA_P521_SHA256,
+ super::ECDSA_P521_SHA384,
  super::ECDSA_P521_SHA512,
  super::ED25519,
  super::RSA_PKCS1_2048_8192_SHA256,

src/lib.rs

@@ -109,10 +109,10 @@ pub mod ring {
 pub mod aws_lc_rs {
  pub use super::aws_lc_rs_algs::{
  ECDSA_P256_SHA256, ECDSA_P256_SHA384, ECDSA_P384_SHA256, ECDSA_P384_SHA384,
- ECDSA_P521_SHA512, ED25519, RSA_PKCS1_2048_8192_SHA256, RSA_PKCS1_2048_8192_SHA384,
- RSA_PKCS1_2048_8192_SHA512, RSA_PKCS1_3072_8192_SHA384,
- RSA_PSS_2048_8192_SHA256_LEGACY_KEY, RSA_PSS_2048_8192_SHA384_LEGACY_KEY,
- RSA_PSS_2048_8192_SHA512_LEGACY_KEY,
+ ECDSA_P521_SHA256, ECDSA_P521_SHA384, ECDSA_P521_SHA512, ED25519,
+ RSA_PKCS1_2048_8192_SHA256, RSA_PKCS1_2048_8192_SHA384, RSA_PKCS1_2048_8192_SHA512,
+ RSA_PKCS1_3072_8192_SHA384, RSA_PSS_2048_8192_SHA256_LEGACY_KEY,
+ RSA_PSS_2048_8192_SHA384_LEGACY_KEY, RSA_PSS_2048_8192_SHA512_LEGACY_KEY,
  };
 }
 
@@ -153,6 +153,10 @@ pub static ALL_VERIFICATION_ALGS: &[&dyn types::SignatureVerificationAlgorithm]
  #[cfg(feature = "aws_lc_rs")]
  aws_lc_rs::ECDSA_P384_SHA384,
  #[cfg(feature = "aws_lc_rs")]
+ aws_lc_rs::ECDSA_P521_SHA256,
+ #[cfg(feature = "aws_lc_rs")]
+ aws_lc_rs::ECDSA_P521_SHA384,
+ #[cfg(feature = "aws_lc_rs")]
  aws_lc_rs::ECDSA_P521_SHA512,
  #[cfg(feature = "aws_lc_rs")]
  aws_lc_rs::ED25519,

tests/generate.py

@@ -560,6 +560,8 @@ def signatures(force: bool) -> None:
  }
 
  feature_gates = {
+ "ECDSA_P521_SHA256": 'all(not(feature = "ring"), feature = "aws_lc_rs")',
+ "ECDSA_P521_SHA384": 'all(not(feature = "ring"), feature = "aws_lc_rs")',
  "ECDSA_P521_SHA512": 'all(not(feature = "ring"), feature = "aws_lc_rs")',
  }
 
@@ -576,7 +578,7 @@ def signatures(force: bool) -> None:
  "ed25519": ["ED25519"],
  "ecdsa_p256": ["ECDSA_P256_SHA384", "ECDSA_P256_SHA256"],
  "ecdsa_p384": ["ECDSA_P384_SHA384", "ECDSA_P384_SHA256"],
- "ecdsa_p521": ["ECDSA_P521_SHA512"],
+ "ecdsa_p521": ["ECDSA_P521_SHA512", "ECDSA_P521_SHA256", "ECDSA_P521_SHA384"],
  "rsa_2048": rsa_types,
  "rsa_3072": rsa_types + ["RSA_PKCS1_3072_8192_SHA384"],
  "rsa_4096": rsa_types + ["RSA_PKCS1_3072_8192_SHA384"],
@@ -606,6 +608,12 @@ def signatures(force: bool) -> None:
  "ECDSA_P384_SHA384": lambda key, message: key.sign(
  message, ec.ECDSA(hashes.SHA384())
  ),
+ "ECDSA_P521_SHA256": lambda key, message: key.sign(
+ message, ec.ECDSA(hashes.SHA256())
+ ),
+ "ECDSA_P521_SHA384": lambda key, message: key.sign(
+ message, ec.ECDSA(hashes.SHA384())
+ ),
  "ECDSA_P521_SHA512": lambda key, message: key.sign(
  message, ec.ECDSA(hashes.SHA512())
  ),

tests/signatures.rs

@@ -28,10 +28,11 @@ use webpki::ring::{
 
 #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
 use webpki::aws_lc_rs::{
- ECDSA_P256_SHA256, ECDSA_P256_SHA384, ECDSA_P384_SHA256, ECDSA_P384_SHA384, ECDSA_P521_SHA512,
- ED25519, RSA_PKCS1_2048_8192_SHA256, RSA_PKCS1_2048_8192_SHA384, RSA_PKCS1_2048_8192_SHA512,
- RSA_PKCS1_3072_8192_SHA384, RSA_PSS_2048_8192_SHA256_LEGACY_KEY,
- RSA_PSS_2048_8192_SHA384_LEGACY_KEY, RSA_PSS_2048_8192_SHA512_LEGACY_KEY,
+ ECDSA_P256_SHA256, ECDSA_P256_SHA384, ECDSA_P384_SHA256, ECDSA_P384_SHA384, ECDSA_P521_SHA256,
+ ECDSA_P521_SHA384, ECDSA_P521_SHA512, ED25519, RSA_PKCS1_2048_8192_SHA256,
+ RSA_PKCS1_2048_8192_SHA384, RSA_PKCS1_2048_8192_SHA512, RSA_PKCS1_3072_8192_SHA384,
+ RSA_PSS_2048_8192_SHA256_LEGACY_KEY, RSA_PSS_2048_8192_SHA384_LEGACY_KEY,
+ RSA_PSS_2048_8192_SHA512_LEGACY_KEY,
 };
 
 #[cfg(feature = "alloc")]
@@ -75,6 +76,10 @@ fn ed25519_key_and_ed25519_detects_bad_signature() {
 fn ed25519_key_rejected_by_other_algorithms() {
  let ee = include_bytes!("signatures/ed25519.ee.der");
  for algorithm in &[
+ #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
+ ECDSA_P521_SHA256,
+ #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
+ ECDSA_P521_SHA384,
  #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
  ECDSA_P521_SHA512,
  ECDSA_P256_SHA256,
@@ -149,6 +154,10 @@ fn ecdsa_p256_key_and_ecdsa_p256_sha256_detects_bad_signature() {
 fn ecdsa_p256_key_rejected_by_other_algorithms() {
  let ee = include_bytes!("signatures/ecdsa_p256.ee.der");
  for algorithm in &[
+ #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
+ ECDSA_P521_SHA256,
+ #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
+ ECDSA_P521_SHA384,
  #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
  ECDSA_P521_SHA512,
  ECDSA_P384_SHA256,
@@ -222,6 +231,10 @@ fn ecdsa_p384_key_and_ecdsa_p384_sha256_detects_bad_signature() {
 fn ecdsa_p384_key_rejected_by_other_algorithms() {
  let ee = include_bytes!("signatures/ecdsa_p384.ee.der");
  for algorithm in &[
+ #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
+ ECDSA_P521_SHA256,
+ #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
+ ECDSA_P521_SHA384,
  #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
  ECDSA_P521_SHA512,
  ECDSA_P256_SHA256,
@@ -266,6 +279,54 @@ fn ecdsa_p521_key_and_ecdsa_p521_sha512_detects_bad_signature() {
  );
 }
 
+#[test]
+#[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
+fn ecdsa_p521_key_and_ecdsa_p521_sha256_good_signature() {
+ let ee = include_bytes!("signatures/ecdsa_p521.ee.der");
+ let message = include_bytes!("signatures/message.bin");
+ let signature =
+ include_bytes!("signatures/ecdsa_p521_key_and_ecdsa_p521_sha256_good_signature.sig.bin");
+ assert_eq!(check_sig(ee, ECDSA_P521_SHA256, message, signature), Ok(()));
+}
+
+#[test]
+#[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
+fn ecdsa_p521_key_and_ecdsa_p521_sha256_detects_bad_signature() {
+ let ee = include_bytes!("signatures/ecdsa_p521.ee.der");
+ let message = include_bytes!("signatures/message.bin");
+ let signature = include_bytes!(
+ "signatures/ecdsa_p521_key_and_ecdsa_p521_sha256_detects_bad_signature.sig.bin"
+ );
+ assert_eq!(
+ check_sig(ee, ECDSA_P521_SHA256, message, signature),
+ Err(webpki::Error::InvalidSignatureForPublicKey)
+ );
+}
+
+#[test]
+#[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
+fn ecdsa_p521_key_and_ecdsa_p521_sha384_good_signature() {
+ let ee = include_bytes!("signatures/ecdsa_p521.ee.der");
+ let message = include_bytes!("signatures/message.bin");
+ let signature =
+ include_bytes!("signatures/ecdsa_p521_key_and_ecdsa_p521_sha384_good_signature.sig.bin");
+ assert_eq!(check_sig(ee, ECDSA_P521_SHA384, message, signature), Ok(()));
+}
+
+#[test]
+#[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
+fn ecdsa_p521_key_and_ecdsa_p521_sha384_detects_bad_signature() {
+ let ee = include_bytes!("signatures/ecdsa_p521.ee.der");
+ let message = include_bytes!("signatures/message.bin");
+ let signature = include_bytes!(
+ "signatures/ecdsa_p521_key_and_ecdsa_p521_sha384_detects_bad_signature.sig.bin"
+ );
+ assert_eq!(
+ check_sig(ee, ECDSA_P521_SHA384, message, signature),
+ Err(webpki::Error::InvalidSignatureForPublicKey)
+ );
+}
+
 #[test]
 #[cfg(feature = "alloc")]
 fn ecdsa_p521_key_rejected_by_other_algorithms() {
@@ -458,6 +519,10 @@ fn rsa_2048_key_and_rsa_pss_2048_8192_sha512_legacy_key_detects_bad_signature()
 fn rsa_2048_key_rejected_by_other_algorithms() {
  let ee = include_bytes!("signatures/rsa_2048.ee.der");
  for algorithm in &[
+ #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
+ ECDSA_P521_SHA256,
+ #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
+ ECDSA_P521_SHA384,
  #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
  ECDSA_P521_SHA512,
  ECDSA_P256_SHA256,
@@ -668,6 +733,10 @@ fn rsa_3072_key_and_rsa_pkcs1_3072_8192_sha384_detects_bad_signature() {
 fn rsa_3072_key_rejected_by_other_algorithms() {
  let ee = include_bytes!("signatures/rsa_3072.ee.der");
  for algorithm in &[
+ #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
+ ECDSA_P521_SHA256,
+ #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
+ ECDSA_P521_SHA384,
  #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
  ECDSA_P521_SHA512,
  ECDSA_P256_SHA256,
@@ -878,6 +947,10 @@ fn rsa_4096_key_and_rsa_pkcs1_3072_8192_sha384_detects_bad_signature() {
 fn rsa_4096_key_rejected_by_other_algorithms() {
  let ee = include_bytes!("signatures/rsa_4096.ee.der");
  for algorithm in &[
+ #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
+ ECDSA_P521_SHA256,
+ #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
+ ECDSA_P521_SHA384,
  #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))]
  ECDSA_P521_SHA512,
  ECDSA_P256_SHA256,

tests/signatures/ecdsa_p521_key_and_ecdsa_p521_sha256_detects_bad_signature.sig.bin

@@ -0,0 +1,3 @@
+0��B
Y8�#�$�c��_�PE�$TVf�ٖ�0h�I��?�@~9~Xu�zݺ�Z��K����P�{�@z�B
G]���'rU
q�Q��:�,��t���$Ȧ��\ۀ
+~��А�i
+[d9#�)��ۙ��; 

tests/signatures/ecdsa_p521_key_and_ecdsa_p521_sha384_good_signature.sig.bin

@@ -0,0 +1,2 @@
+0��Am��ұ'���n��M�6r�y���}�H�� 0tOo��(v@�H�^�l��$ �~��K�s-B
C
+�Z�K���#�50'�"ki�wĢFz��Y���uf��#5V�kG���oV�M���4��g