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

handle case where a "valid" pkey does not contain a valid EC key (#12101)

Browse source 
* handle case where a "valid" pkey does not contain a valid EC key

* add test

* skip the test in some scenarios
This commit is contained in:
Paul Kehrer 2024-12-04 21:24:04 -08:00 committed by GitHub
parent 235f991211
commit d49947efb0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -135,8 +135,11 @@ pub(crate) fn private_key_from_pkey(
py: pyo3::Python<'_>,
pkey: &openssl::pkey::PKeyRef<openssl::pkey::Private>,
) -> CryptographyResult<ECPrivateKey> {
let curve = py_curve_from_curve(py, pkey.ec_key().unwrap().group())?;
check_key_infinity(&pkey.ec_key().unwrap())?;
let ec_key = pkey
.ec_key()
.map_err(|_| pyo3::exceptions::PyValueError::new_err("Invalid EC key"))?;
let curve = py_curve_from_curve(py, ec_key.group())?;
check_key_infinity(&ec_key)?;
Ok(ECPrivateKey {
pkey: pkey.to_owned(),
curve: curve.into(),

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

@ -466,6 +466,25 @@ class TestECDSAVectors:
backend=backend,
)
@pytest.mark.supported(
only_if=(
lambda backend: rust_openssl.CRYPTOGRAPHY_OPENSSL_300_OR_GREATER
or rust_openssl.CRYPTOGRAPHY_IS_BORINGSSL
),
skip_message="LibreSSL and OpenSSL 1.1.1 handle this differently",
)
def test_load_invalid_private_scalar_pem(self, backend):
_skip_curve_unsupported(backend, ec.SECP256R1())
data = load_vectors_from_file(
os.path.join(
"asymmetric", "PKCS8", "ec-invalid-private-scalar.pem"
),
lambda pemfile: pemfile.read().encode(),
)
with pytest.raises(ValueError):
serialization.load_pem_private_key(data, None)
def test_signatures(self, backend, subtests):
vectors = itertools.chain(
load_vectors_from_file(