root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

APPS: replace awkward and error-prone pattern by calls to new app_conf_try_string() 

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/20971)
This commit is contained in:
Dr. David von Oheimb 2023-05-16 10:17:03 +02:00 committed by Dr. David von Oheimb
parent c8aec16383
commit da7f81d393
9 changed files with 86 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
apps/ca.c
View File

@ -514,9 +514,7 @@ end_of_options:
&& (section = lookup_conf(conf, BASE_SECTION, ENV_DEFAULT_CA)) == NULL) && (section = lookup_conf(conf, BASE_SECTION, ENV_DEFAULT_CA)) == NULL)
goto end; goto end;
p = NCONF_get_string(conf, NULL, "oid_file"); p = app_conf_try_string(conf, NULL, "oid_file");
if (p == NULL)
ERR_clear_error();
if (p != NULL) { if (p != NULL) {
BIO *oid_bio = BIO_new_file(p, "r"); BIO *oid_bio = BIO_new_file(p, "r");
@ -534,28 +532,22 @@ end_of_options:
if (!app_RAND_load()) if (!app_RAND_load())
goto end; goto end;
f = NCONF_get_string(conf, section, STRING_MASK); f = app_conf_try_string(conf, section, STRING_MASK);
if (f == NULL)
ERR_clear_error();
if (f != NULL && !ASN1_STRING_set_default_mask_asc(f)) { if (f != NULL && !ASN1_STRING_set_default_mask_asc(f)) {
BIO_printf(bio_err, "Invalid global string mask setting %s\n", f); BIO_printf(bio_err, "Invalid global string mask setting %s\n", f);
goto end; goto end;
} }
if (chtype != MBSTRING_UTF8) { if (chtype != MBSTRING_UTF8) {
f = NCONF_get_string(conf, section, UTF8_IN); f = app_conf_try_string(conf, section, UTF8_IN);
if (f == NULL) if (f != NULL && strcmp(f, "yes") == 0)
ERR_clear_error();
else if (strcmp(f, "yes") == 0)
chtype = MBSTRING_UTF8; chtype = MBSTRING_UTF8;
} }
db_attr.unique_subject = 1; db_attr.unique_subject = 1;
p = NCONF_get_string(conf, section, ENV_UNIQUE_SUBJECT); p = app_conf_try_string(conf, section, ENV_UNIQUE_SUBJECT);
if (p != NULL) if (p != NULL)
db_attr.unique_subject = parse_yesno(p, 1); db_attr.unique_subject = parse_yesno(p, 1);
else
ERR_clear_error();
/*****************************************************************/ /*****************************************************************/
/* report status of cert with serial number given on command line */ /* report status of cert with serial number given on command line */
@ -618,20 +610,14 @@ end_of_options:
if (!selfsign) if (!selfsign)
x509p = x509; x509p = x509;
f = NCONF_get_string(conf, BASE_SECTION, ENV_PRESERVE); f = app_conf_try_string(conf, BASE_SECTION, ENV_PRESERVE);
if (f == NULL) if (f != NULL && (*f == 'y' || *f == 'Y'))
ERR_clear_error();
if ((f != NULL) && ((*f == 'y') || (*f == 'Y')))
preserve = 1; preserve = 1;
f = NCONF_get_string(conf, BASE_SECTION, ENV_MSIE_HACK); f = app_conf_try_string(conf, BASE_SECTION, ENV_MSIE_HACK);
if (f == NULL) if (f != NULL && (*f == 'y' || *f == 'Y'))
ERR_clear_error();
if ((f != NULL) && ((*f == 'y') || (*f == 'Y')))
msie_hack = 1; msie_hack = 1;
f = NCONF_get_string(conf, section, ENV_NAMEOPT); f = app_conf_try_string(conf, section, ENV_NAMEOPT);
if (f == NULL)
ERR_clear_error();
if (f != NULL) { if (f != NULL) {
if (!set_nameopt(f)) { if (!set_nameopt(f)) {
BIO_printf(bio_err, "Invalid name options: \"%s\"\n", f); BIO_printf(bio_err, "Invalid name options: \"%s\"\n", f);
@ -640,25 +626,21 @@ end_of_options:
default_op = 0; default_op = 0;
} }
f = NCONF_get_string(conf, section, ENV_CERTOPT); f = app_conf_try_string(conf, section, ENV_CERTOPT);
if (f != NULL) { if (f != NULL) {
if (!set_cert_ex(&certopt, f)) { if (!set_cert_ex(&certopt, f)) {
BIO_printf(bio_err, "Invalid certificate options: \"%s\"\n", f); BIO_printf(bio_err, "Invalid certificate options: \"%s\"\n", f);
goto end; goto end;
} }
default_op = 0; default_op = 0;
} else {
ERR_clear_error();
} }
f = NCONF_get_string(conf, section, ENV_EXTCOPY); f = app_conf_try_string(conf, section, ENV_EXTCOPY);
if (f != NULL) { if (f != NULL) {
if (!set_ext_copy(&ext_copy, f)) { if (!set_ext_copy(&ext_copy, f)) {
BIO_printf(bio_err, "Invalid extension copy option: \"%s\"\n", f); BIO_printf(bio_err, "Invalid extension copy option: \"%s\"\n", f);
goto end; goto end;
} }
} else {
ERR_clear_error();
} }
/*****************************************************************/ /*****************************************************************/
@ -786,11 +768,10 @@ end_of_options:
/* We can have sections in the ext file */ /* We can have sections in the ext file */
if (extensions == NULL) { if (extensions == NULL) {
extensions = NCONF_get_string(extfile_conf, "default", "extensions"); extensions =
if (extensions == NULL) { app_conf_try_string(extfile_conf, "default", "extensions");
ERR_clear_error(); if (extensions == NULL)
extensions = "default"; extensions = "default";
}
} }
} }
@ -827,9 +808,8 @@ end_of_options:
if (email_dn == 1) { if (email_dn == 1) {
char *tmp_email_dn = NULL; char *tmp_email_dn = NULL;
tmp_email_dn = NCONF_get_string(conf, section, ENV_DEFAULT_EMAIL_DN); tmp_email_dn =
if (tmp_email_dn == NULL) app_conf_try_string(conf, section, ENV_DEFAULT_EMAIL_DN);
ERR_clear_error();
if (tmp_email_dn != NULL && strcmp(tmp_email_dn, "no") == 0) if (tmp_email_dn != NULL && strcmp(tmp_email_dn, "no") == 0)
email_dn = 0; email_dn = 0;
} }
@ -842,10 +822,9 @@ end_of_options:
if (verbose) if (verbose)
BIO_printf(bio_err, "policy is %s\n", policy); BIO_printf(bio_err, "policy is %s\n", policy);
if (NCONF_get_string(conf, section, ENV_RAND_SERIAL) != NULL) { if (app_conf_try_string(conf, section, ENV_RAND_SERIAL) != NULL) {
rand_ser = 1; rand_ser = 1;
} else { } else {
ERR_clear_error();
serialfile = lookup_conf(conf, section, ENV_SERIAL); serialfile = lookup_conf(conf, section, ENV_SERIAL);
if (serialfile == NULL) if (serialfile == NULL)
goto end; goto end;
@ -869,11 +848,8 @@ end_of_options:
* no '-extfile' option, so we look for extensions in the main * no '-extfile' option, so we look for extensions in the main
* configuration file * configuration file
*/ */
if (extensions == NULL) { if (extensions == NULL)
extensions = NCONF_get_string(conf, section, ENV_EXTENSIONS); extensions = app_conf_try_string(conf, section, ENV_EXTENSIONS);
if (extensions == NULL)
ERR_clear_error();
}
if (extensions != NULL) { if (extensions != NULL) {
/* Check syntax of config file section */ /* Check syntax of config file section */
X509V3_CTX ctx; X509V3_CTX ctx;
@ -890,11 +866,9 @@ end_of_options:
} }
} }
if (startdate == NULL) { if (startdate == NULL)
startdate = NCONF_get_string(conf, section, ENV_DEFAULT_STARTDATE); startdate =
if (startdate == NULL) app_conf_try_string(conf, section, ENV_DEFAULT_STARTDATE);
ERR_clear_error();
}
if (startdate != NULL && !ASN1_TIME_set_string_X509(NULL, startdate)) { if (startdate != NULL && !ASN1_TIME_set_string_X509(NULL, startdate)) {
BIO_printf(bio_err, BIO_printf(bio_err,
"start date is invalid, it should be YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ\n"); "start date is invalid, it should be YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ\n");
@ -903,11 +877,8 @@ end_of_options:
if (startdate == NULL) if (startdate == NULL)
startdate = "today"; startdate = "today";
if (enddate == NULL) { if (enddate == NULL)
enddate = NCONF_get_string(conf, section, ENV_DEFAULT_ENDDATE); enddate = app_conf_try_string(conf, section, ENV_DEFAULT_ENDDATE);
if (enddate == NULL)
ERR_clear_error();
}
if (enddate != NULL && !ASN1_TIME_set_string_X509(NULL, enddate)) { if (enddate != NULL && !ASN1_TIME_set_string_X509(NULL, enddate)) {
BIO_printf(bio_err, BIO_printf(bio_err,
"end date is invalid, it should be YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ\n"); "end date is invalid, it should be YYMMDDHHMMSSZ or YYYYMMDDHHMMSSZ\n");
@ -1151,11 +1122,9 @@ end_of_options:
/*****************************************************************/ /*****************************************************************/
if (gencrl) { if (gencrl) {
int crl_v2 = 0; int crl_v2 = 0;
if (crl_ext == NULL) {
crl_ext = NCONF_get_string(conf, section, ENV_CRLEXT); if (crl_ext == NULL)
if (crl_ext == NULL) crl_ext = app_conf_try_string(conf, section, ENV_CRLEXT);
ERR_clear_error();
}
if (crl_ext != NULL) { if (crl_ext != NULL) {
/* Check syntax of file */ /* Check syntax of file */
X509V3_CTX ctx; X509V3_CTX ctx;
@ -1170,15 +1139,13 @@ end_of_options:
} }
} }
crlnumberfile = NCONF_get_string(conf, section, ENV_CRLNUMBER); crlnumberfile = app_conf_try_string(conf, section, ENV_CRLNUMBER);
if (crlnumberfile != NULL) { if (crlnumberfile != NULL) {
if ((crlnumber = load_serial(crlnumberfile, NULL, 0, NULL)) if ((crlnumber = load_serial(crlnumberfile, NULL, 0, NULL))
== NULL) { == NULL) {
BIO_printf(bio_err, "error while loading CRL number\n"); BIO_printf(bio_err, "error while loading CRL number\n");
goto end; goto end;
} }
} else {
ERR_clear_error();
} }
if (!crldays && !crlhours && !crlsec) { if (!crldays && !crlhours && !crlsec) {

2
apps/cmp.c
View File

@ -2187,7 +2187,7 @@ static char *conf_get_string(const CONF *src_conf, const char *groups,
const char *end = groups + strlen(groups); const char *end = groups + strlen(groups);
while ((end = prev_item(groups, end)) != NULL) { while ((end = prev_item(groups, end)) != NULL) {
if ((res = NCONF_get_string(src_conf, opt_item, name)) != NULL) if ((res = app_conf_try_string(src_conf, opt_item, name)) != NULL)
return res; return res;
} }
return res; return res;

1
apps/include/apps.h
View File

@ -65,6 +65,7 @@ BIO *dup_bio_err(int format);
BIO *bio_open_owner(const char *filename, int format, int private); BIO *bio_open_owner(const char *filename, int format, int private);
BIO *bio_open_default(const char *filename, char mode, int format); BIO *bio_open_default(const char *filename, char mode, int format);
BIO *bio_open_default_quiet(const char *filename, char mode, int format); BIO *bio_open_default_quiet(const char *filename, char mode, int format);
char *app_conf_try_string(const CONF *cnf, const char *group, const char *name);
CONF *app_load_config_bio(BIO *in, const char *filename); CONF *app_load_config_bio(BIO *in, const char *filename);
# define app_load_config(filename) app_load_config_internal(filename, 0) # define app_load_config(filename) app_load_config_internal(filename, 0)
# define app_load_config_quiet(filename) app_load_config_internal(filename, 1) # define app_load_config_quiet(filename) app_load_config_internal(filename, 1)

6
apps/lib/app_rand.c
View File

@ -18,12 +18,10 @@ static STACK_OF(OPENSSL_STRING) *randfiles;
void app_RAND_load_conf(CONF *c, const char *section) void app_RAND_load_conf(CONF *c, const char *section)
{ {
const char *randfile = NCONF_get_string(c, section, "RANDFILE"); const char *randfile = app_conf_try_string(c, section, "RANDFILE");
if (randfile == NULL) { if (randfile == NULL)
ERR_clear_error();
return; return;
}
if (RAND_load_file(randfile, -1) < 0) { if (RAND_load_file(randfile, -1) < 0) {
BIO_printf(bio_err, "Can't load %s into RNG\n", randfile); BIO_printf(bio_err, "Can't load %s into RNG\n", randfile);
ERR_print_errors(bio_err); ERR_print_errors(bio_err);

25
apps/lib/apps.c
View File

@ -336,6 +336,20 @@ static char *app_get_pass(const char *arg, int keepbio)
return OPENSSL_strdup(tpass); return OPENSSL_strdup(tpass);
} }
char *app_conf_try_string(const CONF *conf, const char *group, const char *name)
{
char *res;
ERR_set_mark();
res = NCONF_get_string(conf, group, name);
if (res == NULL)
ERR_pop_to_mark();
else
ERR_clear_last_mark();
return res;
}
CONF *app_load_config_bio(BIO *in, const char *filename) CONF *app_load_config_bio(BIO *in, const char *filename)
{ {
long errorline = -1; long errorline = -1;
@ -416,10 +430,8 @@ int add_oid_section(CONF *conf)
CONF_VALUE *cnf; CONF_VALUE *cnf;
int i; int i;
if ((p = NCONF_get_string(conf, NULL, "oid_section")) == NULL) { if ((p = app_conf_try_string(conf, NULL, "oid_section")) == NULL)
ERR_clear_error();
return 1; return 1;
}
if ((sktmp = NCONF_get_section(conf, p)) == NULL) { if ((sktmp = NCONF_get_section(conf, p)) == NULL) {
BIO_printf(bio_err, "problem loading oid section %s\n", p); BIO_printf(bio_err, "problem loading oid section %s\n", p);
return 0; return 0;
@ -1684,12 +1696,11 @@ CA_DB *load_index(const char *dbfile, DB_ATTR *db_attr)
else else
retdb->attributes.unique_subject = 1; retdb->attributes.unique_subject = 1;
if (dbattr_conf) { if (dbattr_conf != NULL) {
char *p = NCONF_get_string(dbattr_conf, NULL, "unique_subject"); char *p = app_conf_try_string(dbattr_conf, NULL, "unique_subject");
if (p) { if (p != NULL)
retdb->attributes.unique_subject = parse_yesno(p, 1); retdb->attributes.unique_subject = parse_yesno(p, 1);
}
} }
retdb->dbfname = OPENSSL_strdup(dbfile); retdb->dbfname = OPENSSL_strdup(dbfile);

5
apps/pkcs12.c
View File

@ -683,7 +683,8 @@ int pkcs12_main(int argc, char **argv)
if (!app_load_modules(conf)) if (!app_load_modules(conf))
goto export_end; goto export_end;
/* Find the cert bag section */ /* Find the cert bag section */
if ((cb_attr = NCONF_get_string(conf, "pkcs12", "certBagAttr")) != NULL) { cb_attr = app_conf_try_string(conf, "pkcs12", "certBagAttr");
if (cb_attr != NULL) {
if ((cb_sk = NCONF_get_section(conf, cb_attr)) != NULL) { if ((cb_sk = NCONF_get_section(conf, cb_attr)) != NULL) {
for (i = 0; i < sk_CONF_VALUE_num(cb_sk); i++) { for (i = 0; i < sk_CONF_VALUE_num(cb_sk); i++) {
val = sk_CONF_VALUE_value(cb_sk, i); val = sk_CONF_VALUE_value(cb_sk, i);
@ -695,8 +696,6 @@ int pkcs12_main(int argc, char **argv)
} else { } else {
ERR_clear_error(); ERR_clear_error();
} }
} else {
ERR_clear_error();
} }
p12 = PKCS12_create_ex2(cpass, name, key, ee_cert, certs, p12 = PKCS12_create_ex2(cpass, name, key, ee_cert, certs,

99
apps/req.c
View File

@ -518,9 +518,7 @@ int req_main(int argc, char **argv)
goto end; goto end;
if (req_conf != NULL) { if (req_conf != NULL) {
p = NCONF_get_string(req_conf, NULL, "oid_file"); p = app_conf_try_string(req_conf, NULL, "oid_file");
if (p == NULL)
ERR_clear_error();
if (p != NULL) { if (p != NULL) {
BIO *oid_bio = BIO_new_file(p, "r"); BIO *oid_bio = BIO_new_file(p, "r");
@ -543,19 +541,14 @@ int req_main(int argc, char **argv)
goto opthelp; goto opthelp;
} else { } else {
/* No digest specified, default to configuration */ /* No digest specified, default to configuration */
p = NCONF_get_string(req_conf, section, "default_md"); p = app_conf_try_string(req_conf, section, "default_md");
if (p == NULL) if (p != NULL)
ERR_clear_error();
else
digest = p; digest = p;
} }
if (extsect == NULL) { if (extsect == NULL)
extsect = NCONF_get_string(req_conf, section, extsect = app_conf_try_string(req_conf, section,
gen_x509 ? V3_EXTENSIONS : REQ_EXTENSIONS); gen_x509 ? V3_EXTENSIONS : REQ_EXTENSIONS);
if (extsect == NULL)
ERR_clear_error();
}
if (extsect != NULL) { if (extsect != NULL) {
/* Check syntax of extension section in config file */ /* Check syntax of extension section in config file */
X509V3_CTX ctx; X509V3_CTX ctx;
@ -581,34 +574,23 @@ int req_main(int argc, char **argv)
} }
} }
if (passin == NULL) { if (passin == NULL)
passin = nofree_passin = passin = nofree_passin =
NCONF_get_string(req_conf, section, "input_password"); app_conf_try_string(req_conf, section, "input_password");
if (passin == NULL)
ERR_clear_error();
}
if (passout == NULL) { if (passout == NULL)
passout = nofree_passout = passout = nofree_passout =
NCONF_get_string(req_conf, section, "output_password"); app_conf_try_string(req_conf, section, "output_password");
if (passout == NULL)
ERR_clear_error();
}
p = NCONF_get_string(req_conf, section, STRING_MASK);
if (p == NULL)
ERR_clear_error();
p = app_conf_try_string(req_conf, section, STRING_MASK);
if (p != NULL && !ASN1_STRING_set_default_mask_asc(p)) { if (p != NULL && !ASN1_STRING_set_default_mask_asc(p)) {
BIO_printf(bio_err, "Invalid global string mask setting %s\n", p); BIO_printf(bio_err, "Invalid global string mask setting %s\n", p);
goto end; goto end;
} }
if (chtype != MBSTRING_UTF8) { if (chtype != MBSTRING_UTF8) {
p = NCONF_get_string(req_conf, section, UTF8_IN); p = app_conf_try_string(req_conf, section, UTF8_IN);
if (p == NULL) if (p != NULL && strcmp(p, "yes") == 0)
ERR_clear_error();
else if (strcmp(p, "yes") == 0)
chtype = MBSTRING_UTF8; chtype = MBSTRING_UTF8;
} }
@ -678,11 +660,8 @@ int req_main(int argc, char **argv)
EVP_PKEY_CTX_free(genctx); EVP_PKEY_CTX_free(genctx);
genctx = NULL; genctx = NULL;
} }
if (keyout == NULL && keyfile == NULL) { if (keyout == NULL && keyfile == NULL)
keyout = NCONF_get_string(req_conf, section, KEYFILE); keyout = app_conf_try_string(req_conf, section, KEYFILE);
if (keyout == NULL)
ERR_clear_error();
}
if (pkey != NULL && (keyfile == NULL || keyout != NULL)) { if (pkey != NULL && (keyfile == NULL || keyout != NULL)) {
if (verbose) { if (verbose) {
@ -696,14 +675,10 @@ int req_main(int argc, char **argv)
if (out == NULL) if (out == NULL)
goto end; goto end;
p = NCONF_get_string(req_conf, section, "encrypt_rsa_key"); p = app_conf_try_string(req_conf, section, "encrypt_rsa_key");
if (p == NULL) { if (p == NULL)
ERR_clear_error(); p = app_conf_try_string(req_conf, section, "encrypt_key");
p = NCONF_get_string(req_conf, section, "encrypt_key"); if (p != NULL && strcmp(p, "no") == 0)
if (p == NULL)
ERR_clear_error();
}
if ((p != NULL) && (strcmp(p, "no") == 0))
cipher = NULL; cipher = NULL;
if (noenc) if (noenc)
cipher = NULL; cipher = NULL;
@ -1072,16 +1047,12 @@ static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, X509_NAME *fsubj,
STACK_OF(CONF_VALUE) *dn_sk = NULL, *attr_sk = NULL; STACK_OF(CONF_VALUE) *dn_sk = NULL, *attr_sk = NULL;
char *tmp, *dn_sect, *attr_sect; char *tmp, *dn_sect, *attr_sect;
tmp = NCONF_get_string(req_conf, section, PROMPT); tmp = app_conf_try_string(req_conf, section, PROMPT);
if (tmp == NULL) if (tmp != NULL && strcmp(tmp, "no") == 0)
ERR_clear_error();
if ((tmp != NULL) && strcmp(tmp, "no") == 0)
no_prompt = 1; no_prompt = 1;
dn_sect = NCONF_get_string(req_conf, section, DISTINGUISHED_NAME); dn_sect = app_conf_try_string(req_conf, section, DISTINGUISHED_NAME);
if (dn_sect == NULL) { if (dn_sect != NULL) {
ERR_clear_error();
} else {
dn_sk = NCONF_get_section(req_conf, dn_sect); dn_sk = NCONF_get_section(req_conf, dn_sect);
if (dn_sk == NULL) { if (dn_sk == NULL) {
BIO_printf(bio_err, "Unable to get '%s' section\n", dn_sect); BIO_printf(bio_err, "Unable to get '%s' section\n", dn_sect);
@ -1089,10 +1060,8 @@ static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, X509_NAME *fsubj,
} }
} }
attr_sect = NCONF_get_string(req_conf, section, ATTRIBUTES); attr_sect = app_conf_try_string(req_conf, section, ATTRIBUTES);
if (attr_sect == NULL) { if (attr_sect != NULL) {
ERR_clear_error();
} else {
attr_sk = NCONF_get_section(req_conf, attr_sect); attr_sk = NCONF_get_section(req_conf, attr_sect);
if (attr_sk == NULL) { if (attr_sk == NULL) {
BIO_printf(bio_err, "Unable to get '%s' section\n", attr_sect); BIO_printf(bio_err, "Unable to get '%s' section\n", attr_sect);
@ -1188,17 +1157,13 @@ static int prompt_info(X509_REQ *req,
goto start; goto start;
if (!join(buf, sizeof(buf), v->name, "_default", "Name")) if (!join(buf, sizeof(buf), v->name, "_default", "Name"))
return 0; return 0;
if ((def = NCONF_get_string(req_conf, dn_sect, buf)) == NULL) { if ((def = app_conf_try_string(req_conf, dn_sect, buf)) == NULL)
ERR_clear_error();
def = ""; def = "";
}
if (!join(buf, sizeof(buf), v->name, "_value", "Name")) if (!join(buf, sizeof(buf), v->name, "_value", "Name"))
return 0; return 0;
if ((value = NCONF_get_string(req_conf, dn_sect, buf)) == NULL) { if ((value = app_conf_try_string(req_conf, dn_sect, buf)) == NULL)
ERR_clear_error();
value = NULL; value = NULL;
}
if (!join(buf, sizeof(buf), v->name, "_min", "Name")) if (!join(buf, sizeof(buf), v->name, "_min", "Name"))
return 0; return 0;
@ -1246,19 +1211,13 @@ static int prompt_info(X509_REQ *req,
if (!join(buf, sizeof(buf), type, "_default", "Name")) if (!join(buf, sizeof(buf), type, "_default", "Name"))
return 0; return 0;
if ((def = NCONF_get_string(req_conf, attr_sect, buf)) def = app_conf_try_string(req_conf, attr_sect, buf);
== NULL) { if (def == NULL)
ERR_clear_error();
def = ""; def = "";
}
if (!join(buf, sizeof(buf), type, "_value", "Name")) if (!join(buf, sizeof(buf), type, "_value", "Name"))
return 0; return 0;
if ((value = NCONF_get_string(req_conf, attr_sect, buf)) value = app_conf_try_string(req_conf, attr_sect, buf);
== NULL) {
ERR_clear_error();
value = NULL;
}
if (!join(buf, sizeof(buf), type, "_min", "Name")) if (!join(buf, sizeof(buf), type, "_min", "Name"))
return 0; return 0;

5
apps/ts.c
View File

@ -375,7 +375,7 @@ static CONF *load_config_file(const char *configfile)
const char *p; const char *p;
BIO_printf(bio_err, "Using configuration from %s\n", configfile); BIO_printf(bio_err, "Using configuration from %s\n", configfile);
p = NCONF_get_string(conf, NULL, ENV_OID_FILE); p = app_conf_try_string(conf, NULL, ENV_OID_FILE);
if (p != NULL) { if (p != NULL) {
BIO *oid_bio = BIO_new_file(p, "r"); BIO *oid_bio = BIO_new_file(p, "r");
if (!oid_bio) if (!oid_bio)
@ -384,8 +384,7 @@ static CONF *load_config_file(const char *configfile)
OBJ_create_objects(oid_bio); OBJ_create_objects(oid_bio);
BIO_free_all(oid_bio); BIO_free_all(oid_bio);
} }
} else }
ERR_clear_error();
if (!add_oid_section(conf)) if (!add_oid_section(conf))
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
} }

6
apps/x509.c
View File

@ -687,11 +687,9 @@ int x509_main(int argc, char **argv)
if ((extconf = app_load_config(extfile)) == NULL) if ((extconf = app_load_config(extfile)) == NULL)
goto end; goto end;
if (extsect == NULL) { if (extsect == NULL) {
extsect = NCONF_get_string(extconf, "default", "extensions"); extsect = app_conf_try_string(extconf, "default", "extensions");
if (extsect == NULL) { if (extsect == NULL)
ERR_clear_error();
extsect = "default"; extsect = "default";
}
} }
X509V3_set_ctx_test(&ctx2); X509V3_set_ctx_test(&ctx2);
X509V3_set_nconf(&ctx2, extconf); X509V3_set_nconf(&ctx2, extconf);