saymrwulf/cryptography
1
0
Fork 0
mirror of https://github.com/saymrwulf/cryptography.git synced 2026-05-14 20:37:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes #12257 -- raise the correct error on an unsupported curve (#12271)

Browse source
This commit is contained in:
Alex Gaynor 2025-01-11 21:35:46 -05:00 committed by GitHub
parent b1535a065e
commit d7596d0f1f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/rust/src/backend/ec.rs
View file

@ -45,7 +45,8 @@ fn curve_from_py_curve(
}
let py_curve_name = py_curve.getattr(pyo3::intern!(py, "name"))?;
let nid = match &*py_curve_name.extract::<pyo3::pybacked::PyBackedStr>()? {
let curve_name = &*py_curve_name.extract::<pyo3::pybacked::PyBackedStr>()?;
let nid = match curve_name {
"secp192r1" => openssl::nid::Nid::X9_62_PRIME192V1,
"secp224r1" => openssl::nid::Nid::SECP224R1,
"secp256r1" => openssl::nid::Nid::X9_62_PRIME256V1,
@ -84,7 +85,12 @@ fn curve_from_py_curve(
}
};
Ok(openssl::ec::EcGroup::from_curve_name(nid)?)
Ok(openssl::ec::EcGroup::from_curve_name(nid).map_err(|_| {
exceptions::UnsupportedAlgorithm::new_err((
format!("Curve {curve_name} is not supported"),
exceptions::Reasons::UNSUPPORTED_ELLIPTIC_CURVE,
))
})?)
}
fn py_curve_from_curve<'p>(

15
tests/hazmat/primitives/test_ec.py
View file

@ -331,6 +331,21 @@ class TestECDSAVectors:
is False
)
@pytest.mark.skip_fips(
reason="Some FIPS curves aren't supported but work anyways"
)
@pytest.mark.parametrize("curve", ec._CURVE_TYPES.values())
def test_generate_unsupported_curve(
self, backend, curve: ec.EllipticCurve
):
if backend.elliptic_curve_supported(curve):
return
with raises_unsupported_algorithm(
exceptions._Reasons.UNSUPPORTED_ELLIPTIC_CURVE
):
ec.generate_private_key(curve)
def test_unknown_signature_algoritm(self, backend):
_skip_curve_unsupported(backend, ec.SECP192R1())