commit 2ff286c26c29b69b02ca99656d26d2f8cfd54682
author Dr. David von Oheimb <David.von.Oheimb@siemens.com> Mon Jun 21 08:55:50 2021 +0200
committer Dr. David von Oheimb <David.von.Oheimb@siemens.com> Wed Nov 17 15:48:34 2021 +0100
tree 71a01c51c47d0dd9528ff14357615d71420ba5a1
parent a6838c8d52087f2b0494bbab8486e10944aff7f7

Add and use HAS_PREFIX() and CHECK_AND_SKIP_PREFIX() for checking if string has literal prefix

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15847)

crypto/x509/v3_conf.c

diff --git a/crypto/x509/v3_conf.c b/crypto/x509/v3_conf.c
index b95c652..8201ba0 100644
--- a/crypto/x509/v3_conf.c
+++ b/crypto/x509/v3_conf.c
@@ -200,9 +200,8 @@
 {
     const char *p = *value;
 
-    if ((strlen(p) < 9) || strncmp(p, "critical,", 9))
+    if (!CHECK_AND_SKIP_PREFIX(p, "critical,"))
         return 0;
-    p += 9;
     while (ossl_isspace(*p))
         p++;
     *value = p;
@@ -215,11 +214,9 @@
     int gen_type = 0;
     const char *p = *value;
 
-    if ((strlen(p) >= 4) && strncmp(p, "DER:", 4) == 0) {
-        p += 4;
+    if (CHECK_AND_SKIP_PREFIX(p, "DER:")) {
         gen_type = 1;
-    } else if ((strlen(p) >= 5) && strncmp(p, "ASN1:", 5) == 0) {
-        p += 5;
+    } else if (CHECK_AND_SKIP_PREFIX(p, "ASN1:")) {
         gen_type = 2;
     } else
         return 0;