oops

alex · alex · commit 629fe36cade7 · 2025-01-27T09:57:42.000-05:00
diff --git a/src/rust/cryptography-key-parsing/src/ec.rs b/src/rust/cryptography-key-parsing/src/ec.rs
@@ -105,4 +105,3 @@ pub fn parse_pkcs1_private_key(
         .map_err(|_| KeyParsingError::InvalidKey)?;
     Ok(openssl::pkey::PKey::from_ec_key(ec_key)?)
 }
->>>>>>> 1a8c3d5ef (Migrate parsing of unencrypted PKCS#8 private keys to Rust)

Original file line number	Diff line number	Diff line change
`@@ -105,4 +105,3 @@ pub fn parse_pkcs1_private_key(`
`105`	`105`	`.map_err(\|_\| KeyParsingError::InvalidKey)?;`
`106`	`106`	`Ok(openssl::pkey::PKey::from_ec_key(ec_key)?)`
`107`	`107`	`}`
`108`		`->>>>>>> 1a8c3d5ef (Migrate parsing of unencrypted PKCS#8 private keys to Rust)`