Browse Source

Use "==0" instead of "!strcmp" etc

For the various string-compare routines (strcmp, strcasecmp, str.*cmp)
use "strcmp()==0" instead of "!strcmp()"

Reviewed-by: Tim Hudson <tjh@openssl.org>
master
Rich Salz 7 years ago
committed by Rich Salz
parent
commit
86885c2895
57 changed files with 258 additions and 239 deletions
  1. +11
    -10
      apps/apps.c
  2. +4
    -4
      apps/ca.c
  3. +2
    -2
      apps/ecparam.c
  4. +1
    -1
      apps/pkcs12.c
  5. +3
    -3
      apps/req.c
  6. +2
    -2
      apps/s_cb.c
  7. +1
    -1
      apps/s_server.c
  8. +6
    -6
      apps/speed.c
  9. +3
    -3
      apps/srp.c
  10. +5
    -5
      crypto/asn1/a_strnid.c
  11. +2
    -2
      crypto/asn1/ameth_lib.c
  12. +6
    -6
      crypto/asn1/asn1_gen.c
  13. +4
    -3
      crypto/asn1/asn_mime.c
  14. +6
    -6
      crypto/asn1/asn_mstbl.c
  15. +2
    -1
      crypto/asn1/t_bitst.c
  16. +3
    -3
      crypto/cmac/cm_pmeth.c
  17. +1
    -1
      crypto/conf/conf_mod.c
  18. +5
    -5
      crypto/dh/dh_pmeth.c
  19. +3
    -3
      crypto/dsa/dsa_pmeth.c
  20. +1
    -1
      crypto/ec/ec_curve.c
  21. +6
    -6
      crypto/ec/ec_pmeth.c
  22. +6
    -6
      crypto/engine/eng_cnf.c
  23. +12
    -12
      crypto/engine/eng_fat.c
  24. +2
    -2
      crypto/engine/eng_openssl.c
  25. +4
    -4
      crypto/engine/tb_asnmth.c
  26. +1
    -1
      crypto/evp/evp_cnf.c
  27. +1
    -1
      crypto/evp/pmeth_lib.c
  28. +2
    -2
      crypto/hmac/hm_pmeth.c
  29. +2
    -2
      crypto/ocsp/ocsp_lib.c
  30. +23
    -19
      crypto/pem/pem_lib.c
  31. +1
    -1
      crypto/pem/pem_pkey.c
  32. +14
    -14
      crypto/rsa/rsa_pmeth.c
  33. +1
    -1
      crypto/x509v3/v3_addr.c
  34. +4
    -4
      crypto/x509v3/v3_akey.c
  35. +6
    -6
      crypto/x509v3/v3_alt.c
  36. +1
    -1
      crypto/x509v3/v3_asid.c
  37. +2
    -2
      crypto/x509v3/v3_bcons.c
  38. +2
    -2
      crypto/x509v3/v3_bitst.c
  39. +2
    -2
      crypto/x509v3/v3_conf.c
  40. +5
    -5
      crypto/x509v3/v3_cpols.c
  41. +11
    -10
      crypto/x509v3/v3_crld.c
  42. +5
    -4
      crypto/x509v3/v3_ncons.c
  43. +2
    -2
      crypto/x509v3/v3_pcons.c
  44. +1
    -1
      crypto/x509v3/v3_purp.c
  45. +13
    -6
      crypto/x509v3/v3_utl.c
  46. +1
    -1
      demos/bio/client-arg.c
  47. +1
    -1
      demos/bio/client-conf.c
  48. +1
    -1
      demos/bio/server-arg.c
  49. +1
    -1
      demos/bio/server-conf.c
  50. +6
    -4
      engines/ccgost/gost_pmeth.c
  51. +1
    -1
      engines/ccgost/gostsum.c
  52. +2
    -2
      ssl/d1_srtp.c
  53. +8
    -8
      ssl/ssl_ciph.c
  54. +4
    -4
      ssl/ssl_conf.c
  55. +3
    -3
      ssl/t1_lib.c
  56. +29
    -28
      test/evp_test.c
  57. +1
    -1
      test/ssltest.c

+ 11
- 10
apps/apps.c View File

@ -428,9 +428,10 @@ static char *app_get_pass(char *arg, int keepbio)
char *tmp, tpass[APP_PASS_LEN];
static BIO *pwdbio = NULL;
int i;
if (!strncmp(arg, "pass:", 5))
if (strncmp(arg, "pass:", 5) == 0)
return BUF_strdup(arg + 5);
if (!strncmp(arg, "env:", 4)) {
if (strncmp(arg, "env:", 4) == 0) {
tmp = getenv(arg + 4);
if (!tmp) {
BIO_printf(bio_err, "Can't read environment variable %s\n", arg + 4);
@ -439,7 +440,7 @@ static char *app_get_pass(char *arg, int keepbio)
return BUF_strdup(tmp);
}
if (!keepbio || !pwdbio) {
if (!strncmp(arg, "file:", 5)) {
if (strncmp(arg, "file:", 5) == 0) {
pwdbio = BIO_new_file(arg + 5, "r");
if (!pwdbio) {
BIO_printf(bio_err, "Can't open file %s\n", arg + 5);
@ -454,7 +455,7 @@ static char *app_get_pass(char *arg, int keepbio)
* on real Windows descriptors, such as those obtained
* with CreateFile.
*/
} else if (!strncmp(arg, "fd:", 3)) {
} else if (strncmp(arg, "fd:", 3) == 0) {
BIO *btmp;
i = atoi(arg + 3);
if (i >= 0)
@ -469,7 +470,7 @@ static char *app_get_pass(char *arg, int keepbio)
btmp = BIO_new(BIO_f_buffer());
pwdbio = BIO_push(btmp, pwdbio);
#endif
} else if (!strcmp(arg, "stdin")) {
} else if (strcmp(arg, "stdin") == 0) {
pwdbio = dup_bio_in();
if (!pwdbio) {
BIO_printf(bio_err, "Can't open BIO for stdin\n");
@ -1083,11 +1084,11 @@ int set_name_ex(unsigned long *flags, const char *arg)
int set_ext_copy(int *copy_type, const char *arg)
{
if (!strcasecmp(arg, "none"))
if (strcasecmp(arg, "none") == 0)
*copy_type = EXT_COPY_NONE;
else if (!strcasecmp(arg, "copy"))
else if (strcasecmp(arg, "copy") == 0)
*copy_type = EXT_COPY_ADD;
else if (!strcasecmp(arg, "copyall"))
else if (strcasecmp(arg, "copyall") == 0)
*copy_type = EXT_COPY_ALL;
else
return 0;
@ -1169,7 +1170,7 @@ static int set_table_opts(unsigned long *flags, const char *arg,
c = 1;
for (ptbl = in_tbl; ptbl->name; ptbl++) {
if (!strcasecmp(arg, ptbl->name)) {
if (strcasecmp(arg, ptbl->name) == 0) {
*flags &= ~ptbl->mask;
if (c)
*flags |= ptbl->flag;
@ -2279,7 +2280,7 @@ static const char *get_dp_url(DIST_POINT *dp)
uri = GENERAL_NAME_get0_value(gen, &gtype);
if (gtype == GEN_URI && ASN1_STRING_length(uri) > 6) {
char *uptr = (char *)ASN1_STRING_data(uri);
if (!strncmp(uptr, "http://", 7))
if (strncmp(uptr, "http://", 7) == 0)
return uptr;
}
}


+ 4
- 4
apps/ca.c View File

@ -569,7 +569,7 @@ end_of_options:
f = NCONF_get_string(conf, section, UTF8_IN);
if (!f)
ERR_clear_error();
else if (!strcmp(f, "yes"))
else if (strcmp(f, "yes") == 0)
chtype = MBSTRING_UTF8;
}
@ -841,7 +841,7 @@ end_of_options:
goto end;
}
if (!strcmp(md, "default")) {
if (strcmp(md, "default") == 0) {
int def_nid;
if (EVP_PKEY_get_default_digest_nid(pkey, &def_nid) <= 0) {
BIO_puts(bio_err, "no default digest\n");
@ -2419,7 +2419,7 @@ char *make_revocation_str(int rev_type, char *rev_arg)
case REV_CRL_REASON:
for (i = 0; i < 8; i++) {
if (!strcasecmp(rev_arg, crl_reasons[i])) {
if (strcasecmp(rev_arg, crl_reasons[i]) == 0) {
reason = crl_reasons[i];
break;
}
@ -2637,7 +2637,7 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
}
if (reason_str) {
for (i = 0; i < NUM_REASONS; i++) {
if (!strcasecmp(reason_str, crl_reasons[i])) {
if (strcasecmp(reason_str, crl_reasons[i]) == 0) {
reason_code = i;
break;
}


+ 2
- 2
apps/ecparam.c View File

@ -265,11 +265,11 @@ int ecparam_main(int argc, char **argv)
* are the same as the curves prime192v1 and prime256v1 defined in
* X9.62)
*/
if (!strcmp(curve_name, "secp192r1")) {
if (strcmp(curve_name, "secp192r1") == 0) {
BIO_printf(bio_err, "using curve name prime192v1 "
"instead of secp192r1\n");
nid = NID_X9_62_prime192v1;
} else if (!strcmp(curve_name, "secp256r1")) {
} else if (strcmp(curve_name, "secp256r1") == 0) {
BIO_printf(bio_err, "using curve name prime256v1 "
"instead of secp256r1\n");
nid = NID_X9_62_prime256v1;


+ 1
- 1
apps/pkcs12.c View File

@ -836,7 +836,7 @@ static int set_pbe(int *ppbe, const char *str)
{
if (!str)
return 0;
if (!strcmp(str, "NONE")) {
if (strcmp(str, "NONE") == 0) {
*ppbe = -1;
return 1;
}


+ 3
- 3
apps/req.c View File

@ -477,7 +477,7 @@ int req_main(int argc, char **argv)
p = NCONF_get_string(req_conf, SECTION, UTF8_IN);
if (!p)
ERR_clear_error();
else if (!strcmp(p, "yes"))
else if (strcmp(p, "yes") == 0)
chtype = MBSTRING_UTF8;
}
@ -904,7 +904,7 @@ static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, char *subj, int multirdn,
tmp = NCONF_get_string(req_conf, SECTION, PROMPT);
if (tmp == NULL)
ERR_clear_error();
if ((tmp != NULL) && !strcmp(tmp, "no"))
if ((tmp != NULL) && strcmp(tmp, "no") == 0)
no_prompt = 1;
dn_sect = NCONF_get_string(req_conf, SECTION, DISTINGUISHED_NAME);
@ -1373,7 +1373,7 @@ static EVP_PKEY_CTX *set_keygen_ctx(const char *gstr,
*pkey_type = EVP_PKEY_RSA;
keylen = atol(gstr);
*pkeylen = keylen;
} else if (!strncmp(gstr, "param:", 6))
} else if (strncmp(gstr, "param:", 6) == 0)
paramfile = gstr + 6;
else {
const char *p = strchr(gstr, ':');


+ 2
- 2
apps/s_cb.c View File

@ -1392,10 +1392,10 @@ int config_ctx(SSL_CONF_CTX *cctx, STACK_OF(OPENSSL_STRING) *str,
const char *flag = sk_OPENSSL_STRING_value(str, i);
const char *arg = sk_OPENSSL_STRING_value(str, i + 1);
/* If no_ecdhe or named curve already specified don't need a default. */
if (!no_ecdhe && !strcmp(flag, "-named_curve"))
if (!no_ecdhe && strcmp(flag, "-named_curve") == 0)
no_ecdhe = 1;
#ifndef OPENSSL_NO_JPAKE
if (!no_jpake && !strcmp(flag, "-cipher")) {
if (!no_jpake && (strcmp(flag, "-cipher") == 0)) {
BIO_puts(bio_err, "JPAKE sets cipher to PSK\n");
return 0;
}


+ 1
- 1
apps/s_server.c View File

@ -3025,7 +3025,7 @@ static int rev_body(char *hostname, int s, int stype, unsigned char *context)
p--;
i--;
}
if (!s_ign_eof && i == 5 && !strncmp(buf, "CLOSE", 5)) {
if (!s_ign_eof && (i == 5) && (strncmp(buf, "CLOSE", 5) == 0)) {
ret = 1;
BIO_printf(bio_err, "CONNECTION CLOSED\n");
goto end;


+ 6
- 6
apps/speed.c View File

@ -2327,7 +2327,7 @@ static int do_multi(int multi)
continue;
}
printf("Got: %s from %d\n", buf, n);
if (!strncmp(buf, "+F:", 3)) {
if (strncmp(buf, "+F:", 3) == 0) {
int alg;
int j;
@ -2336,7 +2336,7 @@ static int do_multi(int multi)
sstrsep(&p, sep);
for (j = 0; j < SIZE_NUM; ++j)
results[alg][j] += atof(sstrsep(&p, sep));
} else if (!strncmp(buf, "+F2:", 4)) {
} else if (strncmp(buf, "+F2:", 4) == 0) {
int k;
double d;
@ -2357,7 +2357,7 @@ static int do_multi(int multi)
rsa_results[k][1] = d;
}
# ifndef OPENSSL_NO_DSA
else if (!strncmp(buf, "+F3:", 4)) {
else if (strncmp(buf, "+F3:", 4) == 0) {
int k;
double d;
@ -2379,7 +2379,7 @@ static int do_multi(int multi)
}
# endif
# ifndef OPENSSL_NO_EC
else if (!strncmp(buf, "+F4:", 4)) {
else if (strncmp(buf, "+F4:", 4) == 0) {
int k;
double d;
@ -2404,7 +2404,7 @@ static int do_multi(int multi)
# endif
# ifndef OPENSSL_NO_EC
else if (!strncmp(buf, "+F5:", 4)) {
else if (strncmp(buf, "+F5:", 4) == 0) {
int k;
double d;
@ -2421,7 +2421,7 @@ static int do_multi(int multi)
}
# endif
else if (!strncmp(buf, "+H:", 3)) {
else if (strncmp(buf, "+H:", 3) == 0) {
;
} else
fprintf(stderr, "Unknown type '%s' from child %d\n", buf, n);


+ 3
- 3
apps/srp.c View File

@ -88,14 +88,14 @@ static int get_index(CA_DB *db, char *id, char type)
for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++) {
pp = sk_OPENSSL_PSTRING_value(db->db->data, i);
if (pp[DB_srptype][0] == DB_SRP_INDEX
&& !strcmp(id, pp[DB_srpid]))
&& strcmp(id, pp[DB_srpid]) == 0)
return i;
} else
for (i = 0; i < sk_OPENSSL_PSTRING_num(db->db->data); i++) {
pp = sk_OPENSSL_PSTRING_value(db->db->data, i);
if (pp[DB_srptype][0] != DB_SRP_INDEX
&& !strcmp(id, pp[DB_srpid]))
&& strcmp(id, pp[DB_srpid]) == 0)
return i;
}
@ -434,7 +434,7 @@ int srp_main(int argc, char **argv)
if (pp[DB_srptype][0] == DB_SRP_INDEX) {
maxgN = i;
if (gNindex < 0 && gN != NULL && !strcmp(gN, pp[DB_srpid]))
if ((gNindex < 0) && (gN != NULL) && strcmp(gN, pp[DB_srpid]) == 0)
gNindex = i;
print_index(db, i, verbose > 1);


+ 5
- 5
crypto/asn1/a_strnid.c View File

@ -100,19 +100,19 @@ int ASN1_STRING_set_default_mask_asc(const char *p)
{
unsigned long mask;
char *end;
if (!strncmp(p, "MASK:", 5)) {
if (strncmp(p, "MASK:", 5) == 0) {
if (!p[5])
return 0;
mask = strtoul(p + 5, &end, 0);
if (*end)
return 0;
} else if (!strcmp(p, "nombstr"))
} else if (strcmp(p, "nombstr") == 0)
mask = ~((unsigned long)(B_ASN1_BMPSTRING | B_ASN1_UTF8STRING));
else if (!strcmp(p, "pkix"))
else if (strcmp(p, "pkix") == 0)
mask = ~((unsigned long)B_ASN1_T61STRING);
else if (!strcmp(p, "utf8only"))
else if (strcmp(p, "utf8only") == 0)
mask = B_ASN1_UTF8STRING;
else if (!strcmp(p, "default"))
else if (strcmp(p, "default") == 0)
mask = 0xFFFFFFFFL;
else
return 0;


+ 2
- 2
crypto/asn1/ameth_lib.c View File

@ -221,8 +221,8 @@ const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(ENGINE **pe,
ameth = EVP_PKEY_asn1_get0(i);
if (ameth->pkey_flags & ASN1_PKEY_ALIAS)
continue;
if (((int)strlen(ameth->pem_str) == len) &&
!strncasecmp(ameth->pem_str, str, len))
if (((int)strlen(ameth->pem_str) == len)
&& (strncasecmp(ameth->pem_str, str, len) == 0))
return ameth;
}
return NULL;


+ 6
- 6
crypto/asn1/asn1_gen.c View File

@ -375,13 +375,13 @@ static int asn1_cb(const char *elem, int len, void *bitstr)
ASN1err(ASN1_F_ASN1_CB, ASN1_R_UNKNOWN_FORMAT);
return -1;
}
if (!strncmp(vstart, "ASCII", 5))
if (strncmp(vstart, "ASCII", 5) == 0)
arg->format = ASN1_GEN_FORMAT_ASCII;
else if (!strncmp(vstart, "UTF8", 4))
else if (strncmp(vstart, "UTF8", 4) == 0)
arg->format = ASN1_GEN_FORMAT_UTF8;
else if (!strncmp(vstart, "HEX", 3))
else if (strncmp(vstart, "HEX", 3) == 0)
arg->format = ASN1_GEN_FORMAT_HEX;
else if (!strncmp(vstart, "BITLIST", 7))
else if (strncmp(vstart, "BITLIST", 7) == 0)
arg->format = ASN1_GEN_FORMAT_BITLIST;
else {
ASN1err(ASN1_F_ASN1_CB, ASN1_R_UNKNOWN_FORMAT);
@ -621,7 +621,7 @@ static int asn1_str2tag(const char *tagstr, int len)
tntmp = tnst;
for (i = 0; i < OSSL_NELEM(tnst); i++, tntmp++) {
if ((len == tntmp->len) && !strncmp(tntmp->strnam, tagstr, len))
if ((len == tntmp->len) && (strncmp(tntmp->strnam, tagstr, len) == 0))
return tntmp->tag;
}
@ -829,7 +829,7 @@ static int mask_cb(const char *elem, int len, void *arg)
int tag;
if (elem == NULL)
return 0;
if (len == 3 && !strncmp(elem, "DIR", 3)) {
if ((len == 3) && (strncmp(elem, "DIR", 3) == 0)) {
*pmask |= B_ASN1_DIRECTORYSTRING;
return 1;
}


+ 4
- 3
crypto/asn1/asn_mime.c View File

@ -440,7 +440,7 @@ ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it)
/* Handle multipart/signed */
if (!strcmp(hdr->value, "multipart/signed")) {
if (strcmp(hdr->value, "multipart/signed") == 0) {
/* Split into two parts */
prm = mime_param_find(hdr, "boundary");
if (!prm || !prm->param_value) {
@ -971,8 +971,9 @@ static int mime_bound_check(char *line, int linelen, char *bound, int blen)
if (blen + 2 > linelen)
return 0;
/* Check for part boundary */
if (!strncmp(line, "--", 2) && !strncmp(line + 2, bound, blen)) {
if (!strncmp(line + blen + 2, "--", 2))
if ((strncmp(line, "--", 2) == 0)
&& strncmp(line + 2, bound, blen) == 0) {
if (strncmp(line + blen + 2, "--", 2) == 0)
return 2;
else
return 1;


+ 6
- 6
crypto/asn1/asn_mstbl.c View File

@ -118,21 +118,21 @@ static int do_tcreate(char *value, char *name)
goto err;
for (i = 0; i < sk_CONF_VALUE_num(lst); i++) {
cnf = sk_CONF_VALUE_value(lst, i);
if (!strcmp(cnf->name, "min")) {
if (strcmp(cnf->name, "min") == 0) {
tbl_min = strtoul(cnf->value, &eptr, 0);
if (*eptr)
goto err;
} else if (!strcmp(cnf->name, "max")) {
} else if (strcmp(cnf->name, "max") == 0) {
tbl_max = strtoul(cnf->value, &eptr, 0);
if (*eptr)
goto err;
} else if (!strcmp(cnf->name, "mask")) {
} else if (strcmp(cnf->name, "mask") == 0) {
if (!ASN1_str2mask(cnf->value, &tbl_mask) || !tbl_mask)
goto err;
} else if (!strcmp(cnf->name, "flags")) {
if (!strcmp(cnf->value, "nomask"))
} else if (strcmp(cnf->name, "flags") == 0) {
if (strcmp(cnf->value, "nomask") == 0)
tbl_flags = STABLE_NO_MASK;
else if (!strcmp(cnf->value, "none"))
else if (strcmp(cnf->value, "none") == 0)
tbl_flags = STABLE_FLAGS_CLEAR;
else
goto err;


+ 2
- 1
crypto/asn1/t_bitst.c View File

@ -98,7 +98,8 @@ int ASN1_BIT_STRING_num_asc(char *name, BIT_STRING_BITNAME *tbl)
{
BIT_STRING_BITNAME *bnam;
for (bnam = tbl; bnam->lname; bnam++) {
if (!strcmp(bnam->sname, name) || !strcmp(bnam->lname, name))
if ((strcmp(bnam->sname, name) == 0)
|| (strcmp(bnam->lname, name) == 0))
return bnam->bitnum;
}
return -1;


+ 3
- 3
crypto/cmac/cm_pmeth.c View File

@ -157,18 +157,18 @@ static int pkey_cmac_ctrl_str(EVP_PKEY_CTX *ctx,
if (!value) {
return 0;
}
if (!strcmp(type, "key")) {
if (strcmp(type, "key") == 0) {
void *p = (void *)value;
return pkey_cmac_ctrl(ctx, EVP_PKEY_CTRL_SET_MAC_KEY, strlen(p), p);
}
if (!strcmp(type, "cipher")) {
if (strcmp(type, "cipher") == 0) {
const EVP_CIPHER *c;
c = EVP_get_cipherbyname(value);
if (!c)
return 0;
return pkey_cmac_ctrl(ctx, EVP_PKEY_CTRL_CIPHER, -1, (void *)c);
}
if (!strcmp(type, "hexkey")) {
if (strcmp(type, "hexkey") == 0) {
unsigned char *key;
int r;
long keylen;


+ 1
- 1
crypto/conf/conf_mod.c View File

@ -319,7 +319,7 @@ static CONF_MODULE *module_find(char *name)
for (i = 0; i < sk_CONF_MODULE_num(supported_modules); i++) {
tmod = sk_CONF_MODULE_value(supported_modules, i);
if (!strncmp(tmod->name, name, nchar))
if (strncmp(tmod->name, name, nchar) == 0)
return tmod;
}


+ 5
- 5
crypto/dh/dh_pmeth.c View File

@ -259,12 +259,12 @@ static int pkey_dh_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
static int pkey_dh_ctrl_str(EVP_PKEY_CTX *ctx,
const char *type, const char *value)
{
if (!strcmp(type, "dh_paramgen_prime_len")) {
if (strcmp(type, "dh_paramgen_prime_len") == 0) {
int len;
len = atoi(value);
return EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len);
}
if (!strcmp(type, "dh_rfc5114")) {
if (strcmp(type, "dh_rfc5114") == 0) {
DH_PKEY_CTX *dctx = ctx->data;
int len;
len = atoi(value);
@ -273,17 +273,17 @@ static int pkey_dh_ctrl_str(EVP_PKEY_CTX *ctx,
dctx->rfc5114_param = len;
return 1;
}
if (!strcmp(type, "dh_paramgen_generator")) {
if (strcmp(type, "dh_paramgen_generator") == 0) {
int len;
len = atoi(value);
return EVP_PKEY_CTX_set_dh_paramgen_generator(ctx, len);
}
if (!strcmp(type, "dh_paramgen_subprime_len")) {
if (strcmp(type, "dh_paramgen_subprime_len") == 0) {
int len;
len = atoi(value);
return EVP_PKEY_CTX_set_dh_paramgen_subprime_len(ctx, len);
}
if (!strcmp(type, "dh_paramgen_type")) {
if (strcmp(type, "dh_paramgen_type") == 0) {
int typ;
typ = atoi(value);
return EVP_PKEY_CTX_set_dh_paramgen_type(ctx, typ);


+ 3
- 3
crypto/dsa/dsa_pmeth.c View File

@ -218,18 +218,18 @@ static int pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
static int pkey_dsa_ctrl_str(EVP_PKEY_CTX *ctx,
const char *type, const char *value)
{
if (!strcmp(type, "dsa_paramgen_bits")) {
if (strcmp(type, "dsa_paramgen_bits") == 0) {
int nbits;
nbits = atoi(value);
return EVP_PKEY_CTX_set_dsa_paramgen_bits(ctx, nbits);
}
if (!strcmp(type, "dsa_paramgen_q_bits")) {
if (strcmp(type, "dsa_paramgen_q_bits") == 0) {
int qbits = atoi(value);
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DSA, EVP_PKEY_OP_PARAMGEN,
EVP_PKEY_CTRL_DSA_PARAMGEN_Q_BITS, qbits,
NULL);
}
if (!strcmp(type, "dsa_paramgen_md")) {
if (strcmp(type, "dsa_paramgen_md") == 0) {
return EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DSA, EVP_PKEY_OP_PARAMGEN,
EVP_PKEY_CTRL_DSA_PARAMGEN_MD, 0,
(void *)EVP_get_digestbyname(value));


+ 1
- 1
crypto/ec/ec_curve.c View File

@ -3206,7 +3206,7 @@ int EC_curve_nist2nid(const char *name)
{
size_t i;
for (i = 0; i < OSSL_NELEM(nist_curves); i++) {
if (!strcmp(nist_curves[i].name, name))
if (strcmp(nist_curves[i].name, name) == 0)
return nist_curves[i].nid;
}
return NID_undef;


+ 6
- 6
crypto/ec/ec_pmeth.c View File

@ -404,7 +404,7 @@ static int pkey_ec_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
static int pkey_ec_ctrl_str(EVP_PKEY_CTX *ctx,
const char *type, const char *value)
{
if (!strcmp(type, "ec_paramgen_curve")) {
if (strcmp(type, "ec_paramgen_curve") == 0) {
int nid;
nid = EC_curve_nist2nid(value);
if (nid == NID_undef)
@ -416,23 +416,23 @@ static int pkey_ec_ctrl_str(EVP_PKEY_CTX *ctx,
return 0;
}
return EVP_PKEY_CTX_set_ec_paramgen_curve_nid(ctx, nid);
} else if (!strcmp(type, "ec_param_enc")) {
} else if (strcmp(type, "ec_param_enc") == 0) {
int param_enc;
if (!strcmp(value, "explicit"))
if (strcmp(value, "explicit") == 0)
param_enc = 0;
else if (!strcmp(value, "named_curve"))
else if (strcmp(value, "named_curve") == 0)
param_enc = OPENSSL_EC_NAMED_CURVE;
else
return -2;
return EVP_PKEY_CTX_set_ec_param_enc(ctx, param_enc);
} else if (!strcmp(type, "ecdh_kdf_md")) {
} else if (strcmp(type, "ecdh_kdf_md") == 0) {
const EVP_MD *md;
if (!(md = EVP_get_digestbyname(value))) {
ECerr(EC_F_PKEY_EC_CTRL_STR, EC_R_INVALID_DIGEST);
return 0;
}
return EVP_PKEY_CTX_set_ecdh_kdf_md(ctx, md);
} else if (!strcmp(type, "ecdh_cofactor_mode")) {
} else if (strcmp(type, "ecdh_cofactor_mode") == 0) {
int co_mode;
co_mode = atoi(value);
return EVP_PKEY_CTX_set_ecdh_cofactor_mode(ctx, co_mode);


+ 6
- 6
crypto/engine/eng_cnf.c View File

@ -124,12 +124,12 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf)
/* First handle some special pseudo ctrls */
/* Override engine name to use */
if (!strcmp(ctrlname, "engine_id"))
if (strcmp(ctrlname, "engine_id") == 0)
name = ctrlvalue;
else if (!strcmp(ctrlname, "soft_load"))
else if (strcmp(ctrlname, "soft_load") == 0)
soft = 1;
/* Load a dynamic ENGINE */
else if (!strcmp(ctrlname, "dynamic_path")) {
else if (strcmp(ctrlname, "dynamic_path") == 0) {
e = ENGINE_by_id("dynamic");
if (!e)
goto err;
@ -159,9 +159,9 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf)
* Allow "EMPTY" to mean no value: this allows a valid "value" to
* be passed to ctrls of type NO_INPUT
*/
if (!strcmp(ctrlvalue, "EMPTY"))
if (strcmp(ctrlvalue, "EMPTY") == 0)
ctrlvalue = NULL;
if (!strcmp(ctrlname, "init")) {
if (strcmp(ctrlname, "init") == 0) {
if (!NCONF_get_number_e(cnf, value, "init", &do_init))
goto err;
if (do_init == 1) {
@ -172,7 +172,7 @@ static int int_engine_configure(char *name, char *value, const CONF *cnf)
ENGINE_R_INVALID_INIT_VALUE);
goto err;
}
} else if (!strcmp(ctrlname, "default_algorithms")) {
} else if (strcmp(ctrlname, "default_algorithms") == 0) {
if (!ENGINE_set_default_string(e, ctrlvalue))
goto err;
} else if (!ENGINE_ctrl_cmd_string(e, ctrlname, ctrlvalue, 0))


+ 12
- 12
crypto/engine/eng_fat.c View File

@ -103,29 +103,29 @@ static int int_def_cb(const char *alg, int len, void *arg)
unsigned int *pflags = arg;
if (alg == NULL)
return 0;
if (!strncmp(alg, "ALL", len))
if (strncmp(alg, "ALL", len) == 0)
*pflags |= ENGINE_METHOD_ALL;
else if (!strncmp(alg, "RSA", len))
else if (strncmp(alg, "RSA", len) == 0)
*pflags |= ENGINE_METHOD_RSA;
else if (!strncmp(alg, "DSA", len))
else if (strncmp(alg, "DSA", len) == 0)
*pflags |= ENGINE_METHOD_DSA;
else if (!strncmp(alg, "ECDH", len))
else if (strncmp(alg, "ECDH", len) == 0)
*pflags |= ENGINE_METHOD_ECDH;
else if (!strncmp(alg, "ECDSA", len))
else if (strncmp(alg, "ECDSA", len) == 0)
*pflags |= ENGINE_METHOD_ECDSA;
else if (!strncmp(alg, "DH", len))
else if (strncmp(alg, "DH", len) == 0)
*pflags |= ENGINE_METHOD_DH;
else if (!strncmp(alg, "RAND", len))
else if (strncmp(alg, "RAND", len) == 0)
*pflags |= ENGINE_METHOD_RAND;
else if (!strncmp(alg, "CIPHERS", len))
else if (strncmp(alg, "CIPHERS", len) == 0)
*pflags |= ENGINE_METHOD_CIPHERS;
else if (!strncmp(alg, "DIGESTS", len))
else if (strncmp(alg, "DIGESTS", len) == 0)
*pflags |= ENGINE_METHOD_DIGESTS;
else if (!strncmp(alg, "PKEY", len))
else if (strncmp(alg, "PKEY", len) == 0)
*pflags |= ENGINE_METHOD_PKEY_METHS | ENGINE_METHOD_PKEY_ASN1_METHS;
else if (!strncmp(alg, "PKEY_CRYPTO", len))
else if (strncmp(alg, "PKEY_CRYPTO", len) == 0)
*pflags |= ENGINE_METHOD_PKEY_METHS;
else if (!strncmp(alg, "PKEY_ASN1", len))
else if (strncmp(alg, "PKEY_ASN1", len) == 0)
*pflags |= ENGINE_METHOD_PKEY_ASN1_METHS;
else
return 0;


+ 2
- 2
crypto/engine/eng_openssl.c View File

@ -556,11 +556,11 @@ static int ossl_hmac_ctrl_str(EVP_PKEY_CTX *ctx,
if (!value) {
return 0;
}
if (!strcmp(type, "key")) {
if (strcmp(type, "key") == 0) {
void *p = (void *)value;
return ossl_hmac_ctrl(ctx, EVP_PKEY_CTRL_SET_MAC_KEY, -1, p);
}
if (!strcmp(type, "hexkey")) {
if (strcmp(type, "hexkey") == 0) {
unsigned char *key;
int r;
long keylen;


+ 4
- 4
crypto/engine/tb_asnmth.c View File

@ -191,8 +191,8 @@ const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth_str(ENGINE *e,
nidcount = e->pkey_asn1_meths(e, NULL, &nids, 0);
for (i = 0; i < nidcount; i++) {
e->pkey_asn1_meths(e, &ameth, NULL, nids[i]);
if (((int)strlen(ameth->pem_str) == len) &&
!strncasecmp(ameth->pem_str, str, len))
if (((int)strlen(ameth->pem_str) == len)
&& strncasecmp(ameth->pem_str, str, len) == 0)
return ameth;
}
return NULL;
@ -215,8 +215,8 @@ static void look_str_cb(int nid, STACK_OF(ENGINE) *sk, ENGINE *def, void *arg)
ENGINE *e = sk_ENGINE_value(sk, i);
EVP_PKEY_ASN1_METHOD *ameth;
e->pkey_asn1_meths(e, &ameth, NULL, nid);
if (((int)strlen(ameth->pem_str) == lk->len) &&
!strncasecmp(ameth->pem_str, lk->str, lk->len)) {
if (((int)strlen(ameth->pem_str) == lk->len)
&& strncasecmp(ameth->pem_str, lk->str, lk->len) == 0) {
lk->e = e;
lk->ameth = ameth;
return;


+ 1
- 1
crypto/evp/evp_cnf.c View File

@ -81,7 +81,7 @@ static int alg_module_init(CONF_IMODULE *md, const CONF *cnf)
}
for (i = 0; i < sk_CONF_VALUE_num(sktmp); i++) {
oval = sk_CONF_VALUE_value(sktmp, i);
if (!strcmp(oval->name, "fips_mode")) {
if (strcmp(oval->name, "fips_mode") == 0) {
int m;
if (!X509V3_get_value_bool(oval, &m)) {
EVPerr(EVP_F_ALG_MODULE_INIT, EVP_R_INVALID_FIPS_MODE);


+ 1
- 1
crypto/evp/pmeth_lib.c View File

@ -414,7 +414,7 @@ int EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx,
EVPerr(EVP_F_EVP_PKEY_CTX_CTRL_STR, EVP_R_COMMAND_NOT_SUPPORTED);
return -2;
}
if (!strcmp(name, "digest")) {
if (strcmp(name, "digest") == 0) {
const EVP_MD *md;
if (!value || !(md = EVP_get_digestbyname(value))) {
EVPerr(EVP_F_EVP_PKEY_CTX_CTRL_STR, EVP_R_INVALID_DIGEST);


+ 2
- 2
crypto/hmac/hm_pmeth.c View File

@ -206,11 +206,11 @@ static int pkey_hmac_ctrl_str(EVP_PKEY_CTX *ctx,
if (!value) {
return 0;
}
if (!strcmp(type, "key")) {
if (strcmp(type, "key") == 0) {
void *p = (void *)value;
return pkey_hmac_ctrl(ctx, EVP_PKEY_CTRL_SET_MAC_KEY, -1, p);
}
if (!strcmp(type, "hexkey")) {
if (strcmp(type, "hexkey") == 0) {
unsigned char *key;
int r;
long keylen;


+ 2
- 2
crypto/ocsp/ocsp_lib.c View File

@ -196,10 +196,10 @@ int OCSP_parse_url(const char *url, char **phost, char **pport, char **ppath,
*(p++) = '\0';
if (!strcmp(buf, "http")) {
if (strcmp(buf, "http") == 0) {
*pssl = 0;
port = "80";
} else if (!strcmp(buf, "https")) {
} else if (strcmp(buf, "https") == 0) {
*pssl = 1;
port = "443";
} else


+ 23
- 19
crypto/pem/pem_lib.c View File

@ -182,17 +182,17 @@ void *PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x,
static int check_pem(const char *nm, const char *name)
{
/* Normal matching nm and name */
if (!strcmp(nm, name))
if (strcmp(nm, name) == 0)
return 1;
/* Make PEM_STRING_EVP_PKEY match any private key */
if (!strcmp(name, PEM_STRING_EVP_PKEY)) {
if (strcmp(name, PEM_STRING_EVP_PKEY) == 0) {
int slen;
const EVP_PKEY_ASN1_METHOD *ameth;
if (!strcmp(nm, PEM_STRING_PKCS8))
if (strcmp(nm, PEM_STRING_PKCS8) == 0)
return 1;
if (!strcmp(nm, PEM_STRING_PKCS8INF))
if (strcmp(nm, PEM_STRING_PKCS8INF) == 0)
return 1;
slen = pem_check_suffix(nm, "PRIVATE KEY");
if (slen > 0) {
@ -207,7 +207,7 @@ static int check_pem(const char *nm, const char *name)
return 0;
}
if (!strcmp(name, PEM_STRING_PARAMETERS)) {
if (strcmp(name, PEM_STRING_PARAMETERS) == 0) {
int slen;
const EVP_PKEY_ASN1_METHOD *ameth;
slen = pem_check_suffix(nm, "PARAMETERS");
@ -230,41 +230,45 @@ static int check_pem(const char *nm, const char *name)
return 0;
}
/* If reading DH parameters handle X9.42 DH format too */
if (!strcmp(nm, PEM_STRING_DHXPARAMS) &&
!strcmp(name, PEM_STRING_DHPARAMS))
if (strcmp(nm, PEM_STRING_DHXPARAMS) == 0
&& strcmp(name, PEM_STRING_DHPARAMS) == 0)
return 1;
/* Permit older strings */
if (!strcmp(nm, PEM_STRING_X509_OLD) && !strcmp(name, PEM_STRING_X509))
if (strcmp(nm, PEM_STRING_X509_OLD) == 0
&& strcmp(name, PEM_STRING_X509) == 0)
return 1;
if (!strcmp(nm, PEM_STRING_X509_REQ_OLD) &&
!strcmp(name, PEM_STRING_X509_REQ))
if (strcmp(nm, PEM_STRING_X509_REQ_OLD) == 0
&& strcmp(name, PEM_STRING_X509_REQ) == 0)
return 1;
/* Allow normal certs to be read as trusted certs */
if (!strcmp(nm, PEM_STRING_X509) &&
!strcmp(name, PEM_STRING_X509_TRUSTED))
if (strcmp(nm, PEM_STRING_X509) == 0
&& strcmp(name, PEM_STRING_X509_TRUSTED) == 0)
return 1;
if (!strcmp(nm, PEM_STRING_X509_OLD) &&
!strcmp(name, PEM_STRING_X509_TRUSTED))
if (strcmp(nm, PEM_STRING_X509_OLD) == 0
&& strcmp(name, PEM_STRING_X509_TRUSTED) == 0)
return 1;
/* Some CAs use PKCS#7 with CERTIFICATE headers */
if (!strcmp(nm, PEM_STRING_X509) && !strcmp(name, PEM_STRING_PKCS7))
if (strcmp(nm, PEM_STRING_X509) == 0
&& strcmp(name, PEM_STRING_PKCS7) == 0)
return 1;
if (!strcmp(nm, PEM_STRING_PKCS7_SIGNED) &&
!strcmp(name, PEM_STRING_PKCS7))
if (strcmp(nm, PEM_STRING_PKCS7_SIGNED) == 0
&& strcmp(name, PEM_STRING_PKCS7) == 0)
return 1;
#ifndef OPENSSL_NO_CMS
if (!strcmp(nm, PEM_STRING_X509) && !strcmp(name, PEM_STRING_CMS))
if (strcmp(nm, PEM_STRING_X509) == 0
&& strcmp(name, PEM_STRING_CMS) == 0)
return 1;
/* Allow CMS to be read from PKCS#7 headers */
if (!strcmp(nm, PEM_STRING_PKCS7) && !strcmp(name, PEM_STRING_CMS))
if (strcmp(nm, PEM_STRING_PKCS7) == 0
&& strcmp(name, PEM_STRING_CMS) == 0)
return 1;
#endif


+ 1
- 1
crypto/pem/pem_pkey.c View File

@ -257,7 +257,7 @@ DH *PEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u)
return NULL;
p = data;
if (!strcmp(nm, PEM_STRING_DHXPARAMS))
if (strcmp(nm, PEM_STRING_DHXPARAMS) == 0)
ret = d2i_DHxparams(x, &p, len);
else
ret = d2i_DHparams(x, &p, len);


+ 14
- 14
crypto/rsa/rsa_pmeth.c View File

@ -558,21 +558,21 @@ static int pkey_rsa_ctrl_str(EVP_PKEY_CTX *ctx,
RSAerr(RSA_F_PKEY_RSA_CTRL_STR, RSA_R_VALUE_MISSING);
return 0;
}
if (!strcmp(type, "rsa_padding_mode")) {
if (strcmp(type, "rsa_padding_mode") == 0) {
int pm;
if (!strcmp(value, "pkcs1"))
if (strcmp(value, "pkcs1") == 0)
pm = RSA_PKCS1_PADDING;
else if (!strcmp(value, "sslv23"))
else if (strcmp(value, "sslv23") == 0)
pm = RSA_SSLV23_PADDING;
else if (!strcmp(value, "none"))
else if (strcmp(value, "none") == 0)
pm = RSA_NO_PADDING;
else if (!strcmp(value, "oeap"))
else if (strcmp(value, "oeap") == 0)
pm = RSA_PKCS1_OAEP_PADDING;
else if (!strcmp(value, "oaep"))
else if (strcmp(value, "oaep") == 0)
pm = RSA_PKCS1_OAEP_PADDING;
else if (!strcmp(value, "x931"))
else if (strcmp(value, "x931") == 0)
pm = RSA_X931_PADDING;
else if (!strcmp(value, "pss"))
else if (strcmp(value, "pss") == 0)
pm = RSA_PKCS1_PSS_PADDING;
else {
RSAerr(RSA_F_PKEY_RSA_CTRL_STR, RSA_R_UNKNOWN_PADDING_TYPE);
@ -581,19 +581,19 @@ static int pkey_rsa_ctrl_str(EVP_PKEY_CTX *ctx,
return EVP_PKEY_CTX_set_rsa_padding(ctx, pm);
}
if (!strcmp(type, "rsa_pss_saltlen")) {
if (strcmp(type, "rsa_pss_saltlen") == 0) {
int saltlen;
saltlen = atoi(value);
return EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx, saltlen);
}
if (!strcmp(type, "rsa_keygen_bits")) {
if (strcmp(type, "rsa_keygen_bits") == 0) {
int nbits;
nbits = atoi(value);
return EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, nbits);
}
if (!strcmp(type, "rsa_keygen_pubexp")) {
if (strcmp(type, "rsa_keygen_pubexp") == 0) {
int ret;
BIGNUM *pubexp = NULL;
if (!BN_asc2bn(&pubexp, value))
@ -604,7 +604,7 @@ static int pkey_rsa_ctrl_str(EVP_PKEY_CTX *ctx,
return ret;
}
if (!strcmp(type, "rsa_mgf1_md")) {
if (strcmp(type, "rsa_mgf1_md") == 0) {
const EVP_MD *md;
if (!(md = EVP_get_digestbyname(value))) {
RSAerr(RSA_F_PKEY_RSA_CTRL_STR, RSA_R_INVALID_DIGEST);
@ -613,7 +613,7 @@ static int pkey_rsa_ctrl_str(EVP_PKEY_CTX *ctx,
return EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, md);
}
if (!strcmp(type, "rsa_oaep_md")) {
if (strcmp(type, "rsa_oaep_md") == 0) {
const EVP_MD *md;
if (!(md = EVP_get_digestbyname(value))) {
RSAerr(RSA_F_PKEY_RSA_CTRL_STR, RSA_R_INVALID_DIGEST);
@ -621,7 +621,7 @@ static int pkey_rsa_ctrl_str(EVP_PKEY_CTX *ctx,
}
return EVP_PKEY_CTX_set_rsa_oaep_md(ctx, md);
}
if (!strcmp(type, "rsa_oaep_label")) {
if (strcmp(type, "rsa_oaep_label") == 0) {
unsigned char *lab;
long lablen;
int ret;


+ 1
- 1
crypto/x509v3/v3_addr.c View File

@ -1002,7 +1002,7 @@ static void *v2i_IPAddrBlocks(const struct v3_ext_method *method,
* Check for inheritance. Not worth additional complexity to
* optimize this (seldom-used) case.
*/
if (!strcmp(s, "inherit")) {
if (strcmp(s, "inherit") == 0) {
if (!v3_addr_add_inherit(addr, afi, safi)) {
X509V3err(X509V3_F_V2I_IPADDRBLOCKS,
X509V3_R_INVALID_INHERITANCE);


+ 4
- 4
crypto/x509v3/v3_akey.c View File

@ -131,13 +131,13 @@ static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method,
for (i = 0; i < sk_CONF_VALUE_num(values); i++) {
cnf = sk_CONF_VALUE_value(values, i);
if (!strcmp(cnf->name, "keyid")) {
if (strcmp(cnf->name, "keyid") == 0) {
keyid = 1;
if (cnf->value && !strcmp(cnf->value, "always"))
if (cnf->value && strcmp(cnf->value, "always") == 0)
keyid = 2;
} else if (!strcmp(cnf->name, "issuer")) {
} else if (strcmp(cnf->name, "issuer") == 0) {
issuer = 1;
if (cnf->value && !strcmp(cnf->value, "always"))
if (cnf->value && strcmp(cnf->value, "always") == 0)
issuer = 2;
} else {
X509V3err(X509V3_F_V2I_AUTHORITY_KEYID, X509V3_R_UNKNOWN_OPTION);


+ 6
- 6
crypto/x509v3/v3_alt.c View File

@ -249,8 +249,8 @@ static GENERAL_NAMES *v2i_issuer_alt(X509V3_EXT_METHOD *method,
}
for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
cnf = sk_CONF_VALUE_value(nval, i);
if (!name_cmp(cnf->name, "issuer") && cnf->value &&
!strcmp(cnf->value, "copy")) {
if (!name_cmp(cnf->name, "issuer")
&& cnf->value && strcmp(cnf->value, "copy") == 0) {
if (!copy_issuer(ctx, gens))
goto err;
} else {
@ -318,12 +318,12 @@ static GENERAL_NAMES *v2i_subject_alt(X509V3_EXT_METHOD *method,
}
for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
cnf = sk_CONF_VALUE_value(nval, i);
if (!name_cmp(cnf->name, "email") && cnf->value &&
!strcmp(cnf->value, "copy")) {
if (!name_cmp(cnf->name, "email")
&& cnf->value && strcmp(cnf->value, "copy") == 0) {
if (!copy_email(ctx, gens, 0))
goto err;
} else if (!name_cmp(cnf->name, "email") && cnf->value &&
!strcmp(cnf->value, "move")) {
} else if (!name_cmp(cnf->name, "email")
&& cnf->value && strcmp(cnf->value, "move") == 0) {
if (!copy_email(ctx, gens, 1))
goto err;
} else {


+ 1
- 1
crypto/x509v3/v3_asid.c View File

@ -572,7 +572,7 @@ static void *v2i_ASIdentifiers(const struct v3_ext_method *method,
/*
* Handle inheritance.
*/
if (!strcmp(val->value, "inherit")) {
if (strcmp(val->value, "inherit") == 0) {
if (v3_asid_add_inherit(asid, which))
continue;
X509V3err(X509V3_F_V2I_ASIDENTIFIERS,


+ 2
- 2
crypto/x509v3/v3_bcons.c View File

@ -113,10 +113,10 @@ static BASIC_CONSTRAINTS *v2i_BASIC_CONSTRAINTS(X509V3_EXT_METHOD *method,
}
for (i = 0; i < sk_CONF_VALUE_num(values); i++) {
val = sk_CONF_VALUE_value(values, i);
if (!strcmp(val->name, "CA")) {
if (strcmp(val->name, "CA") == 0) {
if (!X509V3_get_value_bool(val, &bcons->ca))
goto err;
} else if (!strcmp(val->name, "pathlen")) {
} else if (strcmp(val->name, "pathlen") == 0) {
if (!X509V3_get_value_int(val, &bcons->pathlen))
goto err;
} else {


+ 2
- 2
crypto/x509v3/v3_bitst.c View File

@ -119,8 +119,8 @@ ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
for (i = 0; i < sk_CONF_VALUE_num(nval); i++) {
val = sk_CONF_VALUE_value(nval, i);
for (bnam = method->usr_data; bnam->lname; bnam++) {
if (!strcmp(bnam->sname, val->name) ||
!strcmp(bnam->lname, val->name)) {
if (strcmp(bnam->sname, val->name) == 0
|| strcmp(bnam->lname, val->name) == 0) {
if (!ASN1_BIT_STRING_set_bit(bs, bnam->bitnum, 1)) {
X509V3err(X509V3_F_V2I_ASN1_BIT_STRING,
ERR_R_MALLOC_FAILURE);


+ 2
- 2
crypto/x509v3/v3_conf.c View File

@ -246,10 +246,10 @@ static int v3_check_generic(char **value)
{
int gen_type = 0;
char *p = *value;
if ((strlen(p) >= 4) && !strncmp(p, "DER:", 4)) {
if ((strlen(p) >= 4) && strncmp(p, "DER:", 4) == 0) {
p += 4;
gen_type = 1;
} else if ((strlen(p) >= 5) && !strncmp(p, "ASN1:", 5)) {
} else if ((strlen(p) >= 5) && strncmp(p, "ASN1:", 5) == 0) {
p += 5;
gen_type = 2;
} else


+ 5
- 5
crypto/x509v3/v3_cpols.c View File

@ -162,7 +162,7 @@ static STACK_OF(POLICYINFO) *r2i_certpol(X509V3_EXT_METHOD *method,
goto err;
}
pstr = cnf->name;
if (!strcmp(pstr, "ia5org")) {
if (strcmp(pstr, "ia5org") == 0) {
ia5org = 1;
continue;
} else if (*pstr == '@') {
@ -213,7 +213,7 @@ static POLICYINFO *policy_section(X509V3_CTX *ctx,
goto merr;
for (i = 0; i < sk_CONF_VALUE_num(polstrs); i++) {
cnf = sk_CONF_VALUE_value(polstrs, i);
if (!strcmp(cnf->name, "policyIdentifier")) {
if (strcmp(cnf->name, "policyIdentifier") == 0) {
ASN1_OBJECT *pobj;
if (!(pobj = OBJ_txt2obj(cnf->value, 0))) {
X509V3err(X509V3_F_POLICY_SECTION,
@ -303,13 +303,13 @@ static POLICYQUALINFO *notice_section(X509V3_CTX *ctx,
qual->d.usernotice = not;
for (i = 0; i < sk_CONF_VALUE_num(unot); i++) {
cnf = sk_CONF_VALUE_value(unot, i);
if (!strcmp(cnf->name, "explicitText")) {
if (strcmp(cnf->name, "explicitText") == 0) {
if (!(not->exptext = ASN1_VISIBLESTRING_new()))
goto merr;
if (!ASN1_STRING_set(not->exptext, cnf->value,
strlen(cnf->value)))
goto merr;
} else if (!strcmp(cnf->name, "organization")) {
} else if (strcmp(cnf->name, "organization") == 0) {
NOTICEREF *nref;
if (!not->noticeref) {
if (!(nref = NOTICEREF_new()))
@ -324,7 +324,7 @@ static POLICYQUALINFO *notice_section(X509V3_CTX *ctx,
if (!ASN1_STRING_set(nref->organization, cnf->value,
strlen(cnf->value)))
goto merr;
} else if (!strcmp(cnf->name, "noticeNumbers")) {
} else if (strcmp(cnf->name, "noticeNumbers") == 0) {
NOTICEREF *nref;
STACK_OF(CONF_VALUE) *nos;
if (!not->noticeref) {


+ 11
- 10
crypto/x509v3/v3_crld.c View File

@ -117,11 +117,12 @@ static int set_dist_point_name(DIST_POINT_NAME **pdp, X509V3_CTX *ctx,
{
STACK_OF(GENERAL_NAME) *fnm = NULL;
STACK_OF(X509_NAME_ENTRY) *rnm = NULL;
if (!strncmp(cnf->name, "fullname", 9)) {
if (strncmp(cnf->name, "fullname", 9) == 0) {
fnm = gnames_from_sectname(ctx, cnf->value);
if (!fnm)
goto err;
} else if (!strcmp(cnf->name, "relativename")) {
} else if (strcmp(cnf->name, "relativename") == 0) {
int ret;
STACK_OF(CONF_VALUE) *dnsect;
X509_NAME *nm;
@ -210,7 +211,7 @@ static int set_reasons(ASN1_BIT_STRING **preas, char *value)
goto err;
}
for (pbn = reason_flags; pbn->lname; pbn++) {
if (!strcmp(pbn->sname, bnam)) {
if (strcmp(pbn->sname, bnam) == 0) {
if (!ASN1_BIT_STRING_set_bit(*preas, pbn->bitnum, 1))
goto err;
break;
@ -265,10 +266,10 @@ static DIST_POINT *crldp_from_section(X509V3_CTX *ctx,
continue;
if (ret < 0)
goto err;
if (!strcmp(cnf->name, "reasons")) {
if (strcmp(cnf->name, "reasons") == 0) {
if (!set_reasons(&point->reasons, cnf->value))
goto err;
} else if (!strcmp(cnf->name, "CRLissuer")) {
} else if (strcmp(cnf->name, "CRLissuer") == 0) {
point->CRLissuer = gnames_from_sectname(ctx, cnf->value);
if (!point->CRLissuer)
goto err;
@ -426,19 +427,19 @@ static void *v2i_idp(const X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
continue;
if (ret < 0)
goto err;
if (!strcmp(name, "onlyuser")) {
if (strcmp(name, "onlyuser") == 0) {
if (!X509V3_get_value_bool(cnf, &idp->onlyuser))
goto err;
} else if (!strcmp(name, "onlyCA")) {
} else if (strcmp(name, "onlyCA") == 0) {
if (!X509V3_get_value_bool(cnf, &idp->onlyCA))
goto err;
} else if (!strcmp(name, "onlyAA")) {
} else if (strcmp(name, "onlyAA") == 0) {
if (!X509V3_get_value_bool(cnf, &idp->onlyattr))
goto err;
} else if (!strcmp(name, "indirectCRL")) {
} else if (strcmp(name, "indirectCRL") == 0) {
if (!X509V3_get_value_bool(cnf, &idp->indirectCRL))
goto err;
} else if (!strcmp(name, "onlysomereasons")) {
} else if (strcmp(name, "onlysomereasons") == 0) {
if (!set_reasons(&idp->onlysomereasons, val))
goto err;
} else {


+ 5
- 4
crypto/x509v3/v3_ncons.c View File