Don't require std::string for DER decode

calamity-inc · Jan 22, 2025 · 8b4a8ba · 8b4a8ba
1 parent da14850
commit 8b4a8ba
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/soup/Asn1Sequence.cpp b/soup/Asn1Sequence.cpp
@@ -41,6 +41,12 @@ NAMESPACE_SOUP
 		return fromDer(r);
 	}
 
+	Asn1Sequence Asn1Sequence::fromDer(const char* data, size_t size)
+	{
+		MemoryRefReader r(data, size);
+		return fromDer(r);
+	}
+
 	Asn1Sequence Asn1Sequence::fromDer(Reader& r) SOUP_EXCAL
 	{
 		SOUP_IF_UNLIKELY (readIdentifier(r).type != ASN1_SEQUENCE)

diff --git a/soup/Asn1Sequence.hpp b/soup/Asn1Sequence.hpp
@@ -16,6 +16,7 @@ NAMESPACE_SOUP
 		explicit Asn1Sequence(const std::string& data) SOUP_EXCAL; // expects DER-encoded data without prefix
 
 		[[nodiscard]] static Asn1Sequence fromDer(const std::string& str) SOUP_EXCAL; // expects DER-encoded data with prefix
+		[[nodiscard]] static Asn1Sequence fromDer(const char* data, size_t size) SOUP_EXCAL; // expects DER-encoded data with prefix
 		[[nodiscard]] static Asn1Sequence fromDer(Reader& r) SOUP_EXCAL; // expects DER-encoded data with prefix
 
 		[[nodiscard]] size_t countChildren() const;

diff --git a/soup/X509Certificate.cpp b/soup/X509Certificate.cpp
@@ -16,6 +16,11 @@ NAMESPACE_SOUP
 		return load(Asn1Sequence::fromDer(str));
 	}
 
+	bool X509Certificate::fromDer(const char* data, size_t size) noexcept
+	{
+		return load(Asn1Sequence::fromDer(data, size));
+	}
+
 	bool X509Certificate::load(const Asn1Sequence& cert) noexcept
 	{
 		SOUP_TRY

diff --git a/soup/X509Certificate.hpp b/soup/X509Certificate.hpp
@@ -40,6 +40,7 @@ NAMESPACE_SOUP
 		std::time_t valid_to;
 
 		bool fromDer(const std::string& str) noexcept;
+		bool fromDer(const char* data, size_t size) noexcept;
 		bool load(const Asn1Sequence& cert) noexcept;
 
 		[[nodiscard]] bool isRsa() const noexcept { return !is_ec; }