public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
* [PATCH common v2 00/11] pem parser: refactor parsing to cover more edge cases
@ 2026-11-18 10:31 Thomas Ellmenreich
  2026-11-18 10:31 ` [PATCH common v2 01/11] certificate tests: use q{} for multiline strings Thomas Ellmenreich
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: Thomas Ellmenreich @ 2026-11-18 10:31 UTC (permalink / raw)
  To: pve-devel; +Cc: Thomas Ellmenreich

After the previous series: [0], was already applied, I realized that the
parsing ignores a specific edgecase. After that, I was also pointed to the
following thread [1], which includes another edgecase.

Trying to fix these edgecases, I have decided to rework the PEM parsing so
that it cleans incoming input, then parses it in a stricter manner, and
finally outputs a more standardized PEM at the end.

Change Overview:
---------------

I have tried to split up all of the new changes into separate commits to make
them more easily reversible but also better understandable. But here is a
summary of said changes:

 * Introduction of a ANY_LABEL constant instead of recreating 'qr/.*?/'
   everywhere. This new constant also avoids matching a next header.
 * 'pem-string' format calls 'check_pem' with multiple, since PEM chains
   should also be valid.
 * Force BEGIN and END lines to start at the beginning of the line and
   either end with the end of the line or the string.
 * Make the validation of single PEM entries stricter so that it adheres
   more to RFC 7468 [2].
 * Add a utility to not only strip leading, but also following text, so that
   subroutines that are expected to return a single item, but are handed a
   chain, can strip everything except the first item.
 * Parsing a chain now adds the cleaned and validated entries to a list,
   before joining them with newlines instead of adding them to a string.
 * Decoding a PEM to a DER is quicker to avoid parsing invalid PEM's.
 * Refactored and expanded the tests to cover more cases.
 * Added CRLF support by simply replacing them all with newlines at the
   beginning of the 'check_pem', 'split_pem' and 'der_to_pem' subroutines.

Changelog:
---------

 * v1 -> v2:

   The first version only contained the usage of the ANY_LABEL for the
   'pem_to_der' subroutine, as well as the check that BEGIN and END should be
   on their own lines. Through the further edge case mentioned in the
   forum post [1], I decided to take a more complete but more invasive
   approach.

Open Questions:
--------------

 * Integration tests with openssl

   I started working on some integration tests that work directly with
   openssl to generate PEM's, which are then validated by our library. In
   the end, I decided to drop the patch in favour of gathering some opinions
   first. My approach would have been to generate some edgecase PEM's with
   openssl and commit them, the Perl code could then be run against these
   PEM's to validate the stability of its functionality. Otherwise, we could
   also make the tests depend on openssl directly, and thus generate a way
   greater number of PEM's on the fly, to then test against.

 * Normalisation of content:

   One more improvement that could be made is to pass the base64 content
   through the decoder and encoder, which would lead it to be normalized. I
   personally find this unnecessary, but it could be one more thing to make
   the output of the 'check_pem' function more consistent.

Notes for the Maintainer:
------------------------

I have split up the series into a number of different commits to make
them easier to understand, but I would recommend to doublecheck before
dropping an inbetween commit, as not every commit makes sense by themselves.
That said, I have made sure that all commits pass all tests and can be built.

[0]: https://lore.proxmox.com/all/20260805141114.190477-1-t.ellmenreich@proxmox.com/T/#u
[1]: https://forum.proxmox.com/threads/custom-certificate-pem-with-comments-or-key-pem-with-a-section-ec-parameters-fail-to-upload.187526/#post-875517
[2]: https://www.rfc-editor.org/info/rfc7468/


pve-common:

Thomas Ellmenreich (11):
  certificate tests: use q{} for multiline strings.
  pem parser: add constant to match any label
  pem parser: refactor check_pem to use list instead of string
  pem parser: stricter handling of newlines
  certificate formats: enable multiple parsing for pem-string format
  pem parsing: strip all surrounding text from chain entries
  pem parsing: make validation of pem entry stricter
  pem parsing: default splitting to any label
  pem to der: create clearer error boundary
  certificate tests: refactor and exapand testsuite
  pom parsing: allow for CRLF line ending

 src/PVE/Certificate.pm         |  81 ++++--
 test/Makefile                  |   2 +
 test/certificate_utils_test.pl | 355 ++++++++++++++++++++++++++
 test/check_pem_test.pl         | 444 +++++++++++++--------------------
 test/pem_to_der_test.pl        | 172 +++++++++++++
 test/split_pem_test.pl         | 260 +++++++++----------
 6 files changed, 891 insertions(+), 423 deletions(-)
 create mode 100755 test/certificate_utils_test.pl
 create mode 100755 test/pem_to_der_test.pl


Summary over all repositories:
  6 files changed, 891 insertions(+), 423 deletions(-)

-- 
Generated by murpp 0.12.0




^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH common v2 01/11] certificate tests: use q{} for multiline strings.
  2026-11-18 10:31 [PATCH common v2 00/11] pem parser: refactor parsing to cover more edge cases Thomas Ellmenreich
@ 2026-11-18 10:31 ` Thomas Ellmenreich
  2026-11-18 10:31 ` [PATCH common v2 02/11] pem parser: add constant to match any label Thomas Ellmenreich
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Thomas Ellmenreich @ 2026-11-18 10:31 UTC (permalink / raw)
  To: pve-devel; +Cc: Thomas Ellmenreich

Instead of using EOF to define multiline strings in tests, use q{}. This
defines a clearer string boundary, specifically where newlines are.

Signed-off-by: Thomas Ellmenreich <t.ellmenreich@proxmox.com>
---
 test/check_pem_test.pl | 113 ++++++++++++++++++-----------------------
 test/split_pem_test.pl |  81 +++++++++++++----------------
 2 files changed, 86 insertions(+), 108 deletions(-)

diff --git a/test/check_pem_test.pl b/test/check_pem_test.pl
index 4917d2b..176194d 100755
--- a/test/check_pem_test.pl
+++ b/test/check_pem_test.pl
@@ -15,8 +15,7 @@ my $setup = [
     {
         expected_success => 1,
         name => "full pem",
-        pem => <<'EOF',
------BEGIN CERTIFICATE-----
+        pem => q{-----BEGIN CERTIFICATE-----
 MIIBsjCCAVugAwIBAgIJAO2g8Z0dXk9tMAoGCCqGSM49BAMCMEUxCzAJBgNVBAYT
 AlVTMQswCQYDVQQIDAJDQTEQMA4GA1UEBwwHQmVya2VsZXkxEDAOBgNVBAoMB1Rl
 c3QgQ0EwHhcNMjAwMTAxMDAwMDAwWhcNMzAwMTAxMDAwMDAwWjBFMQswCQYDVQQG
@@ -27,14 +26,13 @@ MFEwHQYDVR0OBBYEFOu2Y0bq8v3z7qkq1m1Qwqkq1m1QMB8GA1UdIwQYMBaAFOu2
 Y0bq8v3z7qkq1m1Qwqkq1m1QMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwID
 SAAwRQIhANfakefakefakefakefakefakefakefakefake
 -----END CERTIFICATE-----
-EOF
+},
     },
     {
         expected_success => 1,
         name => "other label pem",
         label => "SOME LABEL",
-        pem => <<'EOF',
------BEGIN SOME LABEL-----
+        pem => q{-----BEGIN SOME LABEL-----
 MIIBsjCCAVugAwIBAgIJAO2g8Z0dXk9tMAoGCCqGSM49BAMCMEUxCzAJBgNVBAYT
 AlVTMQswCQYDVQQIDAJDQTEQMA4GA1UEBwwHQmVya2VsZXkxEDAOBgNVBAoMB1Rl
 c3QgQ0EwHhcNMjAwMTAxMDAwMDAwWhcNMzAwMTAxMDAwMDAwWjBFMQswCQYDVQQG
@@ -45,102 +43,96 @@ MFEwHQYDVR0OBBYEFOu2Y0bq8v3z7qkq1m1Qwqkq1m1QMB8GA1UdIwQYMBaAFOu2
 Y0bq8v3z7qkq1m1Qwqkq1m1QMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwID
 SAAwRQIhANfakefakefakefakefakefakefakefakefake
 -----END SOME LABEL-----
-EOF
+},
     },
     {
         expected_success => 1,
         name => "simple pem",
-        pem => <<'EOF',
------BEGIN CERTIFICATE-----
+        pem => q{-----BEGIN CERTIFICATE-----
 test
 -----END CERTIFICATE-----
-EOF
+},
     },
     {
         expected_success => 1,
         name => "spaced out pem",
-        pem => <<'EOF',
------BEGIN CERTIFICATE-----
+        pem => q{-----BEGIN CERTIFICATE-----
 
 test
 
 -----END CERTIFICATE-----
-EOF
+},
     },
     {
         expected_success => 1,
         name => "only newline pem",
-        pem => <<'EOF',
------BEGIN CERTIFICATE-----
+        pem => q{-----BEGIN CERTIFICATE-----
 -----END CERTIFICATE-----
-EOF
+},
     },
     {
         expected_success => 1,
         name => "many newlines pem",
-        pem => <<'EOF',
------BEGIN CERTIFICATE-----
+        pem => q{-----BEGIN CERTIFICATE-----
 
 
 
 -----END CERTIFICATE-----
-EOF
+},
     },
     {
         expected_success => 0,
         name => "no content pem",
-        pem => <<'EOF',
+        pem => q{
 -----BEGIN CERTIFICATE----------END CERTIFICATE-----
-EOF
+},
     },
     {
         expected_success => 1,
         name => "preceding content pem",
-        pem => <<'EOF',
+        pem => q{
 some extended content
 -----BEGIN CERTIFICATE-----
 test
 -----END CERTIFICATE-----
-EOF
+},
 
-        expected_result => <<'EOF',
------BEGIN CERTIFICATE-----
+        expected_result => q{-----BEGIN CERTIFICATE-----
 test
 -----END CERTIFICATE-----
-EOF
+},
     },
     {
         expected_success => 0,
         name => "following content pem",
-        pem => <<'EOF',
+        pem => q{
 -----BEGIN CERTIFICATE-----
 test
 -----END CERTIFICATE-----
 some extended content
-EOF
+},
     },
     {
         expected_success => 0,
         name => "empty pem",
-        pem => <<'EOF',
+        pem => q{
 
-EOF
+},
     },
     {
         expected_success => 0,
         name => "upsidedown pem",
-        pem => <<'EOF',
+        pem => q{
 -----END CERTIFICATE-----
 test
 -----BEGIN CERTIFICATE-----
-EOF
+},
     },
     {
         expected_success => 1,
         name => "multi pem",
         multiple => 1,
-        pem => <<'EOF',
------BEGIN CERTIFICATE-----
+        pem => q{-----BEGIN CERTIFICATE-----
 12JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
@@ -152,12 +144,12 @@ EOF
 -----BEGIN CERTIFICATE-----
 42JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
+},
     },
     {
         expected_success => 0,
         name => "multiple as single pem",
-        pem => <<'EOF',
+        pem => q{
 Subject: CN=some.test.content
 Issuer: CN=Org Issuing CA 3
 -----BEGIN CERTIFICATE-----
@@ -174,13 +166,13 @@ dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
+},
     },
     {
         expected_success => 1,
         name => "multiple pem",
         multiple => 1,
-        pem => <<'EOF',
+        pem => q{
 Subject: CN=some.test.content
 Issuer: CN=Org Issuing CA 3
 -----BEGIN CERTIFICATE-----
@@ -197,9 +189,8 @@ dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
-        expected_result => <<'EOF',
------BEGIN CERTIFICATE-----
+},
+        expected_result => q{-----BEGIN CERTIFICATE-----
 1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
 dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
@@ -211,14 +202,14 @@ dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
+},
     },
     {
         expected_success => 1,
         name => "big pem different label",
         multiple => 1,
         label => "LABEL",
-        pem => <<'EOF',
+        pem => q{
 Subject: CN=some.test.content
 Issuer: CN=Org Issuing CA 3
 -----BEGIN LABEL-----
@@ -243,10 +234,9 @@ dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END LABEL-----
-EOF
+},
 
-        expected_result => <<'EOF',
------BEGIN LABEL-----
+        expected_result => q{-----BEGIN LABEL-----
 1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
 dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
@@ -264,12 +254,12 @@ dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END LABEL-----
-EOF
+},
     },
     {
         expected_success => 1,
         name => "other real pem",
-        pem => <<'EOF',
+        pem => q{
 Subject: CN=Some subject with 2 Points,O=A Organization,L=Some Lation,C=TT
 Issuer: CN=The Orgs Name RootCA 2015,O=The Orgs name Institutions Cert. Authority,L=Location,C=TT
 -----BEGIN CERTIFICATE-----
@@ -278,20 +268,19 @@ dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
-        expected_result => <<'EOF',
------BEGIN CERTIFICATE-----
+},
+        expected_result => q{-----BEGIN CERTIFICATE-----
 1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
 dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
+},
     },
     {
         expected_success => 0,
         name => "invalid single pem",
-        pem => <<'EOF',
+        pem => q{
 Subject: CN=Some subject with 2 Points,O=A Organization,L=Some Lation,C=TT
 Issuer: CN=The Orgs Name RootCA 2015,O=The Orgs name Institutions Cert. Authority,L=Location,C=TT
 -----BEGIN CERTIFICATE-----
@@ -300,13 +289,13 @@ dmFpdXdlYmdthese !?''*:;$%&/  are not allowedWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
+},
     },
     {
         expected_success => 0,
         name => "invalid multi pem",
         multiple => 1,
-        pem => <<'EOF',
+        pem => q{
 Subject: CN=Some subject with 2 Points,O=A Organization,L=Some Lation,C=TT
 Issuer: CN=The Orgs Name RootCA 2015,O=The Orgs name Institutions Cert. Authority,L=Location,C=TT
 -----BEGIN CERTIFICATE-----
@@ -324,26 +313,25 @@ dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
 
-EOF
+},
     },
     {
         expected_success => 1,
         name => "single as multiple pem",
         multiple => 1,
-        pem => <<'EOF',
------BEGIN CERTIFICATE-----
+        pem => q{-----BEGIN CERTIFICATE-----
 1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
 dmFpdXdlYmdtheseZ2RmaXVwYWJ2aXV1YXdlYmxmamlraWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
+},
     },
     {
         expected_success => 1,
         name => "single as multiple pem",
         multiple => 1,
-        pem => <<'EOF',
+        pem => q{
 Subject: CN=Some subject with 2 Points,O=A Organization,L=Some Lation,C=TT
 Issuer: CN=The Orgs Name RootCA 2015,O=The Orgs name Institutions Cert. Authority,L=Location,C=TT
 -----BEGIN CERTIFICATE-----
@@ -352,15 +340,14 @@ dmFpdXdlYmdtheseZ2RmaXVwYWJ2aXV1YXdlYmxmamlraWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
-        expected_result => <<'EOF',
------BEGIN CERTIFICATE-----
+},
+        expected_result => q{-----BEGIN CERTIFICATE-----
 1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
 dmFpdXdlYmdtheseZ2RmaXVwYWJ2aXV1YXdlYmxmamlraWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
+},
     },
 ];
 
diff --git a/test/split_pem_test.pl b/test/split_pem_test.pl
index 4239e5c..c4c79c4 100755
--- a/test/split_pem_test.pl
+++ b/test/split_pem_test.pl
@@ -15,7 +15,7 @@ my $setup = [
     {
         expected_success => 1,
         name => "single pem",
-        pem => <<'EOF',
+        pem => q{
 -----BEGIN CERTIFICATE-----
 MIIBsjCCAVugAwIBAgIJAO2g8Z0dXk9tMAoGCCqGSM49BAMCMEUxCzAJBgNVBAYT
 AlVTMQswCQYDVQQIDAJDQTEQMA4GA1UEBwwHQmVya2VsZXkxEDAOBgNVBAoMB1Rl
@@ -27,12 +27,12 @@ MFEwHQYDVR0OBBYEFOu2Y0bq8v3z7qkq1m1Qwqkq1m1QMB8GA1UdIwQYMBaAFOu2
 Y0bq8v3z7qkq1m1Qwqkq1m1QMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwID
 SAAwRQIhANfakefakefakefakefakefakefakefakefake
 -----END CERTIFICATE-----
-EOF
+},
     },
     {
         expected_success => 1,
         name => "no extra text pem",
-        pem => <<'EOF',
+        pem => q{
 -----BEGIN CERTIFICATE-----
 12JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
@@ -45,38 +45,35 @@ EOF
 -----BEGIN CERTIFICATE-----
 42JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
+},
 
         expected_result => [
-            <<'EOF',
+            q{
 -----BEGIN CERTIFICATE-----
 12JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
+},
 
-            <<'EOF',
------BEGIN CERTIFICATE-----
+            q{-----BEGIN CERTIFICATE-----
 22JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
+},
 
-            <<'EOF',
------BEGIN CERTIFICATE-----
+            q{-----BEGIN CERTIFICATE-----
 32JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
+},
 
-            <<'EOF',
------BEGIN CERTIFICATE-----
+            q{-----BEGIN CERTIFICATE-----
 42JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
+},
         ],
     },
     {
         expected_success => 1,
         name => "leading and interleaved text pem",
-        pem => <<'EOF',
+        pem => q{
 Subject: CN=some.test.content
 Issuer: CN=Org Issuing CA 3
 -----BEGIN CERTIFICATE-----
@@ -101,10 +98,10 @@ dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
+},
 
         expected_result => [
-            <<'EOF',
+            q{
 Subject: CN=some.test.content
 Issuer: CN=Org Issuing CA 3
 -----BEGIN CERTIFICATE-----
@@ -113,10 +110,9 @@ dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
+},
 
-            <<'EOF',
-Subject: CN=Org Issuing CA 3
+            q{Subject: CN=Org Issuing CA 3
 Issuer: CN=Org Root CA
 -----BEGIN CERTIFICATE-----
 2WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
@@ -124,10 +120,9 @@ dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
+},
 
-            <<'EOF',
-Subject: CN=Org Root CA
+            q{Subject: CN=Org Root CA
 Issuer: CN=Org Root CA
 -----BEGIN CERTIFICATE-----
 3WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
@@ -135,13 +130,13 @@ dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
+},
         ],
     },
     {
         expected_success => 1,
         name => "massive glob pem",
-        pem => <<'EOF',
+        pem => q{
 Subject: CN=some.test.content
 Issuer: CN=Org Issuing CA 3
 -----BEGIN CERTIFICATE-----
@@ -164,12 +159,12 @@ dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
+},
     },
     {
         expected_success => 1,
         name => "no beginning pem",
-        pem => <<'EOF',
+        pem => q{
 Subject: CN=some.test.content
 Issuer: CN=Org Issuing CA 3
 2WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
@@ -184,10 +179,10 @@ dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
+},
 
         expected_result => [
-            <<'EOF',
+            q{
 Subject: CN=some.test.content
 Issuer: CN=Org Issuing CA 3
 2WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
@@ -195,24 +190,22 @@ dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
-
-            <<'EOF',
-Subject: CN=Org Root CA
+},
+            q{Subject: CN=Org Root CA
 Issuer: CN=Org Root CA
 3WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
 dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
+},
         ],
 
     },
     {
         expected_success => 0,
         name => "not a pem pem",
-        pem => <<'EOF',
+        pem => q{
 Subject: CN=some.test.content
 Issuer: CN=Org Issuing CA 3
 1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
@@ -221,12 +214,12 @@ dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 Subject: CN=Org Issuing CA 3
 Issuer: CN=Org Root CA
-EOF
+},
     },
     {
         expected_success => 1,
         name => "following text pem",
-        pem => <<'EOF',
+        pem => q{
 -----BEGIN CERTIFICATE-----
 32JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
@@ -234,20 +227,18 @@ EOF
 42JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
 some more text that we would like to remove
-EOF
+},
 
         expected_result => [
-            <<'EOF',
+            q{
 -----BEGIN CERTIFICATE-----
 32JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
-
-            <<'EOF',
------BEGIN CERTIFICATE-----
+},
+            q{-----BEGIN CERTIFICATE-----
 42JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-EOF
+},
         ],
     },
 ];
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH common v2 02/11] pem parser: add constant to match any label
  2026-11-18 10:31 [PATCH common v2 00/11] pem parser: refactor parsing to cover more edge cases Thomas Ellmenreich
  2026-11-18 10:31 ` [PATCH common v2 01/11] certificate tests: use q{} for multiline strings Thomas Ellmenreich
@ 2026-11-18 10:31 ` Thomas Ellmenreich
  2026-11-18 10:31 ` [PATCH common v2 03/11] pem parser: refactor check_pem to use list instead of string Thomas Ellmenreich
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Thomas Ellmenreich @ 2026-11-18 10:31 UTC (permalink / raw)
  To: pve-devel; +Cc: Thomas Ellmenreich

Instead of defining a regex to match any pem label multiple times,
define a single constant that can be reused.

check_pem now also accepts a 'any_label' parameter that makes the
subroutine use the new constant as a label.

The new any label as also changed to still match any character, but not
two consecutive dashes. According to RFC 7468 the label can contain one
but not two consecutive dashes.

Signed-off-by: Thomas Ellmenreich <t.ellmenreich@proxmox.com>
---
 src/PVE/Certificate.pm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/PVE/Certificate.pm b/src/PVE/Certificate.pm
index 589bce8..a046dc8 100644
--- a/src/PVE/Certificate.pm
+++ b/src/PVE/Certificate.pm
@@ -14,6 +14,9 @@ use PVE::JSONSchema qw(get_standard_option);
 Net::SSLeay::load_error_strings();
 Net::SSLeay::randomize();
 
+# RFC 7468 allows a single dash, so only dissallow 2 consecutive dashes
+my $ANY_LABEL = qr/(?:(?!--).)+?/;
+
 PVE::JSONSchema::register_format(
     'pem-certificate',
     sub {
@@ -37,7 +40,7 @@ PVE::JSONSchema::register_format(
     sub {
         my ($content, $noerr) = @_;
 
-        return check_pem($content, noerr => $noerr, label => qr/.*?/);
+        return check_pem($content, noerr => $noerr, any_label => 1);
     },
 );
 
@@ -130,7 +133,7 @@ my $pem_re = sub {
 sub strip_leading_text {
     my ($content) = @_;
 
-    my $header = $header_re->(qr/.*?/);
+    my $header = $header_re->($ANY_LABEL);
     $content =~ s/^.*?(?=$header)//s;
     return $content;
 }
@@ -149,7 +152,7 @@ sub split_pem {
 sub check_pem {
     my ($content, %opts) = @_;
 
-    my $label = $opts{label} // 'CERTIFICATE';
+    my $label = $opts{label} // ($opts{any_label} ? $ANY_LABEL : 'CERTIFICATE');
     my $re = $pem_re->($label);
 
     my @split =
@@ -183,8 +186,8 @@ sub check_pem {
 sub pem_to_der {
     my ($content) = @_;
 
-    my $header = $header_re->(qr/.*?/);
-    my $footer = $footer_re->(qr/.*?/);
+    my $header = $header_re->($ANY_LABEL);
+    my $footer = $footer_re->($ANY_LABEL);
 
     $content = strip_leading_text($content);
 
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH common v2 03/11] pem parser: refactor check_pem to use list instead of string
  2026-11-18 10:31 [PATCH common v2 00/11] pem parser: refactor parsing to cover more edge cases Thomas Ellmenreich
  2026-11-18 10:31 ` [PATCH common v2 01/11] certificate tests: use q{} for multiline strings Thomas Ellmenreich
  2026-11-18 10:31 ` [PATCH common v2 02/11] pem parser: add constant to match any label Thomas Ellmenreich
@ 2026-11-18 10:31 ` Thomas Ellmenreich
  2026-11-18 10:31 ` [PATCH common v2 04/11] pem parser: stricter handling of newlines Thomas Ellmenreich
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Thomas Ellmenreich @ 2026-11-18 10:31 UTC (permalink / raw)
  To: pve-devel; +Cc: Thomas Ellmenreich

In preparation for future changes, refactor the check_pem subroutine to
add each new found entry onto a list, which is then concatenated into a
single string.

Signed-off-by: Thomas Ellmenreich <t.ellmenreich@proxmox.com>
---
 src/PVE/Certificate.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/PVE/Certificate.pm b/src/PVE/Certificate.pm
index a046dc8..8e6305a 100644
--- a/src/PVE/Certificate.pm
+++ b/src/PVE/Certificate.pm
@@ -165,17 +165,18 @@ sub check_pem {
         die "PEM chain could not be split into separate entries\n";
     }
 
-    my $result_pem = "";
+    my @result_entries = ();
     for my $entry (@split) {
         my $stripped = strip_leading_text($entry);
 
         if ($stripped !~ /^$re$/) {
-            $result_pem = "";
+            @result_entries = ();
             last;
         }
 
-        $result_pem .= $stripped;
+        push @result_entries, $stripped;
     }
+    my $result_pem = join "", @result_entries;
 
     return $result_pem if $result_pem;
 
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH common v2 04/11] pem parser: stricter handling of newlines
  2026-11-18 10:31 [PATCH common v2 00/11] pem parser: refactor parsing to cover more edge cases Thomas Ellmenreich
                   ` (2 preceding siblings ...)
  2026-11-18 10:31 ` [PATCH common v2 03/11] pem parser: refactor check_pem to use list instead of string Thomas Ellmenreich
@ 2026-11-18 10:31 ` Thomas Ellmenreich
  2026-11-18 10:31 ` [PATCH common v2 05/11] certificate formats: enable multiple parsing for pem-string format Thomas Ellmenreich
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Thomas Ellmenreich @ 2026-11-18 10:31 UTC (permalink / raw)
  To: pve-devel; +Cc: Thomas Ellmenreich

Headers and footers are now expected to be at the start of the line and
to have a newline (or end of string) following them.

Then, when checking each PEM entry, remove any trailing newlines and
join the resulting list of entries with newlines between them to ensure
consistent trailing newlines.

The tests have also been updated accordingly.

Signed-off-by: Thomas Ellmenreich <t.ellmenreich@proxmox.com>
---
 src/PVE/Certificate.pm | 21 ++++++---
 test/check_pem_test.pl | 96 +++++++++++++++++-------------------------
 test/split_pem_test.pl | 77 +++++++++++++++++++++++++--------
 3 files changed, 114 insertions(+), 80 deletions(-)

diff --git a/src/PVE/Certificate.pm b/src/PVE/Certificate.pm
index 8e6305a..b0574fa 100644
--- a/src/PVE/Certificate.pm
+++ b/src/PVE/Certificate.pm
@@ -109,12 +109,14 @@ PVE::JSONSchema::register_standard_option(
 
 my $header_re = sub {
     my ($label) = @_;
-    return qr!-----BEGIN\ $label-----(?:\s|\n)*!;
+    return qr!(?m:^)-----BEGIN\ $label-----(?:\s|\n)*\n(?:\s|\n)*!;
 };
+
 my $footer_re = sub {
     my ($label) = @_;
-    return qr!-----END\ $label-----(?:\s|\n)*!;
+    return qr!(?m:^)-----END\ $label-----(?:\z|\n(?=\s*\S))!;
 };
+
 my $pem_re = sub {
     my ($label) = @_;
 
@@ -130,6 +132,13 @@ my $pem_re = sub {
     }x;
 };
 
+my sub trim_trailing_space {
+    my ($content) = @_;
+
+    $content =~ s/\s+\z//g;
+    return $content;
+}
+
 sub strip_leading_text {
     my ($content) = @_;
 
@@ -142,6 +151,7 @@ sub strip_leading_text {
 sub split_pem {
     my ($content, %opts) = @_;
 
+    $content = trim_trailing_space($content);
     my $footer = $footer_re->($opts{label} // 'CERTIFICATE');
 
     return $content =~ /(.*?$footer)/sg;
@@ -168,15 +178,16 @@ sub check_pem {
     my @result_entries = ();
     for my $entry (@split) {
         my $stripped = strip_leading_text($entry);
+        my $trimmed = trim_trailing_space($stripped);
 
-        if ($stripped !~ /^$re$/) {
+        if ($trimmed !~ /$re/) {
             @result_entries = ();
             last;
         }
 
-        push @result_entries, $stripped;
+        push @result_entries, $trimmed;
     }
-    my $result_pem = join "", @result_entries;
+    my $result_pem = join "\n", @result_entries;
 
     return $result_pem if $result_pem;
 
diff --git a/test/check_pem_test.pl b/test/check_pem_test.pl
index 176194d..d806f09 100755
--- a/test/check_pem_test.pl
+++ b/test/check_pem_test.pl
@@ -25,8 +25,7 @@ ZXN0IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEv5Q8q1p7qZ2gqkQ0Qn5x
 MFEwHQYDVR0OBBYEFOu2Y0bq8v3z7qkq1m1Qwqkq1m1QMB8GA1UdIwQYMBaAFOu2
 Y0bq8v3z7qkq1m1Qwqkq1m1QMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwID
 SAAwRQIhANfakefakefakefakefakefakefakefakefake
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
     },
     {
         expected_success => 1,
@@ -42,16 +41,14 @@ ZXN0IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEv5Q8q1p7qZ2gqkQ0Qn5x
 MFEwHQYDVR0OBBYEFOu2Y0bq8v3z7qkq1m1Qwqkq1m1QMB8GA1UdIwQYMBaAFOu2
 Y0bq8v3z7qkq1m1Qwqkq1m1QMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwID
 SAAwRQIhANfakefakefakefakefakefakefakefakefake
------END SOME LABEL-----
-},
+-----END SOME LABEL-----},
     },
     {
         expected_success => 1,
         name => "simple pem",
         pem => q{-----BEGIN CERTIFICATE-----
 test
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
     },
     {
         expected_success => 1,
@@ -60,15 +57,13 @@ test
 
 test
 
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
     },
     {
-        expected_success => 1,
+        expected_success => 0,
         name => "only newline pem",
         pem => q{-----BEGIN CERTIFICATE-----
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
     },
     {
         expected_success => 1,
@@ -77,15 +72,13 @@ test
 
 
 
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
     },
     {
         expected_success => 0,
         name => "no content pem",
         pem => q{
------BEGIN CERTIFICATE----------END CERTIFICATE-----
-},
+-----BEGIN CERTIFICATE----------END CERTIFICATE-----},
     },
     {
         expected_success => 1,
@@ -94,23 +87,24 @@ test
 some extended content
 -----BEGIN CERTIFICATE-----
 test
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
 
         expected_result => q{-----BEGIN CERTIFICATE-----
 test
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
     },
     {
-        expected_success => 0,
+        expected_success => 1,
         name => "following content pem",
         pem => q{
 -----BEGIN CERTIFICATE-----
 test
 -----END CERTIFICATE-----
-some extended content
-},
+some extended content},
+        expected_result => q{-----BEGIN CERTIFICATE-----
+test
+-----END CERTIFICATE-----
+some extended content}
     },
     {
         expected_success => 0,
@@ -125,8 +119,7 @@ some extended content
         pem => q{
 -----END CERTIFICATE-----
 test
------BEGIN CERTIFICATE-----
-},
+-----BEGIN CERTIFICATE-----},
     },
     {
         expected_success => 1,
@@ -143,30 +136,30 @@ test
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 42JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
     },
     {
-        expected_success => 0,
+        expected_success => 1,
         name => "multiple as single pem",
         pem => q{
 Subject: CN=some.test.content
 Issuer: CN=Org Issuing CA 3
 -----BEGIN CERTIFICATE-----
-1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0gMQ==
 -----END CERTIFICATE-----
 Subject: CN=Org Issuing CA 3
 Issuer: CN=Org Root CA
 -----BEGIN CERTIFICATE-----
-2WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0gMg==
+-----END CERTIFICATE-----},
+        expected_result => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMQ==
 -----END CERTIFICATE-----
-},
+Subject: CN=Org Issuing CA 3
+Issuer: CN=Org Root CA
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMg==
+-----END CERTIFICATE-----}
     },
     {
         expected_success => 1,
@@ -188,8 +181,7 @@ Issuer: CN=Org Root CA
 dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
         expected_result => q{-----BEGIN CERTIFICATE-----
 1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
 dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
@@ -201,8 +193,7 @@ c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
     },
     {
         expected_success => 1,
@@ -233,8 +224,7 @@ Issuer: CN=Org Root CA
 dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END LABEL-----
-},
+-----END LABEL-----},
 
         expected_result => q{-----BEGIN LABEL-----
 1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
@@ -253,8 +243,7 @@ c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END LABEL-----
-},
+-----END LABEL-----},
     },
     {
         expected_success => 1,
@@ -267,15 +256,13 @@ Issuer: CN=The Orgs Name RootCA 2015,O=The Orgs name Institutions Cert. Authorit
 dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
         expected_result => q{-----BEGIN CERTIFICATE-----
 1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
 dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
     },
     {
         expected_success => 0,
@@ -311,9 +298,7 @@ Issuer: CN=The Orgs Name RootCA 2015,O=The Orgs name Institutions Cert. Authorit
 dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----
-
-},
+-----END CERTIFICATE-----},
     },
     {
         expected_success => 1,
@@ -324,8 +309,7 @@ c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 dmFpdXdlYmdtheseZ2RmaXVwYWJ2aXV1YXdlYmxmamlraWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
     },
     {
         expected_success => 1,
@@ -339,15 +323,13 @@ Issuer: CN=The Orgs Name RootCA 2015,O=The Orgs name Institutions Cert. Authorit
 dmFpdXdlYmdtheseZ2RmaXVwYWJ2aXV1YXdlYmxmamlraWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
         expected_result => q{-----BEGIN CERTIFICATE-----
 1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
 dmFpdXdlYmdtheseZ2RmaXVwYWJ2aXV1YXdlYmxmamlraWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
     },
 ];
 
diff --git a/test/split_pem_test.pl b/test/split_pem_test.pl
index c4c79c4..fdc961e 100755
--- a/test/split_pem_test.pl
+++ b/test/split_pem_test.pl
@@ -26,8 +26,7 @@ ZXN0IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEv5Q8q1p7qZ2gqkQ0Qn5x
 MFEwHQYDVR0OBBYEFOu2Y0bq8v3z7qkq1m1Qwqkq1m1QMB8GA1UdIwQYMBaAFOu2
 Y0bq8v3z7qkq1m1Qwqkq1m1QMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwID
 SAAwRQIhANfakefakefakefakefakefakefakefakefake
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
     },
     {
         expected_success => 1,
@@ -44,8 +43,7 @@ SAAwRQIhANfakefakefakefakefakefakefakefakefake
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 42JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
 
         expected_result => [
             q{
@@ -66,10 +64,60 @@ SAAwRQIhANfakefakefakefakefakefakefakefakefake
 
             q{-----BEGIN CERTIFICATE-----
 42JlZ2tseTxzZWl2IGF3ZWlidm4=
+-----END CERTIFICATE-----},
+        ],
+    },
+    {
+        expected_success => 1,
+        name => "trailing newline pem",
+        pem => q{
+-----BEGIN CERTIFICATE-----
+12JlZ2tseTxzZWl2IGF3ZWlidm4=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+42JlZ2tseTxzZWl2IGF3ZWlidm4=
+-----END CERTIFICATE-----
+},
+
+        expected_result => [
+            q{
+-----BEGIN CERTIFICATE-----
+12JlZ2tseTxzZWl2IGF3ZWlidm4=
+-----END CERTIFICATE-----
+},
+
+            q{-----BEGIN CERTIFICATE-----
+42JlZ2tseTxzZWl2IGF3ZWlidm4=
+-----END CERTIFICATE-----},
+        ],
+    },
+    {
+        expected_success => 1,
+        name => "trailing text pem",
+        pem => q{
+-----BEGIN CERTIFICATE-----
+12JlZ2tseTxzZWl2IGF3ZWlidm4=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+42JlZ2tseTxzZWl2IGF3ZWlidm4=
+-----END CERTIFICATE-----
+some test text
+},
+
+        expected_result => [
+            q{
+-----BEGIN CERTIFICATE-----
+12JlZ2tseTxzZWl2IGF3ZWlidm4=
+-----END CERTIFICATE-----
+},
+
+            q{-----BEGIN CERTIFICATE-----
+42JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
 },
         ],
     },
+
     {
         expected_success => 1,
         name => "leading and interleaved text pem",
@@ -97,8 +145,7 @@ Issuer: CN=Org Root CA
 dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
 
         expected_result => [
             q{
@@ -129,8 +176,7 @@ Issuer: CN=Org Root CA
 dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
         ],
     },
     {
@@ -158,8 +204,7 @@ Issuer: CN=Org Root CA
 dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
     },
     {
         expected_success => 1,
@@ -178,8 +223,7 @@ Issuer: CN=Org Root CA
 dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
 
         expected_result => [
             q{
@@ -197,8 +241,7 @@ Issuer: CN=Org Root CA
 dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----
-},
+-----END CERTIFICATE-----},
         ],
 
     },
@@ -213,8 +256,7 @@ dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
 dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 Subject: CN=Org Issuing CA 3
-Issuer: CN=Org Root CA
-},
+Issuer: CN=Org Root CA},
     },
     {
         expected_success => 1,
@@ -226,8 +268,7 @@ Issuer: CN=Org Root CA
 -----BEGIN CERTIFICATE-----
 42JlZ2tseTxzZWl2IGF3ZWlidm4=
 -----END CERTIFICATE-----
-some more text that we would like to remove
-},
+some more text that we would like to remove},
 
         expected_result => [
             q{
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH common v2 05/11] certificate formats: enable multiple parsing for pem-string format
  2026-11-18 10:31 [PATCH common v2 00/11] pem parser: refactor parsing to cover more edge cases Thomas Ellmenreich
                   ` (3 preceding siblings ...)
  2026-11-18 10:31 ` [PATCH common v2 04/11] pem parser: stricter handling of newlines Thomas Ellmenreich
@ 2026-11-18 10:31 ` Thomas Ellmenreich
  2026-11-18 10:31 ` [PATCH common v2 06/11] pem parsing: strip all surrounding text from chain entries Thomas Ellmenreich
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Thomas Ellmenreich @ 2026-11-18 10:31 UTC (permalink / raw)
  To: pve-devel; +Cc: Thomas Ellmenreich

Using the 'pem-string' format now calls 'check_pem' with 'multiple',
which correctly parses PEM chains and returns their content without
interleaved text.

Signed-off-by: Thomas Ellmenreich <t.ellmenreich@proxmox.com>
---
 src/PVE/Certificate.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PVE/Certificate.pm b/src/PVE/Certificate.pm
index b0574fa..0380250 100644
--- a/src/PVE/Certificate.pm
+++ b/src/PVE/Certificate.pm
@@ -40,7 +40,7 @@ PVE::JSONSchema::register_format(
     sub {
         my ($content, $noerr) = @_;
 
-        return check_pem($content, noerr => $noerr, any_label => 1);
+        return check_pem($content, noerr => $noerr, any_label => 1, multiple => 1);
     },
 );
 
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH common v2 06/11] pem parsing: strip all surrounding text from chain entries
  2026-11-18 10:31 [PATCH common v2 00/11] pem parser: refactor parsing to cover more edge cases Thomas Ellmenreich
                   ` (4 preceding siblings ...)
  2026-11-18 10:31 ` [PATCH common v2 05/11] certificate formats: enable multiple parsing for pem-string format Thomas Ellmenreich
@ 2026-11-18 10:31 ` Thomas Ellmenreich
  2026-11-18 10:31 ` [PATCH common v2 07/11] pem parsing: make validation of pem entry stricter Thomas Ellmenreich
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Thomas Ellmenreich @ 2026-11-18 10:31 UTC (permalink / raw)
  To: pve-devel; +Cc: Thomas Ellmenreich

Passing a chain that contains entries with different labels, but then
specificing one of those labels leads to 'split_pem' only splitting on
that specific label. This means that a single entry returned by
'split_pem' can contain multiple pem entries.

That said it always contains a single entry of the specified label, so
strip away any content before the BEGIN and after the END of the
specified label.

Signed-off-by: Thomas Ellmenreich <t.ellmenreich@proxmox.com>
---
 src/PVE/Certificate.pm | 19 +++++++++++++++----
 test/check_pem_test.pl |  8 +-------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/PVE/Certificate.pm b/src/PVE/Certificate.pm
index 0380250..84b97e8 100644
--- a/src/PVE/Certificate.pm
+++ b/src/PVE/Certificate.pm
@@ -139,6 +139,18 @@ my sub trim_trailing_space {
     return $content;
 }
 
+my sub strip_surrounding_text {
+    my ($content, %opts) = @_;
+
+    my $label = $opts{label} // $ANY_LABEL;
+
+    my $header = $header_re->($label);
+    my $footer = $footer_re->($label);
+    $content =~ s/\A.*?(?=$header)//s;
+    $content =~ s/$footer\K.*\z//s;
+    return trim_trailing_space($content);
+}
+
 sub strip_leading_text {
     my ($content) = @_;
 
@@ -177,15 +189,14 @@ sub check_pem {
 
     my @result_entries = ();
     for my $entry (@split) {
-        my $stripped = strip_leading_text($entry);
-        my $trimmed = trim_trailing_space($stripped);
+        my $stripped = strip_surrounding_text($entry, label => $label);
 
-        if ($trimmed !~ /$re/) {
+        if ($stripped !~ /$re/) {
             @result_entries = ();
             last;
         }
 
-        push @result_entries, $trimmed;
+        push @result_entries, $stripped;
     }
     my $result_pem = join "\n", @result_entries;
 
diff --git a/test/check_pem_test.pl b/test/check_pem_test.pl
index d806f09..b1bb6f0 100755
--- a/test/check_pem_test.pl
+++ b/test/check_pem_test.pl
@@ -103,8 +103,7 @@ test
 some extended content},
         expected_result => q{-----BEGIN CERTIFICATE-----
 test
------END CERTIFICATE-----
-some extended content}
+-----END CERTIFICATE-----}
     },
     {
         expected_success => 0,
@@ -154,11 +153,6 @@ TG9yZW0gaXBzdW0gMg==
 -----END CERTIFICATE-----},
         expected_result => q{-----BEGIN CERTIFICATE-----
 TG9yZW0gaXBzdW0gMQ==
------END CERTIFICATE-----
-Subject: CN=Org Issuing CA 3
-Issuer: CN=Org Root CA
------BEGIN CERTIFICATE-----
-TG9yZW0gaXBzdW0gMg==
 -----END CERTIFICATE-----}
     },
     {
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH common v2 07/11] pem parsing: make validation of pem entry stricter
  2026-11-18 10:31 [PATCH common v2 00/11] pem parser: refactor parsing to cover more edge cases Thomas Ellmenreich
                   ` (5 preceding siblings ...)
  2026-11-18 10:31 ` [PATCH common v2 06/11] pem parsing: strip all surrounding text from chain entries Thomas Ellmenreich
@ 2026-11-18 10:31 ` Thomas Ellmenreich
  2026-11-18 10:31 ` [PATCH common v2 08/11] pem parsing: default splitting to any label Thomas Ellmenreich
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Thomas Ellmenreich @ 2026-11-18 10:31 UTC (permalink / raw)
  To: pve-devel; +Cc: Thomas Ellmenreich

By stripping all content around single validated entries, the validation
itself can be made a lot stricter. The following changes where made to
the validation:
 * The header is expected to be exactly at the beginning of the string.
 * The regex matching the base64 lines, now either expects a multiple of 4
   or the correct number of padding '='.

Also updated the tests to match this new validation.

Signed-off-by: Thomas Ellmenreich <t.ellmenreich@proxmox.com>
---
 src/PVE/Certificate.pm | 12 +++++++-----
 test/check_pem_test.pl | 20 ++++++++++----------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/PVE/Certificate.pm b/src/PVE/Certificate.pm
index 84b97e8..c1e0368 100644
--- a/src/PVE/Certificate.pm
+++ b/src/PVE/Certificate.pm
@@ -120,15 +120,17 @@ my $footer_re = sub {
 my $pem_re = sub {
     my ($label) = @_;
 
-    my $b64_char_re = qr![0-9A-Za-z\+/]!; # see RFC 7468
+    my $b64_char_re = qr![0-9A-Za-z\+/]\n*!; # see RFC 7468
     my $header = $header_re->($label);
     my $footer = $footer_re->($label);
 
     return qr{
-	$header
-	(?:(?:$b64_char_re)+\s*\n)*
-	(?:$b64_char_re)*(?:=\s*\n=|={0,2})?\s*\n
-	$footer
+	    \A$header
+        (?:(?:$b64_char_re){4})*
+        (?:(?:$b64_char_re){4}
+            |(?:$b64_char_re){3}=\s*
+            |(?:$b64_char_re){2}=\s*=\s*)
+        $footer
     }x;
 };
 
diff --git a/test/check_pem_test.pl b/test/check_pem_test.pl
index b1bb6f0..c074505 100755
--- a/test/check_pem_test.pl
+++ b/test/check_pem_test.pl
@@ -24,7 +24,7 @@ ZXN0IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEv5Q8q1p7qZ2gqkQ0Qn5x
 0n9yqv8n8n7n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8aNT
 MFEwHQYDVR0OBBYEFOu2Y0bq8v3z7qkq1m1Qwqkq1m1QMB8GA1UdIwQYMBaAFOu2
 Y0bq8v3z7qkq1m1Qwqkq1m1QMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwID
-SAAwRQIhANfakefakefakefakefakefakefakefakefake
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----},
     },
     {
@@ -40,14 +40,14 @@ ZXN0IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEv5Q8q1p7qZ2gqkQ0Qn5x
 0n9yqv8n8n7n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8aNT
 MFEwHQYDVR0OBBYEFOu2Y0bq8v3z7qkq1m1Qwqkq1m1QMB8GA1UdIwQYMBaAFOu2
 Y0bq8v3z7qkq1m1Qwqkq1m1QMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwID
-SAAwRQIhANfakefakefakefakefakefakefakefakefake
+TG9yZW0gaXBzdW0=
 -----END SOME LABEL-----},
     },
     {
         expected_success => 1,
         name => "simple pem",
         pem => q{-----BEGIN CERTIFICATE-----
-test
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----},
     },
     {
@@ -55,7 +55,7 @@ test
         name => "spaced out pem",
         pem => q{-----BEGIN CERTIFICATE-----
 
-test
+TG9yZW0gaXBzdW0=
 
 -----END CERTIFICATE-----},
     },
@@ -66,7 +66,7 @@ test
 -----END CERTIFICATE-----},
     },
     {
-        expected_success => 1,
+        expected_success => 0,
         name => "many newlines pem",
         pem => q{-----BEGIN CERTIFICATE-----
 
@@ -86,11 +86,11 @@ test
         pem => q{
 some extended content
 -----BEGIN CERTIFICATE-----
-test
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----},
 
         expected_result => q{-----BEGIN CERTIFICATE-----
-test
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----},
     },
     {
@@ -98,11 +98,11 @@ test
         name => "following content pem",
         pem => q{
 -----BEGIN CERTIFICATE-----
-test
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
 some extended content},
         expected_result => q{-----BEGIN CERTIFICATE-----
-test
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----}
     },
     {
@@ -117,7 +117,7 @@ test
         name => "upsidedown pem",
         pem => q{
 -----END CERTIFICATE-----
-test
+TG9yZW0gaXBzdW0=
 -----BEGIN CERTIFICATE-----},
     },
     {
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH common v2 08/11] pem parsing: default splitting to any label
  2026-11-18 10:31 [PATCH common v2 00/11] pem parser: refactor parsing to cover more edge cases Thomas Ellmenreich
                   ` (6 preceding siblings ...)
  2026-11-18 10:31 ` [PATCH common v2 07/11] pem parsing: make validation of pem entry stricter Thomas Ellmenreich
@ 2026-11-18 10:31 ` Thomas Ellmenreich
  2026-11-18 10:31 ` [PATCH common v2 09/11] pem to der: create clearer error boundary Thomas Ellmenreich
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Thomas Ellmenreich @ 2026-11-18 10:31 UTC (permalink / raw)
  To: pve-devel; +Cc: Thomas Ellmenreich

Default 'split_pem' to use any label instead of CERTIFICATE as returning
all chain entries is a more sensible default.

Signed-off-by: Thomas Ellmenreich <t.ellmenreich@proxmox.com>
---
 src/PVE/Certificate.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PVE/Certificate.pm b/src/PVE/Certificate.pm
index c1e0368..620ba6b 100644
--- a/src/PVE/Certificate.pm
+++ b/src/PVE/Certificate.pm
@@ -166,7 +166,7 @@ sub split_pem {
     my ($content, %opts) = @_;
 
     $content = trim_trailing_space($content);
-    my $footer = $footer_re->($opts{label} // 'CERTIFICATE');
+    my $footer = $footer_re->($opts{label} // $ANY_LABEL);
 
     return $content =~ /(.*?$footer)/sg;
 }
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH common v2 09/11] pem to der: create clearer error boundary
  2026-11-18 10:31 [PATCH common v2 00/11] pem parser: refactor parsing to cover more edge cases Thomas Ellmenreich
                   ` (7 preceding siblings ...)
  2026-11-18 10:31 ` [PATCH common v2 08/11] pem parsing: default splitting to any label Thomas Ellmenreich
@ 2026-11-18 10:31 ` Thomas Ellmenreich
  2026-11-18 10:31 ` [PATCH common v2 10/11] certificate tests: refactor and exapand testsuite Thomas Ellmenreich
  2026-11-18 10:31 ` [PATCH common v2 11/11] pom parsing: allow for CRLF line ending Thomas Ellmenreich
  10 siblings, 0 replies; 12+ messages in thread
From: Thomas Ellmenreich @ 2026-11-18 10:31 UTC (permalink / raw)
  To: pve-devel; +Cc: Thomas Ellmenreich

When parsing a PEM to then decode it to a DER, the header and footer
regex could previously lead to the header being included in the
decoded content as is the case with the following example:

    -----BEGIN CERTIFICATE-----TG9yZW0gaXBzdW0=
    -----END CERTIFICATE-----

Here the header regex would not match, but the footer would, meaning that
the header is included in the decoded content. Instead of hiding this
error, fail quickly and show a meaningful error which makes for a
clearer error boundary.

Tests have also been added to pin down 'pem_to_der' functionality.

Signed-off-by: Thomas Ellmenreich <t.ellmenreich@proxmox.com>
---
 src/PVE/Certificate.pm  |   8 +-
 test/Makefile           |   1 +
 test/pem_to_der_test.pl | 161 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 167 insertions(+), 3 deletions(-)
 create mode 100755 test/pem_to_der_test.pl

diff --git a/src/PVE/Certificate.pm b/src/PVE/Certificate.pm
index 620ba6b..2f65568 100644
--- a/src/PVE/Certificate.pm
+++ b/src/PVE/Certificate.pm
@@ -214,11 +214,13 @@ sub pem_to_der {
     my $header = $header_re->($ANY_LABEL);
     my $footer = $footer_re->($ANY_LABEL);
 
-    $content = strip_leading_text($content);
+    $content = strip_surrounding_text($content);
 
     # only take first PEM entry
-    $content =~ s/^$header$//mg;
-    $content =~ s/$footer.*//sg;
+    $content =~ s/$header//mg
+        or die "Could not convert PEM to DER, no header found.\n";
+    $content =~ s/$footer.*//ms
+        or die "Could not convert PEM to DER, no footer found.\n";
 
     $content = decode_base64($content);
 
diff --git a/test/Makefile b/test/Makefile
index 9caba10..f111511 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -19,6 +19,7 @@ TESTS = lock_file.test			\
 	ticket_test.test \
 	check_pem_test.test \
 	split_pem_test.test \
+	pem_to_der_test.test \
 
 all:
 
diff --git a/test/pem_to_der_test.pl b/test/pem_to_der_test.pl
new file mode 100755
index 0000000..c35e1f4
--- /dev/null
+++ b/test/pem_to_der_test.pl
@@ -0,0 +1,161 @@
+#!/usr/bin/perl
+# Tests the PVE::Certificate::pem_to_der function for
+# correctness and coverage of edgecases.
+use strict;
+use warnings;
+
+use lib '../src';
+
+use Test::More;
+
+use PVE::Certificate;
+
+# Arrange
+my $setup = [
+    {
+        name => "single pem",
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2Np
+bmcgZWxpdCwgc2VkIGRvIGVpdXNtb2QgdGVtcG9yIGluY2lkaWR1bnQgdXQgbGFi
+b3JlIGV0IGRvbG9yZSBtYWduYSBhbGlxdWEuIFV0IGVuaW0gYWQgbWluaW0gdmVu
+aWFtLCBxdWlzIG5vc3RydWQgZXhlcmNpdGF0aW9uIHVsbGFtY28gbGFib3JpcyBu
+aXNpIHV0IGFsaXF1aXAgZXggZWEgY29tbW9kbyBjb25zZXF1YXQuIER1aXMgYXV0
+ZSBpcnVyZSBkb2xvciBpbiByZXByZWhlbmRlcml0IGluIHZvbHVwdGF0ZSB2ZWxp
+dCBlc3NlIGNpbGx1bSBkb2xvcmUgZXUgZnVnaWF0IG51bGxhIHBhcmlhdHVyLiBF
+eGNlcHRldXIgc2ludCBvY2NhZWNhdCBjdXBpZGF0YXQgbm9uIHByb2lkZW50LCBz
+dW50IGluIGN1bHBhIHF1aSBvZmZpY2lhIGRlc2VydW50IG1vbGxpdCBhbmltIGlk
+IGVzdCBsYWJvcnVtLg==
+-----END CERTIFICATE-----
+},
+        expected_decoded_result =>
+            "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
+    },
+    {
+        name => "single pem no terminating newline",
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+        expected_decoded_result => "Lorem ipsum",
+    },
+    {
+        name => "multiple pem",
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMw==
+-----END CERTIFICATE-----
+},
+        expected_decoded_result => "Lorem ipsum 1",
+    },
+    {
+        name => "multiple pem leading newline",
+        pem => q{
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMw==
+-----END CERTIFICATE-----
+},
+        expected_decoded_result => "Lorem ipsum 1",
+    },
+    {
+        name => "multiple pem leading text",
+        pem => q{
+some leading
+text that is expected
+to be stripped
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMw==
+-----END CERTIFICATE-----
+},
+        expected_decoded_result => "Lorem ipsum 1",
+    },
+    {
+        name => "multiple pem interleaved text",
+        pem => q{
+some leading text
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMQ==
+-----END CERTIFICATE-----
+some leading text
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMg==
+-----END CERTIFICATE-----
+some leading text
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMw==
+-----END CERTIFICATE-----
+some end text
+},
+        expected_decoded_result => "Lorem ipsum 1",
+    },
+    {
+        name => "multiple pem no newline after footer",
+        pem => q{
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMQ==
+-----END CERTIFICATE----------BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMw==
+-----END CERTIFICATE-----
+},
+        expected_decoded_result => "Lorem ipsum 1",
+    },
+    {
+        name => "all in one line",
+        pem => "-----BEGIN CERTIFICATE-----TG9yZW0gaXBzdW0=-----END CERTIFICATE-----",
+        expected_error => "header",
+    },
+    {
+        name => "only newline after begin",
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=-----END CERTIFICATE-----},
+        expected_error => "footer",
+    },
+    {
+        name => "only newline after content",
+        pem => q{-----BEGIN CERTIFICATE-----TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+        expected_error => "header",
+    },
+    {
+        name => "only newline after end",
+        pem => q{-----BEGIN CERTIFICATE-----TG9yZW0gaXBzdW0=-----END CERTIFICATE-----
+},
+        expected_error => "header",
+    },
+];
+
+for my $data ($setup->@*) {
+    subtest $data->{name} => sub {
+        my $to_der_result = eval { PVE::Certificate::pem_to_der($data->{pem}) };
+        my $to_der_error = $@;
+        if (defined($data->{expected_decoded_result})) {
+            is($to_der_result, $data->{expected_decoded_result}, "has correct decoded result");
+        } else {
+            like(
+                $to_der_error,
+                qr/Could not convert PEM to DER, no $data->{expected_error} found./,
+                "has died with expected error",
+            );
+        }
+    }
+}
+
+done_testing();
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH common v2 10/11] certificate tests: refactor and exapand testsuite
  2026-11-18 10:31 [PATCH common v2 00/11] pem parser: refactor parsing to cover more edge cases Thomas Ellmenreich
                   ` (8 preceding siblings ...)
  2026-11-18 10:31 ` [PATCH common v2 09/11] pem to der: create clearer error boundary Thomas Ellmenreich
@ 2026-11-18 10:31 ` Thomas Ellmenreich
  2026-11-18 10:31 ` [PATCH common v2 11/11] pom parsing: allow for CRLF line ending Thomas Ellmenreich
  10 siblings, 0 replies; 12+ messages in thread
From: Thomas Ellmenreich @ 2026-11-18 10:31 UTC (permalink / raw)
  To: pve-devel; +Cc: Thomas Ellmenreich

The previous tests were testing the functionality of internal methods
through 'check_pem' which lead to a lot of convoluted tests. The new
certificate_utils_test now contains tests for these internal utilities
so that tests for functions like check_pem can focus on its specific
functionality.

With the refactor of the tests also replaced most of the base64 content
with a base64 encoded 'Lorem Ipsum'.

Signed-off-by: Thomas Ellmenreich <t.ellmenreich@proxmox.com>
---
 src/PVE/Certificate.pm         |  12 +-
 test/Makefile                  |   1 +
 test/certificate_utils_test.pl | 347 ++++++++++++++++++++++++++++++
 test/check_pem_test.pl         | 381 +++++++++++++--------------------
 test/split_pem_test.pl         | 151 +++++--------
 5 files changed, 556 insertions(+), 336 deletions(-)
 create mode 100755 test/certificate_utils_test.pl

diff --git a/src/PVE/Certificate.pm b/src/PVE/Certificate.pm
index 2f65568..c89c9e2 100644
--- a/src/PVE/Certificate.pm
+++ b/src/PVE/Certificate.pm
@@ -117,7 +117,7 @@ my $footer_re = sub {
     return qr!(?m:^)-----END\ $label-----(?:\z|\n(?=\s*\S))!;
 };
 
-my $pem_re = sub {
+sub __pem_re {
     my ($label) = @_;
 
     my $b64_char_re = qr![0-9A-Za-z\+/]\n*!; # see RFC 7468
@@ -132,7 +132,7 @@ my $pem_re = sub {
             |(?:$b64_char_re){2}=\s*=\s*)
         $footer
     }x;
-};
+}
 
 my sub trim_trailing_space {
     my ($content) = @_;
@@ -141,7 +141,7 @@ my sub trim_trailing_space {
     return $content;
 }
 
-my sub strip_surrounding_text {
+sub __strip_surrounding_text {
     my ($content, %opts) = @_;
 
     my $label = $opts{label} // $ANY_LABEL;
@@ -177,7 +177,7 @@ sub check_pem {
     my ($content, %opts) = @_;
 
     my $label = $opts{label} // ($opts{any_label} ? $ANY_LABEL : 'CERTIFICATE');
-    my $re = $pem_re->($label);
+    my $re = __pem_re($label);
 
     my @split =
         $opts{multiple}
@@ -191,7 +191,7 @@ sub check_pem {
 
     my @result_entries = ();
     for my $entry (@split) {
-        my $stripped = strip_surrounding_text($entry, label => $label);
+        my $stripped = __strip_surrounding_text($entry, label => $label);
 
         if ($stripped !~ /$re/) {
             @result_entries = ();
@@ -214,7 +214,7 @@ sub pem_to_der {
     my $header = $header_re->($ANY_LABEL);
     my $footer = $footer_re->($ANY_LABEL);
 
-    $content = strip_surrounding_text($content);
+    $content = __strip_surrounding_text($content);
 
     # only take first PEM entry
     $content =~ s/$header//mg
diff --git a/test/Makefile b/test/Makefile
index f111511..b65671e 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -20,6 +20,7 @@ TESTS = lock_file.test			\
 	check_pem_test.test \
 	split_pem_test.test \
 	pem_to_der_test.test \
+	certificate_utils_test.test \
 
 all:
 
diff --git a/test/certificate_utils_test.pl b/test/certificate_utils_test.pl
new file mode 100755
index 0000000..873a549
--- /dev/null
+++ b/test/certificate_utils_test.pl
@@ -0,0 +1,347 @@
+#!/usr/bin/perl
+# Tests for a few of the smaller PVE::Certificate utilities to check the
+# correctness and coverage of edgecases.
+use strict;
+use warnings;
+
+use lib '../src';
+
+use Test::More;
+
+use PVE::Certificate;
+
+############################################
+####    strip_leading_text/_and_trim    ####
+############################################
+
+my $setup_strip_leading_text = [
+    {
+        name => "simple leading text",
+        pem => q{Subject: CN=some.test.content
+Issuer: CN=Org Issuing CA 3
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+        expected_result => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "leading text with leading newline",
+        pem => q{
+Subject: CN=some.test.content
+Issuer: CN=Org Issuing CA 3
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+        expected_result => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----}
+    },
+    {
+        name => "leading text with trailing newline",
+        pem => q{Subject: CN=some.test.content
+Issuer: CN=Org Issuing CA 3
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
+},
+        expected_result => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "trailing newlines and whitespaces are trimmed",
+        pem => q{Subject: CN=some.test.content
+Issuer: CN=Org Issuing CA 3
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
+ 
+  
+
+  
+},
+        expected_result => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "no leading text",
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+        expected_result => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "leading and trailing newlines",
+        pem => q{
+
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
+
+},
+        expected_result => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "multiple entries with interleaved text",
+        pem => q{Subject: CN=some.test.content
+Issuer: CN=Org Issuing CA 3
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMQ==
+-----END CERTIFICATE-----
+Subject: CN=some.test.content
+Issuer: CN=Org Issuing CA 3
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMg==
+-----END CERTIFICATE-----},
+        expected_result => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMQ==
+-----END CERTIFICATE-----}
+    },
+];
+
+for my $data ($setup_strip_leading_text->@*) {
+    subtest $data->{name} => sub {
+        # Act
+        my $result = PVE::Certificate::__strip_surrounding_text($data->{pem});
+
+        # Assert
+        is(
+            $result, $data->{expected_result}, "has correct result",
+        );
+    }
+}
+
+############################################
+####               pem_re               ####
+############################################
+
+my $setup_pem_re = [
+    {
+        name => "simple pem",
+        expected_match => 1,
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "with leading text",
+        expected_match => 0,
+        pem => q{Subject: CN=some.test.content
+Issuer: CN=Org Issuing CA 3
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "leading newline",
+        expected_match => 0,
+        pem => q{
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "trailing newline",
+        expected_match => 0,
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
+},
+    },
+    {
+        name => "non base64 chars",
+        expected_match => 0,
+        pem => q{-----BEGIN CERTIFICATE-----
+some #!"§/(%T) non base 64 chars=
+-----END CERTIFICATE-----
+},
+    },
+    {
+        name => "missing trailing equals",
+        expected_match => 0,
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "multiline missing trailing equals",
+        expected_match => 0,
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0
+TG9yZW0gaXBzdW0
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "glob label",
+        expected_match => 1,
+        label => qr/.*?/,
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "incorrect label",
+        expected_match => 0,
+        label => "OTHER",
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "two terminating equals",
+        expected_match => 1,
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW==
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "second equals on newline",
+        expected_match => 1,
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW=
+=
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "content after terminating equals",
+        expected_match => 0,
+        label => "OTHER",
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+=
+some extra content
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "content spaced out",
+        expected_match => 1,
+        pem => q{-----BEGIN CERTIFICATE-----
+
+TG9yZW0gaXBzdW0=
+
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "no content between begin and end",
+        expected_match => 0,
+        pem => q{-----BEGIN CERTIFICATE-----
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "only newlines content",
+        expected_match => 0,
+        pem => q{-----BEGIN CERTIFICATE-----
+
+
+
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "content after end",
+        expected_match => 1,
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
+some extended content},
+    },
+    {
+        name => "only newlines content",
+        expected_match => 0,
+        pem => q{
+
+},
+    },
+    {
+        name => "upsidedown begin and end",
+        expected_match => 0,
+        pem => q{
+-----END CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----BEGIN CERTIFICATE-----},
+    },
+    {
+        name => "multi pem",
+        expected_match => 1,
+        multiple => 1,
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMw==
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "content length divisible by 4",
+        expected_match => 1,
+        multiple => 1,
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0x
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "content length missing 1",
+        expected_match => 1,
+        multiple => 1,
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "content length missing 2",
+        expected_match => 1,
+        multiple => 1,
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW==
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "content has to be divisible by 4 negative case",
+        expected_match => 0,
+        multiple => 1,
+        pem => q{-----BEGIN CERTIFICATE-----
+asdfkljnasdkfbakjhsdbfe
+TG9yZW0gaXBzdW==
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "content has to be divisible by 4 positive case",
+        expected_match => 1,
+        multiple => 1,
+        pem => q{-----BEGIN CERTIFICATE-----
+asdfkljnasdkfbakjhsdbfe2
+TG9yZW0gaXBzdW==
+-----END CERTIFICATE-----},
+    },
+];
+
+for my $data ($setup_pem_re->@*) {
+    subtest $data->{name} => sub {
+        # Act
+        my $pem_re = PVE::Certificate::__pem_re($data->{label} // 'CERTIFICATE');
+        my $matches = ($data->{pem} =~ $pem_re);
+
+        my $error_data = "\n'" . $data->{pem} . "'\n\nby pem_re:\n\n'" . $pem_re . "'";
+
+        if ($data->{expected_match}) {
+            ok($matches, "was correctly accepted")
+                or diag "this was wrongfully DENIED:" . $error_data;
+        } else {
+            ok(!$matches, "was correctly rejected")
+                or diag "this was wrongfully ACCEPTED:" . $error_data;
+        }
+
+    }
+}
+
+done_testing();
+
diff --git a/test/check_pem_test.pl b/test/check_pem_test.pl
index c074505..73e9826 100755
--- a/test/check_pem_test.pl
+++ b/test/check_pem_test.pl
@@ -14,7 +14,7 @@ use PVE::Certificate;
 my $setup = [
     {
         expected_success => 1,
-        name => "full pem",
+        name => "single pem",
         pem => q{-----BEGIN CERTIFICATE-----
 MIIBsjCCAVugAwIBAgIJAO2g8Z0dXk9tMAoGCCqGSM49BAMCMEUxCzAJBgNVBAYT
 AlVTMQswCQYDVQQIDAJDQTEQMA4GA1UEBwwHQmVya2VsZXkxEDAOBgNVBAoMB1Rl
@@ -23,307 +23,220 @@ EwJVUzELMAkGA1UECAwCQ0ExEDAOBgNVBAcMB0JlcmtlbGV5MRAwDgYDVQQKDAdU
 ZXN0IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEv5Q8q1p7qZ2gqkQ0Qn5x
 0n9yqv8n8n7n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8aNT
 MFEwHQYDVR0OBBYEFOu2Y0bq8v3z7qkq1m1Qwqkq1m1QMB8GA1UdIwQYMBaAFOu2
-Y0bq8v3z7qkq1m1Qwqkq1m1QMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwID
-TG9yZW0gaXBzdW0=
+Y0bq8v3z7qkq1m1Qwqkq1m1QMA8GA1UdEwE=
 -----END CERTIFICATE-----},
     },
     {
         expected_success => 1,
-        name => "other label pem",
-        label => "SOME LABEL",
-        pem => q{-----BEGIN SOME LABEL-----
-MIIBsjCCAVugAwIBAgIJAO2g8Z0dXk9tMAoGCCqGSM49BAMCMEUxCzAJBgNVBAYT
-AlVTMQswCQYDVQQIDAJDQTEQMA4GA1UEBwwHQmVya2VsZXkxEDAOBgNVBAoMB1Rl
-c3QgQ0EwHhcNMjAwMTAxMDAwMDAwWhcNMzAwMTAxMDAwMDAwWjBFMQswCQYDVQQG
-EwJVUzELMAkGA1UECAwCQ0ExEDAOBgNVBAcMB0JlcmtlbGV5MRAwDgYDVQQKDAdU
-ZXN0IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEv5Q8q1p7qZ2gqkQ0Qn5x
-0n9yqv8n8n7n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8n8aNT
-MFEwHQYDVR0OBBYEFOu2Y0bq8v3z7qkq1m1Qwqkq1m1QMB8GA1UdIwQYMBaAFOu2
-Y0bq8v3z7qkq1m1Qwqkq1m1QMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwID
-TG9yZW0gaXBzdW0=
------END SOME LABEL-----},
-    },
-    {
-        expected_success => 1,
-        name => "simple pem",
+        name => "single pem as multiple",
+        multiple => 1,
         pem => q{-----BEGIN CERTIFICATE-----
 TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----},
     },
     {
         expected_success => 1,
-        name => "spaced out pem",
-        pem => q{-----BEGIN CERTIFICATE-----
-
-TG9yZW0gaXBzdW0=
-
------END CERTIFICATE-----},
-    },
-    {
-        expected_success => 0,
-        name => "only newline pem",
-        pem => q{-----BEGIN CERTIFICATE-----
------END CERTIFICATE-----},
-    },
-    {
-        expected_success => 0,
-        name => "many newlines pem",
-        pem => q{-----BEGIN CERTIFICATE-----
-
-
-
------END CERTIFICATE-----},
-    },
-    {
-        expected_success => 0,
-        name => "no content pem",
+        name => "simple pem with surrounding newlines",
         pem => q{
------BEGIN CERTIFICATE----------END CERTIFICATE-----},
-    },
-    {
-        expected_success => 1,
-        name => "preceding content pem",
-        pem => q{
-some extended content
------BEGIN CERTIFICATE-----
-TG9yZW0gaXBzdW0=
------END CERTIFICATE-----},
 
-        expected_result => q{-----BEGIN CERTIFICATE-----
-TG9yZW0gaXBzdW0=
------END CERTIFICATE-----},
-    },
-    {
-        expected_success => 1,
-        name => "following content pem",
-        pem => q{
 -----BEGIN CERTIFICATE-----
 TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
-some extended content},
-        expected_result => q{-----BEGIN CERTIFICATE-----
-TG9yZW0gaXBzdW0=
------END CERTIFICATE-----}
-    },
-    {
-        expected_success => 0,
-        name => "empty pem",
-        pem => q{
 
 },
-    },
-    {
-        expected_success => 0,
-        name => "upsidedown pem",
-        pem => q{
------END CERTIFICATE-----
+        expected_result => q{-----BEGIN CERTIFICATE-----
 TG9yZW0gaXBzdW0=
------BEGIN CERTIFICATE-----},
+-----END CERTIFICATE-----}
     },
     {
         expected_success => 1,
-        name => "multi pem",
+        name => "multiple pem with interleaved text",
         multiple => 1,
-        pem => q{-----BEGIN CERTIFICATE-----
-12JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----
+        pem => q{Subject: CN=some.test.content
+Issuer: CN=Org Issuing CA 3
 -----BEGIN CERTIFICATE-----
-22JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
+Subject: CN=Org Issuing CA 3
+Issuer: CN=Org Root CA
 -----BEGIN CERTIFICATE-----
-32JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+        expected_result => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-42JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----},
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----}
     },
     {
         expected_success => 1,
-        name => "multiple as single pem",
-        pem => q{
-Subject: CN=some.test.content
+        name => "chain with different labels but allow all",
+        multiple => 1,
+        any_label => 1,
+        pem => q{Subject: CN=some.test.content
 Issuer: CN=Org Issuing CA 3
------BEGIN CERTIFICATE-----
-TG9yZW0gaXBzdW0gMQ==
------END CERTIFICATE-----
+-----BEGIN A-----
+TG9yZW0gaXBzdW0=
+-----END A-----
 Subject: CN=Org Issuing CA 3
 Issuer: CN=Org Root CA
------BEGIN CERTIFICATE-----
-TG9yZW0gaXBzdW0gMg==
------END CERTIFICATE-----},
-        expected_result => q{-----BEGIN CERTIFICATE-----
-TG9yZW0gaXBzdW0gMQ==
------END CERTIFICATE-----}
+-----BEGIN B-----
+TG9yZW0gaXBzdW0=
+-----END B-----
+Subject: CN=Org Issuing CA 3
+Issuer: CN=Org Root CA
+-----BEGIN C-----
+TG9yZW0gaXBzdW0=
+-----END C-----},
+        expected_result => q{-----BEGIN A-----
+TG9yZW0gaXBzdW0=
+-----END A-----
+-----BEGIN B-----
+TG9yZW0gaXBzdW0=
+-----END B-----
+-----BEGIN C-----
+TG9yZW0gaXBzdW0=
+-----END C-----}
     },
     {
         expected_success => 1,
-        name => "multiple pem",
+        name => "chain with different labels but only allow B",
         multiple => 1,
-        pem => q{
-Subject: CN=some.test.content
+        label => "B",
+        pem => q{Subject: CN=some.test.content
 Issuer: CN=Org Issuing CA 3
------BEGIN CERTIFICATE-----
-1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----
+-----BEGIN A-----
+TG9yZW0gaXBzdW0=
+-----END A-----
 Subject: CN=Org Issuing CA 3
 Issuer: CN=Org Root CA
------BEGIN CERTIFICATE-----
-2WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----},
-        expected_result => q{-----BEGIN CERTIFICATE-----
-1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-2WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----},
+-----BEGIN B-----
+TG9yZW0gaXBzdW0=
+-----END B-----
+Subject: CN=Org Issuing CA 3
+Issuer: CN=Org Root CA
+-----BEGIN C-----
+TG9yZW0gaXBzdW0=
+-----END C-----},
+        expected_result => q{-----BEGIN B-----
+TG9yZW0gaXBzdW0=
+-----END B-----}
     },
     {
         expected_success => 1,
-        name => "big pem different label",
+        name => "chain with different labels but only allow interleaved B",
         multiple => 1,
-        label => "LABEL",
-        pem => q{
-Subject: CN=some.test.content
+        label => "B",
+        pem => q{Subject: CN=some.test.content
 Issuer: CN=Org Issuing CA 3
------BEGIN LABEL-----
-1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END LABEL-----
+-----BEGIN A-----
+TG9yZW0gaXBzdW0=
+-----END A-----
 Subject: CN=Org Issuing CA 3
 Issuer: CN=Org Root CA
------BEGIN LABEL-----
-2WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END LABEL-----
-Subject: CN=Org Root CA
+-----BEGIN B-----
+TG9yZW0gaXBzdW0=
+-----END B-----
+Subject: CN=some.test.content
+Issuer: CN=Org Issuing CA 3
+-----BEGIN A-----
+TG9yZW0gaXBzdW0=
+-----END A-----
+Subject: CN=Org Issuing CA 3
 Issuer: CN=Org Root CA
------BEGIN LABEL-----
-3WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END LABEL-----},
-
-        expected_result => q{-----BEGIN LABEL-----
-1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END LABEL-----
------BEGIN LABEL-----
-2WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END LABEL-----
------BEGIN LABEL-----
-3WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END LABEL-----},
+-----BEGIN B-----
+TG9yZW0gaXBzdW0=
+-----END B-----},
+        expected_result => q{-----BEGIN B-----
+TG9yZW0gaXBzdW0=
+-----END B-----
+-----BEGIN B-----
+TG9yZW0gaXBzdW0=
+-----END B-----}
     },
     {
         expected_success => 1,
-        name => "other real pem",
-        pem => q{
-Subject: CN=Some subject with 2 Points,O=A Organization,L=Some Lation,C=TT
-Issuer: CN=The Orgs Name RootCA 2015,O=The Orgs name Institutions Cert. Authority,L=Location,C=TT
+        name => "chain was single",
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----},
-        expected_result => q{-----BEGIN CERTIFICATE-----
-1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----},
-    },
-    {
-        expected_success => 0,
-        name => "invalid single pem",
-        pem => q{
-Subject: CN=Some subject with 2 Points,O=A Organization,L=Some Lation,C=TT
-Issuer: CN=The Orgs Name RootCA 2015,O=The Orgs name Institutions Cert. Authority,L=Location,C=TT
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdthese !?''*:;$%&/  are not allowedWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
 },
+        expected_result => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----}
     },
     {
-        expected_success => 0,
-        name => "invalid multi pem",
-        multiple => 1,
-        pem => q{
-Subject: CN=Some subject with 2 Points,O=A Organization,L=Some Lation,C=TT
-Issuer: CN=The Orgs Name RootCA 2015,O=The Orgs name Institutions Cert. Authority,L=Location,C=TT
+        expected_success => 1,
+        name => "chain was single",
+        pem => q{Subject: CN=Org Issuing CA 3
+Issuer: CN=Org Root CA
 -----BEGIN CERTIFICATE-----
-1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdthese !?''*:;$%&/  are not allowedWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
-Subject: CN=Some subject with 2 Points,O=A Organization,L=Some Lation,C=TT
-Issuer: CN=The Orgs Name RootCA 2015,O=The Orgs name Institutions Cert. Authority,L=Location,C=TT
+Subject: CN=Org Issuing CA 3
+Issuer: CN=Org Root CA
 -----BEGIN CERTIFICATE-----
-1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----},
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
+Subject: CN=Org Issuing CA 3
+Issuer: CN=Org Root CA
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
+},
+        expected_result => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----}
     },
     {
         expected_success => 1,
-        name => "single as multiple pem",
+        name => "pem with ec parameters",
         multiple => 1,
-        pem => q{-----BEGIN CERTIFICATE-----
-1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdtheseZ2RmaXVwYWJ2aXV1YXdlYmxmamlraWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----},
+        any_label => 1,
+        pem => q{
+Subject: CN=Org Issuing CA 3
+Issuer: CN=Org Root CA
+-----BEGIN EC PARAMETERS-----
+TG9yZW0gaXBzdW0=
+-----END EC PARAMETERS-----
+Subject: CN=Org Issuing CA 3
+Issuer: CN=Org Root CA
+-----BEGIN EC PRIVATE KEY-----
+TG9yZW0gaXBzdW0=
+-----END EC PRIVATE KEY-----},
+        expected_result => q{-----BEGIN EC PARAMETERS-----
+TG9yZW0gaXBzdW0=
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+TG9yZW0gaXBzdW0=
+-----END EC PRIVATE KEY-----}
     },
     {
         expected_success => 1,
-        name => "single as multiple pem",
+        name => "pem with ec parameters",
         multiple => 1,
+        label => "EC PRIVATE KEY",
         pem => q{
-Subject: CN=Some subject with 2 Points,O=A Organization,L=Some Lation,C=TT
-Issuer: CN=The Orgs Name RootCA 2015,O=The Orgs name Institutions Cert. Authority,L=Location,C=TT
------BEGIN CERTIFICATE-----
-1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdtheseZ2RmaXVwYWJ2aXV1YXdlYmxmamlraWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----},
-        expected_result => q{-----BEGIN CERTIFICATE-----
-1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdtheseZ2RmaXVwYWJ2aXV1YXdlYmxmamlraWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
------END CERTIFICATE-----},
+Subject: CN=Org Issuing CA 3
+Issuer: CN=Org Root CA
+-----BEGIN EC PARAMETERS-----
+TG9yZW0gaXBzdW0=
+-----END EC PARAMETERS-----
+Subject: CN=Org Issuing CA 3
+Issuer: CN=Org Root CA
+-----BEGIN EC PRIVATE KEY-----
+TG9yZW0gaXBzdW0=
+-----END EC PRIVATE KEY-----},
+        expected_result => q{-----BEGIN EC PRIVATE KEY-----
+TG9yZW0gaXBzdW0=
+-----END EC PRIVATE KEY-----}
     },
 ];
 
@@ -335,6 +248,7 @@ for my $data ($setup->@*) {
             noerr => 1,
             multiple => $data->{multiple},
             label => $data->{label},
+            any_label => $data->{any_label},
         );
 
         # Assert
@@ -355,6 +269,7 @@ for my $data ($setup->@*) {
                     $data->{pem},
                     multiple => $data->{multiple},
                     label => $data->{label},
+                    any_label => $data->{any_label},
                 );
             };
             ok($@, "has correctly thrown an error");
diff --git a/test/split_pem_test.pl b/test/split_pem_test.pl
index fdc961e..02cce94 100755
--- a/test/split_pem_test.pl
+++ b/test/split_pem_test.pl
@@ -15,8 +15,7 @@ my $setup = [
     {
         expected_success => 1,
         name => "single pem",
-        pem => q{
------BEGIN CERTIFICATE-----
+        pem => q{-----BEGIN CERTIFICATE-----
 MIIBsjCCAVugAwIBAgIJAO2g8Z0dXk9tMAoGCCqGSM49BAMCMEUxCzAJBgNVBAYT
 AlVTMQswCQYDVQQIDAJDQTEQMA4GA1UEBwwHQmVya2VsZXkxEDAOBgNVBAoMB1Rl
 c3QgQ0EwHhcNMjAwMTAxMDAwMDAwWhcNMzAwMTAxMDAwMDAwWjBFMQswCQYDVQQG
@@ -31,39 +30,33 @@ SAAwRQIhANfakefakefakefakefakefakefakefakefake
     {
         expected_success => 1,
         name => "no extra text pem",
-        pem => q{
------BEGIN CERTIFICATE-----
-12JlZ2tseTxzZWl2IGF3ZWlidm4=
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-22JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-32JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-42JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----},
-
         expected_result => [
-            q{
------BEGIN CERTIFICATE-----
-12JlZ2tseTxzZWl2IGF3ZWlidm4=
+            q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
 },
-
             q{-----BEGIN CERTIFICATE-----
-22JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
 },
-
             q{-----BEGIN CERTIFICATE-----
-32JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
 },
-
             q{-----BEGIN CERTIFICATE-----
-42JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----},
         ],
     },
@@ -121,139 +114,86 @@ some test text
     {
         expected_success => 1,
         name => "leading and interleaved text pem",
-        pem => q{
-Subject: CN=some.test.content
+        pem => q{Subject: CN=some.test.content
 Issuer: CN=Org Issuing CA 3
 -----BEGIN CERTIFICATE-----
-1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
 Subject: CN=Org Issuing CA 3
 Issuer: CN=Org Root CA
 -----BEGIN CERTIFICATE-----
-2WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
 Subject: CN=Org Root CA
 Issuer: CN=Org Root CA
 -----BEGIN CERTIFICATE-----
-3WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----},
-
         expected_result => [
-            q{
-Subject: CN=some.test.content
+            q{Subject: CN=some.test.content
 Issuer: CN=Org Issuing CA 3
 -----BEGIN CERTIFICATE-----
-1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
 },
-
             q{Subject: CN=Org Issuing CA 3
 Issuer: CN=Org Root CA
 -----BEGIN CERTIFICATE-----
-2WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
 },
-
             q{Subject: CN=Org Root CA
 Issuer: CN=Org Root CA
 -----BEGIN CERTIFICATE-----
-3WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----},
         ],
     },
     {
         expected_success => 1,
         name => "massive glob pem",
-        pem => q{
-Subject: CN=some.test.content
+        pem => q{Subject: CN=some.test.content
 Issuer: CN=Org Issuing CA 3
 -----BEGIN CERTIFICATE-----
-1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 Subject: CN=Org Issuing CA 3
 Issuer: CN=Org Root CA
 -----BEGIN CERTIFICATE-----
-2WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 Subject: CN=Org Root CA
 Issuer: CN=Org Root CA
 -----BEGIN CERTIFICATE-----
-3WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----},
     },
     {
         expected_success => 1,
         name => "no beginning pem",
-        pem => q{
-Subject: CN=some.test.content
+        pem => q{Subject: CN=some.test.content
 Issuer: CN=Org Issuing CA 3
-2WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
 Subject: CN=Org Root CA
 Issuer: CN=Org Root CA
-3WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----},
-
         expected_result => [
-            q{
-Subject: CN=some.test.content
+            q{Subject: CN=some.test.content
 Issuer: CN=Org Issuing CA 3
-2WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
 },
             q{Subject: CN=Org Root CA
 Issuer: CN=Org Root CA
-3WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
-c2JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----},
         ],
-
     },
     {
         expected_success => 0,
         name => "not a pem pem",
-        pem => q{
-Subject: CN=some.test.content
+        pem => q{Subject: CN=some.test.content
 Issuer: CN=Org Issuing CA 3
-1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i
-dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h
-dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3
 c2JlZ2tseTxzZWl2IGF3ZWlidm4=
 Subject: CN=Org Issuing CA 3
 Issuer: CN=Org Root CA},
@@ -261,27 +201,44 @@ Issuer: CN=Org Root CA},
     {
         expected_success => 1,
         name => "following text pem",
-        pem => q{
------BEGIN CERTIFICATE-----
-32JlZ2tseTxzZWl2IGF3ZWlidm4=
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-42JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
 some more text that we would like to remove},
-
         expected_result => [
-            q{
------BEGIN CERTIFICATE-----
-32JlZ2tseTxzZWl2IGF3ZWlidm4=
+            q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
 },
             q{-----BEGIN CERTIFICATE-----
-42JlZ2tseTxzZWl2IGF3ZWlidm4=
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----
 },
         ],
     },
+    {
+        expected_success => 1,
+        name => "different labels pem",
+        pem => q{-----BEGIN LABEL A-----
+TG9yZW0gaXBzdW0=
+-----END LABEL A-----
+-----BEGIN LABEL B-----
+TG9yZW0gaXBzdW0=
+-----END LABEL B-----},
+
+        expected_result => [
+            q{-----BEGIN LABEL A-----
+TG9yZW0gaXBzdW0=
+-----END LABEL A-----
+},
+            q{-----BEGIN LABEL B-----
+TG9yZW0gaXBzdW0=
+-----END LABEL B-----},
+        ],
+    },
 ];
 
 for my $data ($setup->@*) {
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH common v2 11/11] pom parsing: allow for CRLF line ending
  2026-11-18 10:31 [PATCH common v2 00/11] pem parser: refactor parsing to cover more edge cases Thomas Ellmenreich
                   ` (9 preceding siblings ...)
  2026-11-18 10:31 ` [PATCH common v2 10/11] certificate tests: refactor and exapand testsuite Thomas Ellmenreich
@ 2026-11-18 10:31 ` Thomas Ellmenreich
  10 siblings, 0 replies; 12+ messages in thread
From: Thomas Ellmenreich @ 2026-11-18 10:31 UTC (permalink / raw)
  To: pve-devel; +Cc: Thomas Ellmenreich

According to RFC 7468 CRLF line endings are allowed which means that our
functions should support this. We simply replace all CRLF line endings
with normal newlines to also produce coherent results.

Also add some tests to check that they are accepted as expected.

Signed-off-by: Thomas Ellmenreich <t.ellmenreich@proxmox.com>
---
 src/PVE/Certificate.pm         |  3 +++
 test/certificate_utils_test.pl |  8 ++++++++
 test/check_pem_test.pl         | 18 ++++++++++++++++++
 test/pem_to_der_test.pl        | 11 +++++++++++
 test/split_pem_test.pl         | 21 +++++++++++++++++++++
 5 files changed, 61 insertions(+)

diff --git a/src/PVE/Certificate.pm b/src/PVE/Certificate.pm
index c89c9e2..d400ae7 100644
--- a/src/PVE/Certificate.pm
+++ b/src/PVE/Certificate.pm
@@ -165,6 +165,7 @@ sub strip_leading_text {
 sub split_pem {
     my ($content, %opts) = @_;
 
+    $content =~ s/\r\n/\n/g;
     $content = trim_trailing_space($content);
     my $footer = $footer_re->($opts{label} // $ANY_LABEL);
 
@@ -176,6 +177,7 @@ sub split_pem {
 sub check_pem {
     my ($content, %opts) = @_;
 
+    $content =~ s/\r\n/\n/g;
     my $label = $opts{label} // ($opts{any_label} ? $ANY_LABEL : 'CERTIFICATE');
     my $re = __pem_re($label);
 
@@ -211,6 +213,7 @@ sub check_pem {
 sub pem_to_der {
     my ($content) = @_;
 
+    $content =~ s/\r\n/\n/g;
     my $header = $header_re->($ANY_LABEL);
     my $footer = $footer_re->($ANY_LABEL);
 
diff --git a/test/certificate_utils_test.pl b/test/certificate_utils_test.pl
index 873a549..915076b 100755
--- a/test/certificate_utils_test.pl
+++ b/test/certificate_utils_test.pl
@@ -226,6 +226,14 @@ some extra content
 
 TG9yZW0gaXBzdW0=
 
+-----END CERTIFICATE-----},
+    },
+    {
+        name => "blank line after header",
+        expected_match => 1,
+        pem => q{-----BEGIN CERTIFICATE-----
+
+TG9yZW0gaXBzdW0=
 -----END CERTIFICATE-----},
     },
     {
diff --git a/test/check_pem_test.pl b/test/check_pem_test.pl
index 73e9826..3c939fb 100755
--- a/test/check_pem_test.pl
+++ b/test/check_pem_test.pl
@@ -238,6 +238,24 @@ TG9yZW0gaXBzdW0=
 TG9yZW0gaXBzdW0=
 -----END EC PRIVATE KEY-----}
     },
+    {
+        expected_success => 1,
+        name => "chain with crlf line endings",
+        multiple => 1,
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
+} =~ s/\n/\r\n/gr,
+        expected_result => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+    },
 ];
 
 for my $data ($setup->@*) {
diff --git a/test/pem_to_der_test.pl b/test/pem_to_der_test.pl
index c35e1f4..debfed3 100755
--- a/test/pem_to_der_test.pl
+++ b/test/pem_to_der_test.pl
@@ -117,6 +117,17 @@ TG9yZW0gaXBzdW0gMw==
 },
         expected_decoded_result => "Lorem ipsum 1",
     },
+    {
+        name => "multiple pem crlf line endings",
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMg==
+-----END CERTIFICATE-----
+} =~ s/\n/\r\n/gr,
+        expected_decoded_result => "Lorem ipsum 1",
+    },
     {
         name => "all in one line",
         pem => "-----BEGIN CERTIFICATE-----TG9yZW0gaXBzdW0=-----END CERTIFICATE-----",
diff --git a/test/split_pem_test.pl b/test/split_pem_test.pl
index 02cce94..0e2f6be 100755
--- a/test/split_pem_test.pl
+++ b/test/split_pem_test.pl
@@ -239,6 +239,27 @@ TG9yZW0gaXBzdW0=
 -----END LABEL B-----},
         ],
     },
+    {
+        expected_success => 1,
+        name => "crlf line endings pem",
+        pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
+} =~ s/\n/\r\n/gr,
+
+        expected_result => [
+            q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
+},
+            q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+        ],
+    },
 ];
 
 for my $data ($setup->@*) {
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2026-11-18 10:33 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-18 10:31 [PATCH common v2 00/11] pem parser: refactor parsing to cover more edge cases Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 01/11] certificate tests: use q{} for multiline strings Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 02/11] pem parser: add constant to match any label Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 03/11] pem parser: refactor check_pem to use list instead of string Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 04/11] pem parser: stricter handling of newlines Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 05/11] certificate formats: enable multiple parsing for pem-string format Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 06/11] pem parsing: strip all surrounding text from chain entries Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 07/11] pem parsing: make validation of pem entry stricter Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 08/11] pem parsing: default splitting to any label Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 09/11] pem to der: create clearer error boundary Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 10/11] certificate tests: refactor and exapand testsuite Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 11/11] pom parsing: allow for CRLF line ending Thomas Ellmenreich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal