From e134af0bdfcd5197ea236f835dece0521ebf6b2e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 28 Oct 2025 23:10:45 +0100 Subject: Fix decryption import code to work with PKCS1 and PKCS8 formats. PKCS1 uses BEGIN RSA PRIVATE KEY but PKCS8 has only BEGIN PRIVATE KEY --- src/lib/export_decryption_settings.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/export_decryption_settings.cc') diff --git a/src/lib/export_decryption_settings.cc b/src/lib/export_decryption_settings.cc index 1ba791251..13c6bda28 100644 --- a/src/lib/export_decryption_settings.cc +++ b/src/lib/export_decryption_settings.cc @@ -65,10 +65,10 @@ import_decryption_chain_and_key(boost::filesystem::path const& path) } current += buffer; - if (strncmp(buffer, "-----END CERTIFICATE-----", 25) == 0) { + if (current.find("-----END CERTIFICATE-----") != string::npos) { new_chain->add(dcp::Certificate(current)); current = ""; - } else if (strncmp(buffer, "-----END RSA PRIVATE KEY-----", 29) == 0) { + } else if (current.find("-----END") != string::npos && current.find("PRIVATE KEY-----", 29) != string::npos) { new_chain->set_key(current); current = ""; } -- cgit v1.2.3