domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

px5g-wolfssl: replace unnecessary strncmp()

Browse Source 
Replace some of the calls to strncmp() with strcmp().

Signed-off-by: Jian Huang <JyanHw@outlook.com>
This commit is contained in:
Jian Huang
2022-09-01 14:05:47 +00:00
committed by Hauke Mehrtens
parent 675cf75578
commit 7b1740e208
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
package/utils/px5g-wolfssl/px5g-wolfssl.c
View File

@@ -142,42 +142,42 @@ int selfsigned(WC_RNG *rng, char **arg) {
newCert.isCA = 0; newCert.isCA = 0;
while (*arg && **arg == '-') { while (*arg && **arg == '-') {
if (!strncmp(*arg, "-der", 4)) { if (!strcmp(*arg, "-der")) {
pem = false; pem = false;
} else if (!strncmp(*arg, "-newkey", 6) && arg[1]) { } else if (!strcmp(*arg, "-newkey") && arg[1]) {
if (!strncmp(arg[1], "rsa:", 4)) { if (!strncmp(arg[1], "rsa:", 4)) {
type = RSA_KEY_TYPE; type = RSA_KEY_TYPE;
keySz = (unsigned int)atoi(arg[1] + 4); keySz = atoi(arg[1] + 4);
} else if (!strncmp(arg[1], "ec", 2)) { } else if (!strcmp(arg[1], "ec")) {
type = EC_KEY_TYPE; type = EC_KEY_TYPE;
} else { } else {
fprintf(stderr, "error: invalid algorithm\n"); fprintf(stderr, "error: invalid algorithm\n");
return 1; return 1;
} }
arg++; arg++;
} else if (!strncmp(*arg, "-days", 5) && arg[1]) { } else if (!strcmp(*arg, "-days") && arg[1]) {
days = (unsigned int)atoi(arg[1]); days = (unsigned int)atoi(arg[1]);
arg++; arg++;
} else if (!strncmp(*arg, "-pkeyopt", 8) && arg[1]) { } else if (!strcmp(*arg, "-pkeyopt") && arg[1]) {
if (strncmp(arg[1], "ec_paramgen_curve:", 18)) { if (strncmp(arg[1], "ec_paramgen_curve:", 18)) {
fprintf(stderr, "error: invalid pkey option: %s\n", arg[1]); fprintf(stderr, "error: invalid pkey option: %s\n", arg[1]);
return 1; return 1;
} }
if (!strncmp(arg[1] + 18, "P-256:", 5)) { if (!strcmp(arg[1] + 18, "P-256")) {
curve = ECC_SECP256R1; curve = ECC_SECP256R1;
} else if (!strncmp(arg[1] + 18, "P-384:", 5)) { } else if (!strcmp(arg[1] + 18, "P-384")) {
curve = ECC_SECP384R1; curve = ECC_SECP384R1;
} else if (!strncmp(arg[1] + 18, "P-521:", 5)) { } else if (!strcmp(arg[1] + 18, "P-521")) {
curve = ECC_SECP521R1; curve = ECC_SECP521R1;
} else { } else {
fprintf(stderr, "error: invalid curve name: %s\n", arg[1] + 18); fprintf(stderr, "error: invalid curve name: %s\n", arg[1] + 18);
return 1; return 1;
} }
arg++; arg++;
} else if (!strncmp(*arg, "-keyout", 7) && arg[1]) { } else if (!strcmp(*arg, "-keyout") && arg[1]) {
keypath = arg[1]; keypath = arg[1];
arg++; arg++;
} else if (!strncmp(*arg, "-out", 4) && arg[1]) { } else if (!strcmp(*arg, "-out") && arg[1]) {
certpath = arg[1]; certpath = arg[1];
arg++; arg++;
} else if (!strcmp(*arg, "-subj") && arg[1]) { } else if (!strcmp(*arg, "-subj") && arg[1]) {
@@ -306,25 +306,25 @@ int dokey(WC_RNG *rng, int type, char **arg) {
bool pem = true; bool pem = true;
while (*arg && **arg == '-') { while (*arg && **arg == '-') {
if (!strncmp(*arg, "-out", 4) && arg[1]) { if (!strcmp(*arg, "-out") && arg[1]) {
path = arg[1]; path = arg[1];
arg++; arg++;
} else if (!strncmp(*arg, "-3", 2)) { } else if (!strcmp(*arg, "-3")) {
exp = 3; exp = 3;
} else if (!strncmp(*arg, "-der", 4)) { } else if (!strcmp(*arg, "-der")) {
pem = false; pem = false;
} }
arg++; arg++;
} }
if (*arg && type == RSA_KEY_TYPE) { if (*arg && type == RSA_KEY_TYPE) {
keySz = (unsigned int)atoi(*arg); keySz = atoi(*arg);
} else if (*arg) { } else if (*arg) {
if (!strncmp(*arg, "P-256", 5)) { if (!strcmp(*arg, "P-256")) {
curve = ECC_SECP256R1; curve = ECC_SECP256R1;
} else if (!strncmp(*arg, "P-384", 5)) { } else if (!strcmp(*arg, "P-384")) {
curve = ECC_SECP384R1; curve = ECC_SECP384R1;
} else if (!strncmp(*arg, "P-521", 5)) { } else if (!strcmp(*arg, "P-521")) {
curve = ECC_SECP521R1; curve = ECC_SECP521R1;
} else { } else {
fprintf(stderr, "Invalid Curve Name: %s\n", *arg); fprintf(stderr, "Invalid Curve Name: %s\n", *arg);
@@ -356,13 +356,13 @@ int main(int argc, char *argv[]) {
} }
if (argv[1]) { if (argv[1]) {
if (!strncmp(argv[1], "eckey", 5)) if (!strcmp(argv[1], "eckey"))
return dokey(&rng, EC_KEY_TYPE, argv + 2); return dokey(&rng, EC_KEY_TYPE, argv + 2);
if (!strncmp(argv[1], "rsakey", 5)) if (!strcmp(argv[1], "rsakey"))
return dokey(&rng, RSA_KEY_TYPE, argv + 2); return dokey(&rng, RSA_KEY_TYPE, argv + 2);
if (!strncmp(argv[1], "selfsigned", 10)) if (!strcmp(argv[1], "selfsigned"))
return selfsigned(&rng, argv + 2); return selfsigned(&rng, argv + 2);
} }