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)
diff --git a/apps/fipsinstall.c b/apps/fipsinstall.c
index d0efdf7..8152f39 100644
--- a/apps/fipsinstall.c
+++ b/apps/fipsinstall.c
@@ -7,7 +7,7 @@
* https://www.openssl.org/source/license.html
*/
-#include <string.h>
+#include "internal/cryptlib.h"
#include <openssl/evp.h>
#include <openssl/err.h>
#include <openssl/provider.h>
@@ -368,9 +368,9 @@
case OPT_MACOPT:
if (!sk_OPENSSL_STRING_push(opts, opt_arg()))
goto opthelp;
- if (strncmp(opt_arg(), "hexkey:", 7) == 0)
+ if (HAS_PREFIX(opt_arg(), "hexkey:"))
gotkey = 1;
- else if (strncmp(opt_arg(), "digest:", 7) == 0)
+ else if (HAS_PREFIX(opt_arg(), "digest:"))
gotdigest = 1;
break;
case OPT_VERIFY:
diff --git a/apps/include/apps.h b/apps/include/apps.h
index 6018a83..7d9b64a 100644
--- a/apps/include/apps.h
+++ b/apps/include/apps.h
@@ -11,6 +11,7 @@
# define OSSL_APPS_H
# include "e_os.h" /* struct timeval for DTLS */
+# include "internal/cryptlib.h" /* for HAS_PREFIX */
# include "internal/nelem.h"
# include "internal/sockets.h" /* for openssl_fdset() */
# include <assert.h>
diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index 82eeaea..2c4c292 100644
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -260,21 +260,21 @@
int i;
/* PASS_SOURCE_SIZE_MAX = max number of chars before ':' in below strings */
- if (strncmp(arg, "pass:", 5) == 0)
- return OPENSSL_strdup(arg + 5);
- if (strncmp(arg, "env:", 4) == 0) {
- tmp = getenv(arg + 4);
+ if (CHECK_AND_SKIP_PREFIX(arg, "pass:"))
+ return OPENSSL_strdup(arg);
+ if (CHECK_AND_SKIP_PREFIX(arg, "env:")) {
+ tmp = getenv(arg);
if (tmp == NULL) {
- BIO_printf(bio_err, "No environment variable %s\n", arg + 4);
+ BIO_printf(bio_err, "No environment variable %s\n", arg);
return NULL;
}
return OPENSSL_strdup(tmp);
}
if (!keepbio || pwdbio == NULL) {
- if (strncmp(arg, "file:", 5) == 0) {
- pwdbio = BIO_new_file(arg + 5, "r");
+ if (CHECK_AND_SKIP_PREFIX(arg, "file:")) {
+ pwdbio = BIO_new_file(arg, "r");
if (pwdbio == NULL) {
- BIO_printf(bio_err, "Can't open file %s\n", arg + 5);
+ BIO_printf(bio_err, "Can't open file %s\n", arg);
return NULL;
}
#if !defined(_WIN32)
@@ -286,13 +286,13 @@
* on real Windows descriptors, such as those obtained
* with CreateFile.
*/
- } else if (strncmp(arg, "fd:", 3) == 0) {
+ } else if (CHECK_AND_SKIP_PREFIX(arg, "fd:")) {
BIO *btmp;
- i = atoi(arg + 3);
+ i = atoi(arg);
if (i >= 0)
pwdbio = BIO_new_fd(i, BIO_NOCLOSE);
if ((i < 0) || !pwdbio) {
- BIO_printf(bio_err, "Can't access file descriptor %s\n", arg + 3);
+ BIO_printf(bio_err, "Can't access file descriptor %s\n", arg);
return NULL;
}
/*
@@ -450,10 +450,8 @@
return conf;
}
-#define IS_HTTP(uri) ((uri) != NULL \
- && strncmp(uri, OSSL_HTTP_PREFIX, strlen(OSSL_HTTP_PREFIX)) == 0)
-#define IS_HTTPS(uri) ((uri) != NULL \
- && strncmp(uri, OSSL_HTTPS_PREFIX, strlen(OSSL_HTTPS_PREFIX)) == 0)
+#define IS_HTTP(uri) ((uri) != NULL && HAS_PREFIX(uri, OSSL_HTTP_PREFIX))
+#define IS_HTTPS(uri) ((uri) != NULL && HAS_PREFIX(uri, OSSL_HTTPS_PREFIX))
X509 *load_cert_pass(const char *uri, int format, int maybe_stdin,
const char *pass, const char *desc)
diff --git a/apps/lib/http_server.c b/apps/lib/http_server.c
index 03faac7..8f65466 100644
--- a/apps/lib/http_server.c
+++ b/apps/lib/http_server.c
@@ -17,7 +17,6 @@
# define _POSIX_C_SOURCE 2
#endif
-#include <string.h>
#include <ctype.h>
#include "http_server.h"
#include "internal/sockets.h"
@@ -37,6 +36,7 @@
#define HTTP_VERSION_PATT "1." /* allow 1.x */
#define HTTP_PREFIX_VERSION HTTP_PREFIX""HTTP_VERSION_PATT
#define HTTP_1_0 HTTP_PREFIX_VERSION"0" /* "HTTP/1.0" */
+#define HTTP_VERSION_STR " "HTTP_PREFIX_VERSION
#ifdef HTTP_DAEMON
@@ -336,15 +336,12 @@
*end = '\0';
log_message(prog, LOG_INFO, "Received request, 1st line: %s", reqbuf);
- meth = reqbuf;
- url = meth + 3;
- if ((accept_get && strncmp(meth, "GET ", 4) == 0)
- || (url++, strncmp(meth, "POST ", 5) == 0)) {
- static const char http_version_str[] = " "HTTP_PREFIX_VERSION;
- static const size_t http_version_str_len = sizeof(http_version_str) - 1;
+ url = meth = reqbuf;
+ if ((accept_get && CHECK_AND_SKIP_PREFIX(url, "GET "))
+ || CHECK_AND_SKIP_PREFIX(url, "POST ")) {
/* Expecting (GET|POST) {sp} /URL {sp} HTTP/1.x */
- *(url++) = '\0';
+ url[-1] = '\0';
while (*url == ' ')
url++;
if (*url != '/') {
@@ -360,7 +357,7 @@
for (end = url; *end != '\0'; end++)
if (*end == ' ')
break;
- if (strncmp(end, http_version_str, http_version_str_len) != 0) {
+ if (!HAS_PREFIX(end, HTTP_VERSION_STR)) {
log_message(prog, LOG_WARNING,
"Invalid %s -- bad HTTP/version string: %s",
meth, end + 1);
@@ -370,7 +367,7 @@
*end = '\0';
/* above HTTP 1.0, connection persistence is the default */
if (found_keep_alive != NULL)
- *found_keep_alive = end[http_version_str_len] > '0';
+ *found_keep_alive = end[sizeof(HTTP_VERSION_STR) - 1] > '0';
/*-
* Skip "GET / HTTP..." requests often used by load-balancers.
diff --git a/apps/openssl.c b/apps/openssl.c
index e206612..f347d64 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -8,8 +8,8 @@
*/
#include <stdio.h>
-#include <string.h>
#include <stdlib.h>
+#include "internal/cryptlib.h"
#include <openssl/bio.h>
#include <openssl/crypto.h>
#include <openssl/trace.h>
@@ -417,12 +417,12 @@
warn_deprecated(fp);
return fp->func(argc, argv);
}
- if ((strncmp(argv[0], "no-", 3)) == 0) {
+ f.name = argv[0];
+ if (CHECK_AND_SKIP_PREFIX(f.name, "no-")) {
/*
* User is asking if foo is unsupported, by trying to "run" the
* no-foo command. Strange.
*/
- f.name = argv[0] + 3;
if (lh_FUNCTION_retrieve(prog, &f) == NULL) {
BIO_printf(bio_out, "%s\n", argv[0]);
return 0;
diff --git a/apps/s_client.c b/apps/s_client.c
index 46cecb9..d40f7c9 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -2530,7 +2530,7 @@
*/
if (mbuf_len > 1 && mbuf[0] == '"') {
make_uppercase(mbuf);
- if (strncmp(mbuf, "\"STARTTLS\"", 10) == 0)
+ if (HAS_PREFIX(mbuf, "\"STARTTLS\""))
foundit = 1;
}
} while (mbuf_len > 1 && mbuf[0] == '"');
@@ -2558,7 +2558,7 @@
*/
strncpy(sbuf, mbuf, 2);
make_uppercase(sbuf);
- if (strncmp(sbuf, "OK", 2) != 0) {
+ if (!HAS_PREFIX(sbuf, "OK")) {
BIO_printf(bio_err, "STARTTLS not supported: %s", mbuf);
goto shut;
}
diff --git a/apps/s_server.c b/apps/s_server.c
index 27c7db8..13d59fa 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2985,7 +2985,7 @@
static int www_body(int s, int stype, int prot, unsigned char *context)
{
- char *buf = NULL;
+ char *buf = NULL, *p;
int ret = 1;
int i, j, k, dot;
SSL *con;
@@ -3001,7 +3001,7 @@
/* Set width for a select call if needed */
width = s + 1;
- buf = app_malloc(bufsize, "server www buffer");
+ p = buf = app_malloc(bufsize, "server www buffer");
io = BIO_new(BIO_f_buffer());
ssl_bio = BIO_new(BIO_f_ssl());
if ((io == NULL) || (ssl_bio == NULL))
@@ -3093,15 +3093,14 @@
}
/* else we have data */
- if (((www == 1) && (strncmp("GET ", buf, 4) == 0)) ||
- ((www == 2) && (strncmp("GET /stats ", buf, 11) == 0))) {
- char *p;
+ if ((www == 1 && HAS_PREFIX(buf, "GET "))
+ || (www == 2 && HAS_PREFIX(buf, "GET /stats "))) {
X509 *peer = NULL;
STACK_OF(SSL_CIPHER) *sk;
static const char *space = " ";
- if (www == 1 && strncmp("GET /reneg", buf, 10) == 0) {
- if (strncmp("GET /renegcert", buf, 14) == 0)
+ if (www == 1 && HAS_PREFIX(buf, "GET /reneg")) {
+ if (HAS_PREFIX(buf, "GET /renegcert"))
SSL_set_verify(con,
SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE,
NULL);
@@ -3142,6 +3141,7 @@
BIO_puts(io, "\n");
for (i = 0; i < local_argc; i++) {
const char *myp;
+
for (myp = local_argv[i]; *myp; myp++)
switch (*myp) {
case '<':
@@ -3221,16 +3221,12 @@
}
BIO_puts(io, "</pre></BODY></HTML>\r\n\r\n");
break;
- } else if ((www == 2 || www == 3)
- && (strncmp("GET /", buf, 5) == 0)) {
+ } else if ((www == 2 || www == 3) && HAS_PREFIX(p, "GET /")) {
BIO *file;
- char *p, *e;
+ char *e;
static const char *text =
"HTTP/1.0 200 ok\r\nContent-type: text/plain\r\n\r\n";
- /* skip the '/' */
- p = &(buf[5]);
-
dot = 1;
for (e = p; *e != '\0'; e++) {
if (e[0] == ' ')
@@ -3523,7 +3519,7 @@
p--;
i--;
}
- if (!s_ign_eof && (i == 5) && (strncmp(buf, "CLOSE", 5) == 0)) {
+ if (!s_ign_eof && i == 5 && HAS_PREFIX(buf, "CLOSE")) {
ret = 1;
BIO_printf(bio_err, "CONNECTION CLOSED\n");
goto end;
diff --git a/apps/speed.c b/apps/speed.c
index ada5592..0ee7347 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -1638,8 +1638,8 @@
if (strcmp(algo, "openssl") == 0) /* just for compatibility */
continue;
#endif
- if (strncmp(algo, "rsa", 3) == 0) {
- if (algo[3] == '\0') {
+ if (HAS_PREFIX(algo, "rsa")) {
+ if (algo[sizeof("rsa") - 1] == '\0') {
memset(rsa_doit, 1, sizeof(rsa_doit));
continue;
}
@@ -1649,8 +1649,8 @@
}
}
#ifndef OPENSSL_NO_DH
- if (strncmp(algo, "ffdh", 4) == 0) {
- if (algo[4] == '\0') {
+ if (HAS_PREFIX(algo, "ffdh")) {
+ if (algo[sizeof("ffdh") - 1] == '\0') {
memset(ffdh_doit, 1, sizeof(ffdh_doit));
continue;
}
@@ -1660,8 +1660,8 @@
}
}
#endif
- if (strncmp(algo, "dsa", 3) == 0) {
- if (algo[3] == '\0') {
+ if (HAS_PREFIX(algo, "dsa")) {
+ if (algo[sizeof("dsa") - 1] == '\0') {
memset(dsa_doit, 1, sizeof(dsa_doit));
continue;
}
@@ -1678,8 +1678,8 @@
doit[D_CBC_128_CML] = doit[D_CBC_192_CML] = doit[D_CBC_256_CML] = 1;
continue;
}
- if (strncmp(algo, "ecdsa", 5) == 0) {
- if (algo[5] == '\0') {
+ if (HAS_PREFIX(algo, "ecdsa")) {
+ if (algo[sizeof("ecdsa") - 1] == '\0') {
memset(ecdsa_doit, 1, sizeof(ecdsa_doit));
continue;
}
@@ -1688,8 +1688,8 @@
continue;
}
}
- if (strncmp(algo, "ecdh", 4) == 0) {
- if (algo[4] == '\0') {
+ if (HAS_PREFIX(algo, "ecdh")) {
+ if (algo[sizeof("ecdh") - 1] == '\0') {
memset(ecdh_doit, 1, sizeof(ecdh_doit));
continue;
}
@@ -3458,20 +3458,19 @@
continue;
}
printf("Got: %s from %d\n", buf, n);
- if (strncmp(buf, "+F:", 3) == 0) {
+ p = buf;
+ if (CHECK_AND_SKIP_PREFIX(p, "+F:")) {
int alg;
int j;
- p = buf + 3;
alg = atoi(sstrsep(&p, sep));
sstrsep(&p, sep);
for (j = 0; j < size_num; ++j)
results[alg][j] += atof(sstrsep(&p, sep));
- } else if (strncmp(buf, "+F2:", 4) == 0) {
+ } else if (CHECK_AND_SKIP_PREFIX(p, "+F2:")) {
int k;
double d;
- p = buf + 4;
k = atoi(sstrsep(&p, sep));
sstrsep(&p, sep);
@@ -3480,11 +3479,10 @@
d = atof(sstrsep(&p, sep));
rsa_results[k][1] += d;
- } else if (strncmp(buf, "+F3:", 4) == 0) {
+ } else if (CHECK_AND_SKIP_PREFIX(p, "+F3:")) {
int k;
double d;
- p = buf + 4;
k = atoi(sstrsep(&p, sep));
sstrsep(&p, sep);
@@ -3493,11 +3491,10 @@
d = atof(sstrsep(&p, sep));
dsa_results[k][1] += d;
- } else if (strncmp(buf, "+F4:", 4) == 0) {
+ } else if (CHECK_AND_SKIP_PREFIX(p, "+F4:")) {
int k;
double d;
- p = buf + 4;
k = atoi(sstrsep(&p, sep));
sstrsep(&p, sep);
@@ -3506,21 +3503,19 @@
d = atof(sstrsep(&p, sep));
ecdsa_results[k][1] += d;
- } else if (strncmp(buf, "+F5:", 4) == 0) {
+ } else if (CHECK_AND_SKIP_PREFIX(p, "+F5:")) {
int k;
double d;
- p = buf + 4;
k = atoi(sstrsep(&p, sep));
sstrsep(&p, sep);
d = atof(sstrsep(&p, sep));
ecdh_results[k][0] += d;
- } else if (strncmp(buf, "+F6:", 4) == 0) {
+ } else if (CHECK_AND_SKIP_PREFIX(p, "+F6:")) {
int k;
double d;
- p = buf + 4;
k = atoi(sstrsep(&p, sep));
sstrsep(&p, sep);
sstrsep(&p, sep);
@@ -3531,11 +3526,10 @@
d = atof(sstrsep(&p, sep));
eddsa_results[k][1] += d;
# ifndef OPENSSL_NO_SM2
- } else if (strncmp(buf, "+F7:", 4) == 0) {
+ } else if (CHECK_AND_SKIP_PREFIX(p, "+F7:")) {
int k;
double d;
- p = buf + 4;
k = atoi(sstrsep(&p, sep));
sstrsep(&p, sep);
sstrsep(&p, sep);
@@ -3547,18 +3541,17 @@
sm2_results[k][1] += d;
# endif /* OPENSSL_NO_SM2 */
# ifndef OPENSSL_NO_DH
- } else if (strncmp(buf, "+F8:", 4) == 0) {
+ } else if (CHECK_AND_SKIP_PREFIX(p, "+F8:")) {
int k;
double d;
- p = buf + 4;
k = atoi(sstrsep(&p, sep));
sstrsep(&p, sep);
d = atof(sstrsep(&p, sep));
ffdh_results[k][0] += d;
# endif /* OPENSSL_NO_DH */
- } else if (strncmp(buf, "+H:", 3) == 0) {
+ } else if (HAS_PREFIX(buf, "+H:")) {
;
} else {
BIO_printf(bio_err, "Unknown type '%s' from child %d\n", buf,
diff --git a/crypto/asn1/a_strnid.c b/crypto/asn1/a_strnid.c
index 9e54db9..2c6cb91 100644
--- a/crypto/asn1/a_strnid.c
+++ b/crypto/asn1/a_strnid.c
@@ -50,10 +50,10 @@
unsigned long mask;
char *end;
- if (strncmp(p, "MASK:", 5) == 0) {
- if (p[5] == '\0')
+ if (CHECK_AND_SKIP_PREFIX(p, "MASK:")) {
+ if (*p == '\0')
return 0;
- mask = strtoul(p + 5, &end, 0);
+ mask = strtoul(p, &end, 0);
if (*end)
return 0;
} else if (strcmp(p, "nombstr") == 0)
diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index ecff2be..bb0dcb2 100644
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -325,13 +325,13 @@
ERR_raise(ERR_LIB_ASN1, ASN1_R_UNKNOWN_FORMAT);
return -1;
}
- if (strncmp(vstart, "ASCII", 5) == 0)
+ if (HAS_PREFIX(vstart, "ASCII"))
arg->format = ASN1_GEN_FORMAT_ASCII;
- else if (strncmp(vstart, "UTF8", 4) == 0)
+ else if (HAS_PREFIX(vstart, "UTF8"))
arg->format = ASN1_GEN_FORMAT_UTF8;
- else if (strncmp(vstart, "HEX", 3) == 0)
+ else if (HAS_PREFIX(vstart, "HEX"))
arg->format = ASN1_GEN_FORMAT_HEX;
- else if (strncmp(vstart, "BITLIST", 7) == 0)
+ else if (HAS_PREFIX(vstart, "BITLIST"))
arg->format = ASN1_GEN_FORMAT_BITLIST;
else {
ERR_raise(ERR_LIB_ASN1, ASN1_R_UNKNOWN_FORMAT);
@@ -765,7 +765,7 @@
int tag;
if (elem == NULL)
return 0;
- if ((len == 3) && (strncmp(elem, "DIR", 3) == 0)) {
+ if (len == 3 && HAS_PREFIX(elem, "DIR")) {
*pmask |= B_ASN1_DIRECTORYSTRING;
return 1;
}
diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index 1b8ac34..a05e485 100644
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c
@@ -972,13 +972,8 @@
if (blen + 2 > linelen)
return 0;
/* Check for part boundary */
- if ((strncmp(line, "--", 2) == 0)
- && strncmp(line + 2, bound, blen) == 0) {
- if (strncmp(line + blen + 2, "--", 2) == 0)
- return 2;
- else
- return 1;
- }
+ if ((CHECK_AND_SKIP_PREFIX(line, "--")) && strncmp(line, bound, blen) == 0)
+ return HAS_PREFIX(line + blen, "--") ? 2 : 1;
return 0;
}
diff --git a/crypto/cmp/cmp_util.c b/crypto/cmp/cmp_util.c
index ed611d6..b8e4558 100644
--- a/crypto/cmp/cmp_util.c
+++ b/crypto/cmp/cmp_util.c
@@ -53,8 +53,7 @@
if (end_level == NULL)
return -1;
- if (strncmp(level, OSSL_CMP_LOG_PREFIX,
- strlen(OSSL_CMP_LOG_PREFIX)) == 0)
+ if (HAS_PREFIX(level, OSSL_CMP_LOG_PREFIX))
level += strlen(OSSL_CMP_LOG_PREFIX);
len = end_level - level;
if (len > max_level_len)
diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c
index c05c3c6..26764da 100644
--- a/crypto/conf/conf_def.c
+++ b/crypto/conf/conf_def.c
@@ -389,8 +389,8 @@
psection = section;
}
p = eat_ws(conf, end);
- if (strncmp(pname, ".pragma", 7) == 0
- && (p != pname + 7 || *p == '=')) {
+ if (CHECK_AND_SKIP_PREFIX(pname, ".pragma")
+ && (p != pname || *p == '=')) {
char *pval;
if (*p == '=') {
@@ -435,8 +435,8 @@
* We *ignore* any unknown pragma.
*/
continue;
- } else if (strncmp(pname, ".include", 8) == 0
- && (p != pname + 8 || *p == '=')) {
+ } else if (CHECK_AND_SKIP_PREFIX(pname, ".include")
+ && (p != pname || *p == '=')) {
char *include = NULL;
BIO *next;
const char *include_dir = ossl_safe_getenv("OPENSSL_CONF_INCLUDE");
diff --git a/crypto/http/http_client.c b/crypto/http/http_client.c
index bb80836..9d66d7b 100644
--- a/crypto/http/http_client.c
+++ b/crypto/http/http_client.c
@@ -23,7 +23,6 @@
#include "internal/sockets.h"
#include "internal/cryptlib.h" /* for ossl_assert() */
-#define HAS_PREFIX(str, prefix) (strncmp(str, prefix, sizeof(prefix) - 1) == 0)
#define HTTP_PREFIX "HTTP/"
#define HTTP_VERSION_PATT "1." /* allow 1.x */
#define HTTP_VERSION_STR_LEN sizeof(HTTP_VERSION_PATT) /* == strlen("1.0") */
@@ -377,10 +376,10 @@
int i, retcode;
char *code, *reason, *end;
- if (!HAS_PREFIX(line, HTTP_PREFIX_VERSION))
+ if (!CHECK_AND_SKIP_PREFIX(line, HTTP_PREFIX_VERSION))
goto err;
/* above HTTP 1.0, connection persistence is the default */
- *found_keep_alive = line[strlen(HTTP_PREFIX_VERSION)] > '0';
+ *found_keep_alive = *line > '0';
/* Skip to first whitespace (past protocol info) */
for (code = line; *code != '\0' && !ossl_isspace(*code); code++)
@@ -1297,15 +1296,15 @@
continue;
/* Check for HTTP/1.x */
- if (!HAS_PREFIX(mbuf, HTTP_PREFIX) != 0) {
+ mbufp = mbuf;
+ if (!HAS_PREFIX(mbufp, HTTP_PREFIX)) {
ERR_raise(ERR_LIB_HTTP, HTTP_R_HEADER_PARSE_ERROR);
BIO_printf(bio_err, "%s: HTTP CONNECT failed, non-HTTP response\n",
prog);
/* Wrong protocol, not even HTTP, so stop reading headers */
goto end;
}
- mbufp = mbuf + strlen(HTTP_PREFIX);
- if (!HAS_PREFIX(mbufp, HTTP_VERSION_PATT) != 0) {
+ if (!HAS_PREFIX(mbufp, HTTP_VERSION_PATT)) {
ERR_raise(ERR_LIB_HTTP, HTTP_R_RECEIVED_WRONG_HTTP_VERSION);
BIO_printf(bio_err,
"%s: HTTP CONNECT failed, bad HTTP version %.*s\n",
diff --git a/crypto/params_from_text.c b/crypto/params_from_text.c
index 50f48fd..889b654 100644
--- a/crypto/params_from_text.c
+++ b/crypto/params_from_text.c
@@ -8,7 +8,7 @@
* https://www.openssl.org/source/license.html
*/
-#include <string.h>
+#include "internal/cryptlib.h" /* for HAS_PREFIX */
#include <openssl/ebcdic.h>
#include <openssl/err.h>
#include <openssl/params.h>
@@ -35,10 +35,7 @@
* ishex is used to translate legacy style string controls in hex format
* to octet string parameters.
*/
- *ishex = strncmp(key, "hex", 3) == 0;
-
- if (*ishex)
- key += 3;
+ *ishex = CHECK_AND_SKIP_PREFIX(key, "hex");
p = *paramdef = OSSL_PARAM_locate_const(paramdefs, key);
if (found != NULL)
diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index 3948021..3d7e2f3 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -484,11 +484,11 @@
* presumably we also parse rfc822-style headers for S/MIME, so a common
* abstraction might well be more generally useful.
*/
+#define PROC_TYPE "Proc-Type:"
+#define ENCRYPTED "ENCRYPTED"
+#define DEK_INFO "DEK-Info:"
int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher)
{
- static const char ProcType[] = "Proc-Type:";
- static const char ENCRYPTED[] = "ENCRYPTED";
- static const char DEKInfo[] = "DEK-Info:";
const EVP_CIPHER *enc = NULL;
int ivlen;
char *dekinfostart, c;
@@ -498,11 +498,10 @@
if ((header == NULL) || (*header == '\0') || (*header == '\n'))
return 1;
- if (strncmp(header, ProcType, sizeof(ProcType)-1) != 0) {
+ if (!CHECK_AND_SKIP_PREFIX(header, PROC_TYPE)) {
ERR_raise(ERR_LIB_PEM, PEM_R_NOT_PROC_TYPE);
return 0;
}
- header += sizeof(ProcType)-1;
header += strspn(header, " \t");
if (*header++ != '4' || *header++ != ',')
@@ -510,12 +509,11 @@
header += strspn(header, " \t");
/* We expect "ENCRYPTED" followed by optional white-space + line break */
- if (strncmp(header, ENCRYPTED, sizeof(ENCRYPTED)-1) != 0 ||
- strspn(header+sizeof(ENCRYPTED)-1, " \t\r\n") == 0) {
+ if (!CHECK_AND_SKIP_PREFIX(header, ENCRYPTED) ||
+ strspn(header, " \t\r\n") == 0) {
ERR_raise(ERR_LIB_PEM, PEM_R_NOT_ENCRYPTED);
return 0;
}
- header += sizeof(ENCRYPTED)-1;
header += strspn(header, " \t\r");
if (*header++ != '\n') {
ERR_raise(ERR_LIB_PEM, PEM_R_SHORT_HEADER);
@@ -526,11 +524,10 @@
* https://tools.ietf.org/html/rfc1421#section-4.6.1.3
* We expect "DEK-Info: algo[,hex-parameters]"
*/
- if (strncmp(header, DEKInfo, sizeof(DEKInfo)-1) != 0) {
+ if (!CHECK_AND_SKIP_PREFIX(header, DEK_INFO)) {
ERR_raise(ERR_LIB_PEM, PEM_R_NOT_DEK_INFO);
return 0;
}
- header += sizeof(DEKInfo)-1;
header += strspn(header, " \t");
/*
@@ -733,12 +730,12 @@
#define LINESIZE 255
/* Note trailing spaces for begin and end. */
-static const char beginstr[] = "-----BEGIN ";
-static const char endstr[] = "-----END ";
-static const char tailstr[] = "-----\n";
-#define BEGINLEN ((int)(sizeof(beginstr) - 1))
-#define ENDLEN ((int)(sizeof(endstr) - 1))
-#define TAILLEN ((int)(sizeof(tailstr) - 1))
+#define BEGINSTR "-----BEGIN "
+#define ENDSTR "-----END "
+#define TAILSTR "-----\n"
+#define BEGINLEN ((int)(sizeof(BEGINSTR) - 1))
+#define ENDLEN ((int)(sizeof(ENDSTR) - 1))
+#define TAILLEN ((int)(sizeof(TAILSTR) - 1))
static int get_name(BIO *bp, char **name, unsigned int flags)
{
char *linebuf;
@@ -769,9 +766,9 @@
first_call = 0;
/* Allow leading empty or non-matching lines. */
- } while (strncmp(linebuf, beginstr, BEGINLEN) != 0
+ } while (!HAS_PREFIX(linebuf, BEGINSTR)
|| len < TAILLEN
- || strncmp(linebuf + len - TAILLEN, tailstr, TAILLEN) != 0);
+ || !HAS_PREFIX(linebuf + len - TAILLEN, TAILSTR));
linebuf[len - TAILLEN] = '\0';
len = len - BEGINLEN - TAILLEN + 1;
*name = pem_malloc(len, flags);
@@ -844,7 +841,7 @@
if (memchr(linebuf, ':', len) != NULL)
got_header = IN_HEADER;
}
- if (!strncmp(linebuf, endstr, ENDLEN) || got_header == IN_HEADER)
+ if (HAS_PREFIX(linebuf, ENDSTR) || got_header == IN_HEADER)
flags_mask &= ~PEM_FLAG_ONLY_B64;
len = sanitize_line(linebuf, len, flags & flags_mask, 0);
@@ -867,11 +864,11 @@
}
/* Check for end of stream (which means there is no header). */
- if (strncmp(linebuf, endstr, ENDLEN) == 0) {
- p = linebuf + ENDLEN;
+ p = linebuf;
+ if (CHECK_AND_SKIP_PREFIX(p, ENDSTR)) {
namelen = strlen(name);
if (strncmp(p, name, namelen) != 0 ||
- strncmp(p + namelen, tailstr, TAILLEN) != 0) {
+ !HAS_PREFIX(p + namelen, TAILSTR)) {
ERR_raise(ERR_LIB_PEM, PEM_R_BAD_END_LINE);
goto err;
}
diff --git a/crypto/punycode.c b/crypto/punycode.c
index 385b4b1..4c534db 100644
--- a/crypto/punycode.c
+++ b/crypto/punycode.c
@@ -8,10 +8,10 @@
*/
#include <stddef.h>
-#include <string.h>
#include <stdio.h>
#include <openssl/e_os2.h>
#include "crypto/punycode.h"
+#include "internal/cryptlib.h" /* for HAS_PREFIX */
static const unsigned int base = 36;
static const unsigned int tmin = 1;
@@ -266,7 +266,7 @@
char *tmpptr = strchr(inptr, '.');
size_t delta = (tmpptr) ? (size_t)(tmpptr - inptr) : strlen(inptr);
- if (strncmp(inptr, "xn--", 4) != 0) {
+ if (!HAS_PREFIX(inptr, "xn--")) {
size += delta + 1;
if (size >= *outlen - 1)
diff --git a/crypto/store/store_lib.c b/crypto/store/store_lib.c
index 833ec8f..42722a2 100644
--- a/crypto/store/store_lib.c
+++ b/crypto/store/store_lib.c
@@ -94,7 +94,7 @@
if ((p = strchr(scheme_copy, ':')) != NULL) {
*p++ = '\0';
if (strcasecmp(scheme_copy, "file") != 0) {
- if (strncmp(p, "//", 2) == 0)
+ if (HAS_PREFIX(p, "//"))
schemes_n--; /* Invalidate the file scheme */
schemes[schemes_n++] = scheme_copy;
}
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;
diff --git a/crypto/x509/v3_cpols.c b/crypto/x509/v3_cpols.c
index 5353a69..65fab71 100644
--- a/crypto/x509/v3_cpols.c
+++ b/crypto/x509/v3_cpols.c
@@ -261,17 +261,17 @@
if (len == -1)
return V_ASN1_VISIBLESTRING;
*tag_len = len;
- if (len == sizeof("UTF8") - 1 && strncmp(tagstr, "UTF8", len) == 0)
+ if (len == sizeof("UTF8") - 1 && HAS_PREFIX(tagstr, "UTF8"))
return V_ASN1_UTF8STRING;
- if (len == sizeof("UTF8String") - 1 && strncmp(tagstr, "UTF8String", len) == 0)
+ if (len == sizeof("UTF8String") - 1 && HAS_PREFIX(tagstr, "UTF8String"))
return V_ASN1_UTF8STRING;
- if (len == sizeof("BMP") - 1 && strncmp(tagstr, "BMP", len) == 0)
+ if (len == sizeof("BMP") - 1 && HAS_PREFIX(tagstr, "BMP"))
return V_ASN1_BMPSTRING;
- if (len == sizeof("BMPSTRING") - 1 && strncmp(tagstr, "BMPSTRING", len) == 0)
+ if (len == sizeof("BMPSTRING") - 1 && HAS_PREFIX(tagstr, "BMPSTRING"))
return V_ASN1_BMPSTRING;
- if (len == sizeof("VISIBLE") - 1 && strncmp(tagstr, "VISIBLE", len) == 0)
+ if (len == sizeof("VISIBLE") - 1 && HAS_PREFIX(tagstr, "VISIBLE"))
return V_ASN1_VISIBLESTRING;
- if (len == sizeof("VISIBLESTRING") - 1 && strncmp(tagstr, "VISIBLESTRING", len) == 0)
+ if (len == sizeof("VISIBLESTRING") - 1 && HAS_PREFIX(tagstr, "VISIBLESTRING"))
return V_ASN1_VISIBLESTRING;
*tag_len = 0;
return V_ASN1_VISIBLESTRING;
diff --git a/crypto/x509/v3_crld.c b/crypto/x509/v3_crld.c
index bc755f5..b831f77 100644
--- a/crypto/x509/v3_crld.c
+++ b/crypto/x509/v3_crld.c
@@ -70,7 +70,7 @@
STACK_OF(GENERAL_NAME) *fnm = NULL;
STACK_OF(X509_NAME_ENTRY) *rnm = NULL;
- if (strncmp(cnf->name, "fullname", 9) == 0) {
+ if (HAS_PREFIX(cnf->name, "fullname")) {
fnm = gnames_from_sectname(ctx, cnf->value);
if (!fnm)
goto err;
diff --git a/crypto/x509/v3_ncons.c b/crypto/x509/v3_ncons.c
index c9e66a0..7ffb88c 100644
--- a/crypto/x509/v3_ncons.c
+++ b/crypto/x509/v3_ncons.c
@@ -138,10 +138,10 @@
goto memerr;
for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
val = sk_CONF_VALUE_value(nval, i);
- if (strncmp(val->name, "permitted", 9) == 0 && val->name[9]) {
+ if (HAS_PREFIX(val->name, "permitted") && val->name[9]) {
ptree = &ncons->permittedSubtrees;
tval.name = val->name + 10;
- } else if (strncmp(val->name, "excluded", 8) == 0 && val->name[8]) {
+ } else if (HAS_PREFIX(val->name, "excluded") && val->name[8]) {
ptree = &ncons->excludedSubtrees;
tval.name = val->name + 9;
} else {
diff --git a/crypto/x509/v3_pci.c b/crypto/x509/v3_pci.c
index a931e01..79fe76d 100644
--- a/crypto/x509/v3_pci.c
+++ b/crypto/x509/v3_pci.c
@@ -112,6 +112,7 @@
return 0;
}
} else if (strcmp(val->name, "policy") == 0) {
+ char *valp = val->value;
unsigned char *tmp_data = NULL;
long val_len;
@@ -124,9 +125,9 @@
}
free_policy = 1;
}
- if (strncmp(val->value, "hex:", 4) == 0) {
+ if (CHECK_AND_SKIP_PREFIX(valp, "hex:")) {
unsigned char *tmp_data2 =
- OPENSSL_hexstr2buf(val->value + 4, &val_len);
+ OPENSSL_hexstr2buf(valp, &val_len);
if (!tmp_data2) {
X509V3_conf_err(val);
@@ -155,10 +156,10 @@
goto err;
}
OPENSSL_free(tmp_data2);
- } else if (strncmp(val->value, "file:", 5) == 0) {
+ } else if (CHECK_AND_SKIP_PREFIX(valp, "file:")) {
unsigned char buf[2048];
int n;
- BIO *b = BIO_new_file(val->value + 5, "r");
+ BIO *b = BIO_new_file(valp, "r");
if (!b) {
ERR_raise(ERR_LIB_X509V3, ERR_R_BIO_LIB);
X509V3_conf_err(val);
@@ -194,8 +195,8 @@
X509V3_conf_err(val);
goto err;
}
- } else if (strncmp(val->value, "text:", 5) == 0) {
- val_len = strlen(val->value + 5);
+ } else if (CHECK_AND_SKIP_PREFIX(valp, "text:")) {
+ val_len = strlen(valp);
tmp_data = OPENSSL_realloc((*policy)->data,
(*policy)->length + val_len + 1);
if (tmp_data) {
diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h
index 1291299..1b70063 100644
--- a/include/internal/cryptlib.h
+++ b/include/internal/cryptlib.h
@@ -45,6 +45,12 @@
#endif
+/* Check if pre, which must be a string literal, is a prefix of str */
+# define HAS_PREFIX(str, pre) (strncmp(str, pre "", sizeof(pre) - 1) == 0)
+/* As before, and if check succeeds, advance the str ptr past the prefix */
+# define CHECK_AND_SKIP_PREFIX(str, pre) \
+ (HAS_PREFIX(str, pre) ? ((str) += sizeof(pre) - 1, 1) : 0)
+
/*
* Use this inside a union with the field that needs to be aligned to a
* reasonable boundary for the platform. The most pessimistic alignment
diff --git a/providers/implementations/storemgmt/file_store.c b/providers/implementations/storemgmt/file_store.c
index 34cb70f..1059c12 100644
--- a/providers/implementations/storemgmt/file_store.c
+++ b/providers/implementations/storemgmt/file_store.c
@@ -223,13 +223,11 @@
if (strncasecmp(uri, "file:", 5) == 0) {
const char *p = &uri[5];
- if (strncmp(&uri[5], "//", 2) == 0) {
+ if (CHECK_AND_SKIP_PREFIX(p, "//")) {
path_data_n--; /* Invalidate using the full URI */
- if (strncasecmp(&uri[7], "localhost/", 10) == 0) {
- p = &uri[16];
- } else if (uri[7] == '/') {
- p = &uri[7];
- } else {
+ if (strncasecmp(p, "localhost/", 10) == 0) {
+ p += sizeof("localhost") - 1;
+ } else if (*p != '/') {
ERR_clear_last_mark();
ERR_raise(ERR_LIB_PROV, PROV_R_URI_AUTHORITY_UNSUPPORTED);
return NULL;
diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c
index c713f23..55b5e99 100644
--- a/ssl/record/ssl3_record.c
+++ b/ssl/record/ssl3_record.c
@@ -338,13 +338,13 @@
/* Go back to start of packet, look at the five bytes
* that we have. */
p = RECORD_LAYER_get_packet(&s->rlayer);
- if (strncmp((char *)p, "GET ", 4) == 0 ||
- strncmp((char *)p, "POST ", 5) == 0 ||
- strncmp((char *)p, "HEAD ", 5) == 0 ||
- strncmp((char *)p, "PUT ", 4) == 0) {
+ if (HAS_PREFIX((char *)p, "GET ") ||
+ HAS_PREFIX((char *)p, "POST ") ||
+ HAS_PREFIX((char *)p, "HEAD ") ||
+ HAS_PREFIX((char *)p, "PUT ")) {
SSLfatal(s, SSL_AD_NO_ALERT, SSL_R_HTTP_REQUEST);
return -1;
- } else if (strncmp((char *)p, "CONNE", 5) == 0) {
+ } else if (HAS_PREFIX((char *)p, "CONNE")) {
SSLfatal(s, SSL_AD_NO_ALERT,
SSL_R_HTTPS_PROXY_REQUEST);
return -1;
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index c396f69..e38e1c2 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -1216,10 +1216,10 @@
*/
if (rule == CIPHER_SPECIAL) { /* special command */
ok = 0;
- if ((buflen == 8) && strncmp(buf, "STRENGTH", 8) == 0) {
+ if ((buflen == 8) && HAS_PREFIX(buf, "STRENGTH")) {
ok = ssl_cipher_strength_sort(head_p, tail_p);
- } else if (buflen == 10 && strncmp(buf, "SECLEVEL=", 9) == 0) {
- int level = buf[9] - '0';
+ } else if (buflen == 10 && CHECK_AND_SKIP_PREFIX(buf, "SECLEVEL=")) {
+ int level = *buf - '0';
if (level < 0 || level > 5) {
ERR_raise(ERR_LIB_SSL, SSL_R_INVALID_COMMAND);
} else {
@@ -1259,14 +1259,14 @@
const char **prule_str)
{
unsigned int suiteb_flags = 0, suiteb_comb2 = 0;
- if (strncmp(*prule_str, "SUITEB128ONLY", 13) == 0) {
+ if (HAS_PREFIX(*prule_str, "SUITEB128ONLY")) {
suiteb_flags = SSL_CERT_FLAG_SUITEB_128_LOS_ONLY;
- } else if (strncmp(*prule_str, "SUITEB128C2", 11) == 0) {
+ } else if (HAS_PREFIX(*prule_str, "SUITEB128C2")) {
suiteb_comb2 = 1;
suiteb_flags = SSL_CERT_FLAG_SUITEB_128_LOS;
- } else if (strncmp(*prule_str, "SUITEB128", 9) == 0) {
+ } else if (HAS_PREFIX(*prule_str, "SUITEB128")) {
suiteb_flags = SSL_CERT_FLAG_SUITEB_128_LOS;
- } else if (strncmp(*prule_str, "SUITEB192", 9) == 0) {
+ } else if (HAS_PREFIX(*prule_str, "SUITEB192")) {
suiteb_flags = SSL_CERT_FLAG_SUITEB_192_LOS;
}
@@ -1601,7 +1601,7 @@
*/
ok = 1;
rule_p = rule_str;
- if (strncmp(rule_str, "DEFAULT", 7) == 0) {
+ if (HAS_PREFIX(rule_str, "DEFAULT")) {
ok = ssl_cipher_process_rulestr(OSSL_default_cipher_list(),
&head, &tail, ca_list, c);
rule_p += 7;
diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h
index ce93049..6835bfe 100644
--- a/ssl/ssl_local.h
+++ b/ssl/ssl_local.h
@@ -15,8 +15,8 @@
# include "e_os.h" /* struct timeval for DTLS */
# include <stdlib.h>
# include <time.h>
-# include <string.h>
# include <errno.h>
+# include "internal/cryptlib.h" /* for HAS_PREFIX */
# include <openssl/buffer.h>
# include <openssl/comp.h>
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index cf410d6..5509389 100644
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -25,6 +25,9 @@
| SSL_EXT_TLS1_2_SERVER_HELLO \
| SSL_EXT_IGNORE_ON_RESUMPTION)
+#define NAME_PREFIX1 "SERVERINFO FOR "
+#define NAME_PREFIX2 "SERVERINFOV2 FOR "
+
int SSL_use_certificate(SSL *ssl, X509 *x)
{
int rv;
@@ -760,8 +763,6 @@
long extension_length = 0;
char *name = NULL;
char *header = NULL;
- static const char namePrefix1[] = "SERVERINFO FOR ";
- static const char namePrefix2[] = "SERVERINFOV2 FOR ";
unsigned int name_len;
int ret = 0;
BIO *bin = NULL;
@@ -798,18 +799,18 @@
}
/* Check that PEM name starts with "BEGIN SERVERINFO FOR " */
name_len = strlen(name);
- if (name_len < sizeof(namePrefix1) - 1) {
+ if (name_len < sizeof(NAME_PREFIX1) - 1) {
ERR_raise(ERR_LIB_SSL, SSL_R_PEM_NAME_TOO_SHORT);
goto end;
}
- if (strncmp(name, namePrefix1, sizeof(namePrefix1) - 1) == 0) {
+ if (HAS_PREFIX(name, NAME_PREFIX1)) {
version = SSL_SERVERINFOV1;
} else {
- if (name_len < sizeof(namePrefix2) - 1) {
+ if (name_len < sizeof(NAME_PREFIX2) - 1) {
ERR_raise(ERR_LIB_SSL, SSL_R_PEM_NAME_TOO_SHORT);
goto end;
}
- if (strncmp(name, namePrefix2, sizeof(namePrefix2) - 1) != 0) {
+ if (!HAS_PREFIX(name, NAME_PREFIX2)) {
ERR_raise(ERR_LIB_SSL, SSL_R_PEM_NAME_BAD_PREFIX);
goto end;
}
diff --git a/test/dtls_mtu_test.c b/test/dtls_mtu_test.c
index 612b76a..b3ea3cf 100644
--- a/test/dtls_mtu_test.c
+++ b/test/dtls_mtu_test.c
@@ -168,7 +168,7 @@
const char *cipher_name = SSL_CIPHER_get_name(cipher);
/* As noted above, only one test for each enc/mac variant. */
- if (strncmp(cipher_name, "PSK-", 4) != 0)
+ if (!HAS_PREFIX(cipher_name, "PSK-"))
continue;
if (!TEST_int_gt(ret = mtu_test(ctx, cipher_name, 0), 0))
diff --git a/test/evp_test.c b/test/evp_test.c
index 819371c..71a5442 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -2382,33 +2382,27 @@
if (n > rdata->n)
rdata->n = n;
item = rdata->data + n;
- if (strncmp(keyword, "Entropy.", sizeof("Entropy")) == 0)
+ if (HAS_PREFIX(keyword, "Entropy."))
return parse_bin(value, &item->entropy, &item->entropy_len);
- if (strncmp(keyword, "ReseedEntropy.", sizeof("ReseedEntropy")) == 0)
+ if (HAS_PREFIX(keyword, "ReseedEntropy."))
return parse_bin(value, &item->reseed_entropy,
&item->reseed_entropy_len);
- if (strncmp(keyword, "Nonce.", sizeof("Nonce")) == 0)
+ if (HAS_PREFIX(keyword, "Nonce."))
return parse_bin(value, &item->nonce, &item->nonce_len);
- if (strncmp(keyword, "PersonalisationString.",
- sizeof("PersonalisationString")) == 0)
+ if (HAS_PREFIX(keyword, "PersonalisationString."))
return parse_bin(value, &item->pers, &item->pers_len);
- if (strncmp(keyword, "ReseedAdditionalInput.",
- sizeof("ReseedAdditionalInput")) == 0)
+ if (HAS_PREFIX(keyword, "ReseedAdditionalInput."))
return parse_bin(value, &item->reseed_addin,
&item->reseed_addin_len);
- if (strncmp(keyword, "AdditionalInputA.",
- sizeof("AdditionalInputA")) == 0)
+ if (HAS_PREFIX(keyword, "AdditionalInputA."))
return parse_bin(value, &item->addinA, &item->addinA_len);
- if (strncmp(keyword, "AdditionalInputB.",
- sizeof("AdditionalInputB")) == 0)
+ if (HAS_PREFIX(keyword, "AdditionalInputB."))
return parse_bin(value, &item->addinB, &item->addinB_len);
- if (strncmp(keyword, "EntropyPredictionResistanceA.",
- sizeof("EntropyPredictionResistanceA")) == 0)
+ if (HAS_PREFIX(keyword, "EntropyPredictionResistanceA."))
return parse_bin(value, &item->pr_entropyA, &item->pr_entropyA_len);
- if (strncmp(keyword, "EntropyPredictionResistanceB.",
- sizeof("EntropyPredictionResistanceB")) == 0)
+ if (HAS_PREFIX(keyword, "EntropyPredictionResistanceB."))
return parse_bin(value, &item->pr_entropyB, &item->pr_entropyB_len);
- if (strncmp(keyword, "Output.", sizeof("Output")) == 0)
+ if (HAS_PREFIX(keyword, "Output."))
return parse_bin(value, &item->output, &item->output_len);
} else {
if (strcmp(keyword, "Cipher") == 0)
@@ -2656,7 +2650,7 @@
if (strcmp(keyword, "Output") == 0)
return parse_bin(value, &kdata->output, &kdata->output_len);
- if (strncmp(keyword, "Ctrl", 4) == 0)
+ if (HAS_PREFIX(keyword, "Ctrl"))
return kdf_test_ctrl(t, kdata->ctx, value);
return 0;
}
@@ -2756,7 +2750,7 @@
if (strcmp(keyword, "Output") == 0)
return parse_bin(value, &kdata->output, &kdata->output_len);
- if (strncmp(keyword, "Ctrl", 4) == 0)
+ if (HAS_PREFIX(keyword, "Ctrl"))
return pkey_test_ctrl(t, kdata->ctx, value);
return 0;
}
diff --git a/test/helpers/handshake.c b/test/helpers/handshake.c
index 780a71b..7171f90 100644
--- a/test/helpers/handshake.c
+++ b/test/helpers/handshake.c
@@ -174,7 +174,7 @@
remaining = len;
servername = (const char *)p;
- if (len == strlen("server2") && strncmp(servername, "server2", len) == 0) {
+ if (len == strlen("server2") && HAS_PREFIX(servername, "server2")) {
SSL_CTX *new_ctx = arg;
SSL_set_SSL_CTX(s, new_ctx);
/*
@@ -188,7 +188,7 @@
ex_data->servername = SSL_TEST_SERVERNAME_SERVER2;
return 1;
} else if (len == strlen("server1") &&
- strncmp(servername, "server1", len) == 0) {
+ HAS_PREFIX(servername, "server1")) {
ex_data->servername = SSL_TEST_SERVERNAME_SERVER1;
return 1;
} else if (ignore) {
diff --git a/test/http_test.c b/test/http_test.c
index edf995e..d684c5e 100644
--- a/test/http_test.c
+++ b/test/http_test.c
@@ -41,15 +41,12 @@
const char *req, *path;
long count = BIO_get_mem_data(in, (unsigned char **)&req);
const char *hdr = (char *)req;
- int is_get = count >= 4 && strncmp(hdr, "GET ", 4) == 0;
int len;
+ int is_get = count >= 4 && CHECK_AND_SKIP_PREFIX(hdr, "GET ");
/* first line should contain "(GET|POST) <path> HTTP/1.x" */
- if (is_get)
- hdr += 4;
- else if (TEST_true(count >= 5 && strncmp(hdr, "POST ", 5) == 0))
- hdr += 5;
- else
+ if (!is_get
+ && !(TEST_true(count >= 5 && CHECK_AND_SKIP_PREFIX(hdr, "POST "))))
return 0;
path = hdr;
@@ -69,7 +66,7 @@
if (count < 0 || out == NULL)
return 0;
- if (strncmp(path, RPATH, strlen(RPATH)) != 0) {
+ if (!HAS_PREFIX(path, RPATH)) {
if (!is_get)
return 0;
return BIO_printf(out, "HTTP/1.%c 301 Moved Permanently\r\n"
@@ -94,10 +91,9 @@
return BIO_puts(out, txt);
return ASN1_item_i2d_bio(it, out, rsp);
} else {
- len = strlen("Connection: ");
- if (strncmp(hdr, "Connection: ", len) == 0) {
+ if (CHECK_AND_SKIP_PREFIX(hdr, "Connection: ")) {
/* skip req Connection header */
- hdr = strstr(hdr + len, "\r\n");
+ hdr = strstr(hdr, "\r\n");
if (hdr == NULL)
return 0;
hdr += 2;
diff --git a/test/ssl_old_test.c b/test/ssl_old_test.c
index adeb010..e7ac6df 100644
--- a/test/ssl_old_test.c
+++ b/test/ssl_old_test.c
@@ -1009,7 +1009,7 @@
dtls12 = 1;
} else if (strcmp(*argv, "-dtls") == 0) {
dtls = 1;
- } else if (strncmp(*argv, "-num", 4) == 0) {
+ } else if (HAS_PREFIX(*argv, "-num")) {
if (--argc < 1)
goto bad;
number = atoi(*(++argv));
diff --git a/test/testutil.h b/test/testutil.h
index c28df70..d60f002 100644
--- a/test/testutil.h
+++ b/test/testutil.h
@@ -11,6 +11,7 @@
# define OSSL_TESTUTIL_H
# include <stdarg.h>
+# include "internal/cryptlib.h" /* for HAS_PREFIX */
# include <openssl/provider.h>
# include <openssl/err.h>
diff --git a/test/testutil/stanza.c b/test/testutil/stanza.c
index ba62f84..a3f833a 100644
--- a/test/testutil/stanza.c
+++ b/test/testutil/stanza.c
@@ -54,7 +54,7 @@
s->curr++;
if (!TEST_int_gt(BIO_puts(s->key, tmpbuf), 0))
return 0;
- if (strncmp(tmpbuf, "-----END", 8) == 0)
+ if (HAS_PREFIX(tmpbuf, "-----END"))
return 1;
}
TEST_error("Can't find key end");
