pem: Fix assert condition

If the PEM header is "-----BEGIN -----", *type should be an empty
string and the parser shouldn't fail.  Reported by Han Han in:
https://bugzilla.redhat.com/show_bug.cgi?id=1665172

diff --git a/trust/pem.c b/trust/pem.c
index ce4f5547133c957843613b712a48f8ece32aec8d..fae7dd649ee610b79ed254d8890cf9aac52954a9 100644 (file)
--- a/trust/pem.c
+++ b/trust/pem.c
@@ -84,7 +84,7 @@ pem_find_begin (const char *data,
 
        if (type) {
                pref += ARMOR_PREF_BEGIN_L;
-               assert (suff > pref);
+               assert (suff >= pref);
                *type = strndup (pref, suff - pref);
                return_val_if_fail (*type != NULL, NULL);
        }

diff --git a/trust/test-pem.c b/trust/test-pem.c
index 0c7d60a2758d05517d5f01477b38421674f3efb9..6feff86bc5ce6827b47c173d71a2df786903cc02 100644 (file)
--- a/trust/test-pem.c
+++ b/trust/test-pem.c
@@ -119,6 +119,24 @@ struct {
          }
        },
 
+       {
+         /* one block with empty type */
+         "-----BEGIN -----\n"
+         "aYNNXqshlVxCdo8QfKeXh3GUzd/yn4LYIVgQrx4a\n"
+         "-----END -----",
+         {
+           {
+             "",
+             "\x69\x83\x4d\x5e\xab\x21\x95\x5c\x42\x76\x8f\x10\x7c\xa7\x97\x87"
+             "\x71\x94\xcd\xdf\xf2\x9f\x82\xd8\x21\x58\x10\xaf\x1e\x1a",
+             30,
+           },
+           {
+             NULL,
+           }
+         }
+       },
+
        {
          NULL,
        }