aboutsummaryrefslogtreecommitdiff
path: root/apps/lib/apps.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/lib/apps.c')
-rw-r--r--apps/lib/apps.c898
1 files changed, 524 insertions, 374 deletions
diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index a632b0cff2bf..d4e72307de58 100644
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2025 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@ -44,14 +44,16 @@
#include <openssl/rand.h>
#include <openssl/bn.h>
#include <openssl/ssl.h>
-#include <openssl/store.h>
#include <openssl/core_names.h>
#include "s_apps.h"
#include "apps.h"
+#include "internal/sockets.h" /* for openssl_fdset() */
+#include "internal/e_os.h"
+
#ifdef _WIN32
static int WIN32_rename(const char *from, const char *to);
-# define rename(from,to) WIN32_rename((from),(to))
+# define rename(from, to) WIN32_rename((from), (to))
#endif
#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
@@ -76,18 +78,9 @@ typedef struct {
} NAME_EX_TBL;
static int set_table_opts(unsigned long *flags, const char *arg,
- const NAME_EX_TBL * in_tbl);
+ const NAME_EX_TBL *in_tbl);
static int set_multi_opts(unsigned long *flags, const char *arg,
- const NAME_EX_TBL * in_tbl);
-static
-int load_key_certs_crls_suppress(const char *uri, int format, int maybe_stdin,
- const char *pass, const char *desc,
- EVP_PKEY **ppkey, EVP_PKEY **ppubkey,
- EVP_PKEY **pparams,
- X509 **pcert, STACK_OF(X509) **pcerts,
- X509_CRL **pcrl, STACK_OF(X509_CRL) **pcrls,
- int suppress_decode_errors);
-
+ const NAME_EX_TBL *in_tbl);
int app_init(long mesgwin);
int chopup_args(ARGS *arg, char *buf)
@@ -111,6 +104,7 @@ int chopup_args(ARGS *arg, char *buf)
/* The start of something good :-) */
if (arg->argc >= arg->size) {
char **tmp;
+
arg->size += 20;
tmp = OPENSSL_realloc(arg->argv, sizeof(*arg->argv) * arg->size);
if (tmp == NULL)
@@ -197,7 +191,12 @@ int set_nameopt(const char *arg)
unsigned long get_nameopt(void)
{
- return (nmflag_set) ? nmflag : XN_FLAG_ONELINE;
+ return
+ nmflag_set ? nmflag : XN_FLAG_SEP_CPLUS_SPC | XN_FLAG_FN_SN
+ | ASN1_STRFLGS_ESC_CTRL
+ | ASN1_STRFLGS_UTF8_CONVERT
+ | ASN1_STRFLGS_DUMP_UNKNOWN
+ | ASN1_STRFLGS_DUMP_DER;
}
void dump_cert_text(BIO *out, X509 *x)
@@ -211,7 +210,6 @@ int wrap_password_callback(char *buf, int bufsiz, int verify, void *userdata)
return password_callback(buf, bufsiz, verify, (PW_CB_DATA *)userdata);
}
-
static char *app_get_pass(const char *arg, int keepbio);
char *get_passwd(const char *pass, const char *desc)
@@ -227,7 +225,8 @@ char *get_passwd(const char *pass, const char *desc)
"Trying plain input string (better precede with 'pass:')\n");
result = OPENSSL_strdup(pass);
if (result == NULL)
- BIO_printf(bio_err, "Out of memory getting password for %s\n", desc);
+ BIO_printf(bio_err,
+ "Out of memory getting password for %s\n", desc);
}
return result;
}
@@ -260,21 +259,21 @@ static char *app_get_pass(const char *arg, int keepbio)
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 +285,14 @@ static char *app_get_pass(const char *arg, int keepbio)
* 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 == NULL) {
- 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;
}
/*
@@ -343,6 +343,33 @@ static char *app_get_pass(const char *arg, int keepbio)
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;
+}
+
+int app_conf_try_number(const CONF *conf, const char *group, const char *name,
+ long *result)
+{
+ int ok;
+
+ ERR_set_mark();
+ ok = NCONF_get_number(conf, group, name, result);
+ if (!ok)
+ ERR_pop_to_mark();
+ else
+ ERR_clear_last_mark();
+ return ok;
+}
+
CONF *app_load_config_bio(BIO *in, const char *filename)
{
long errorline = -1;
@@ -423,10 +450,8 @@ int add_oid_section(CONF *conf)
CONF_VALUE *cnf;
int i;
- if ((p = NCONF_get_string(conf, NULL, "oid_section")) == NULL) {
- ERR_clear_error();
+ if ((p = app_conf_try_string(conf, NULL, "oid_section")) == NULL)
return 1;
- }
if ((sktmp = NCONF_get_section(conf, p)) == NULL) {
BIO_printf(bio_err, "problem loading oid section %s\n", p);
return 0;
@@ -457,10 +482,8 @@ CONF *app_load_config_modules(const char *configfile)
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)
@@ -469,16 +492,17 @@ X509 *load_cert_pass(const char *uri, int format, int maybe_stdin,
if (desc == NULL)
desc = "certificate";
- if (IS_HTTPS(uri))
+ if (IS_HTTPS(uri)) {
BIO_printf(bio_err, "Loading %s over HTTPS is unsupported\n", desc);
- else if (IS_HTTP(uri))
+ } else if (IS_HTTP(uri)) {
cert = X509_load_http(uri, NULL, NULL, 0 /* timeout */);
- else
- (void)load_key_certs_crls(uri, format, maybe_stdin, pass, desc,
+ if (cert == NULL) {
+ ERR_print_errors(bio_err);
+ BIO_printf(bio_err, "Unable to load %s from %s\n", desc, uri);
+ }
+ } else {
+ (void)load_key_certs_crls(uri, format, maybe_stdin, pass, desc, 0,
NULL, NULL, NULL, &cert, NULL, NULL, NULL);
- if (cert == NULL) {
- BIO_printf(bio_err, "Unable to load %s\n", desc);
- ERR_print_errors(bio_err);
}
return cert;
}
@@ -490,20 +514,22 @@ X509_CRL *load_crl(const char *uri, int format, int maybe_stdin,
if (desc == NULL)
desc = "CRL";
- if (IS_HTTPS(uri))
+ if (IS_HTTPS(uri)) {
BIO_printf(bio_err, "Loading %s over HTTPS is unsupported\n", desc);
- else if (IS_HTTP(uri))
+ } else if (IS_HTTP(uri)) {
crl = X509_CRL_load_http(uri, NULL, NULL, 0 /* timeout */);
- else
- (void)load_key_certs_crls(uri, format, maybe_stdin, NULL, desc,
+ if (crl == NULL) {
+ ERR_print_errors(bio_err);
+ BIO_printf(bio_err, "Unable to load %s from %s\n", desc, uri);
+ }
+ } else {
+ (void)load_key_certs_crls(uri, format, maybe_stdin, NULL, desc, 0,
NULL, NULL, NULL, NULL, NULL, &crl, NULL);
- if (crl == NULL) {
- BIO_printf(bio_err, "Unable to load %s\n", desc);
- ERR_print_errors(bio_err);
}
return crl;
}
+/* Could be simplified if OSSL_STORE supported CSRs, see FR #15725 */
X509_REQ *load_csr(const char *file, int format, const char *desc)
{
X509_REQ *req = NULL;
@@ -511,8 +537,6 @@ X509_REQ *load_csr(const char *file, int format, const char *desc)
if (format == FORMAT_UNDEF)
format = FORMAT_PEM;
- if (desc == NULL)
- desc = "CSR";
in = bio_open_default(file, 'r', format);
if (in == NULL)
goto end;
@@ -526,13 +550,50 @@ X509_REQ *load_csr(const char *file, int format, const char *desc)
end:
if (req == NULL) {
- BIO_printf(bio_err, "Unable to load %s\n", desc);
ERR_print_errors(bio_err);
+ if (desc != NULL)
+ BIO_printf(bio_err, "Unable to load %s\n", desc);
}
BIO_free(in);
return req;
}
+/* Better extend OSSL_STORE to support CSRs, see FR #15725 */
+X509_REQ *load_csr_autofmt(const char *infile, int format,
+ STACK_OF(OPENSSL_STRING) *vfyopts, const char *desc)
+{
+ X509_REQ *csr;
+
+ if (format != FORMAT_UNDEF) {
+ csr = load_csr(infile, format, desc);
+ } else { /* try PEM, then DER */
+ BIO *bio_bak = bio_err;
+
+ bio_err = NULL; /* do not show errors on more than one try */
+ csr = load_csr(infile, FORMAT_PEM, NULL /* desc */);
+ bio_err = bio_bak;
+ if (csr == NULL) {
+ ERR_clear_error();
+ csr = load_csr(infile, FORMAT_ASN1, NULL /* desc */);
+ }
+ if (csr == NULL) {
+ BIO_printf(bio_err, "error: unable to load %s from file '%s'\n",
+ desc, infile);
+ }
+ }
+ if (csr != NULL) {
+ EVP_PKEY *pkey = X509_REQ_get0_pubkey(csr);
+ int ret = do_X509_REQ_verify(csr, pkey, vfyopts);
+
+ if (pkey == NULL || ret < 0)
+ BIO_puts(bio_err, "Warning: error while verifying CSR self-signature\n");
+ else if (ret == 0)
+ BIO_puts(bio_err, "Warning: CSR self-signature does not match the contents\n");
+ return csr;
+ }
+ return csr;
+}
+
void cleanse(char *str)
{
if (str != NULL)
@@ -554,16 +615,16 @@ EVP_PKEY *load_key(const char *uri, int format, int may_stdin,
if (desc == NULL)
desc = "private key";
- if (format == FORMAT_ENGINE) {
+ if (format == FORMAT_ENGINE)
uri = allocated_uri = make_engine_uri(e, uri, desc);
- }
- (void)load_key_certs_crls(uri, format, may_stdin, pass, desc,
+ (void)load_key_certs_crls(uri, format, may_stdin, pass, desc, 0,
&pkey, NULL, NULL, NULL, NULL, NULL, NULL);
OPENSSL_free(allocated_uri);
return pkey;
}
+/* first try reading public key, on failure resort to loading private key */
EVP_PKEY *load_pubkey(const char *uri, int format, int maybe_stdin,
const char *pass, ENGINE *e, const char *desc)
{
@@ -573,35 +634,33 @@ EVP_PKEY *load_pubkey(const char *uri, int format, int maybe_stdin,
if (desc == NULL)
desc = "public key";
- if (format == FORMAT_ENGINE) {
+ if (format == FORMAT_ENGINE)
uri = allocated_uri = make_engine_uri(e, uri, desc);
- }
- (void)load_key_certs_crls(uri, format, maybe_stdin, pass, desc,
+ (void)load_key_certs_crls(uri, format, maybe_stdin, pass, desc, 1,
NULL, &pkey, NULL, NULL, NULL, NULL, NULL);
-
+ if (pkey == NULL)
+ (void)load_key_certs_crls(uri, format, maybe_stdin, pass, desc, 0,
+ &pkey, NULL, NULL, NULL, NULL, NULL, NULL);
OPENSSL_free(allocated_uri);
return pkey;
}
EVP_PKEY *load_keyparams_suppress(const char *uri, int format, int maybe_stdin,
- const char *keytype, const char *desc,
- int suppress_decode_errors)
+ const char *keytype, const char *desc,
+ int suppress_decode_errors)
{
EVP_PKEY *params = NULL;
if (desc == NULL)
desc = "key parameters";
-
- (void)load_key_certs_crls_suppress(uri, format, maybe_stdin, NULL, desc,
- NULL, NULL, &params, NULL, NULL, NULL,
- NULL, suppress_decode_errors);
+ (void)load_key_certs_crls(uri, format, maybe_stdin, NULL, desc,
+ suppress_decode_errors,
+ NULL, NULL, &params, NULL, NULL, NULL, NULL);
if (params != NULL && keytype != NULL && !EVP_PKEY_is_a(params, keytype)) {
- if (!suppress_decode_errors) {
- BIO_printf(bio_err,
- "Unable to load %s from %s (unexpected parameters type)\n",
- desc, uri);
- ERR_print_errors(bio_err);
- }
+ ERR_print_errors(bio_err);
+ BIO_printf(bio_err,
+ "Unable to load %s from %s (unexpected parameters type)\n",
+ desc, uri);
EVP_PKEY_free(params);
params = NULL;
}
@@ -689,15 +748,16 @@ int load_cert_certs(const char *uri,
int ret = 0;
char *pass_string;
- if (exclude_http && (OPENSSL_strncasecmp(uri, "http://", 7) == 0
- || OPENSSL_strncasecmp(uri, "https://", 8) == 0)) {
+ if (desc == NULL)
+ desc = pcerts == NULL ? "certificate" : "certificates";
+ if (exclude_http && (HAS_CASE_PREFIX(uri, "http://")
+ || HAS_CASE_PREFIX(uri, "https://"))) {
BIO_printf(bio_err, "error: HTTP retrieval not allowed for %s\n", desc);
return ret;
}
pass_string = get_passwd(pass, desc);
- ret = load_key_certs_crls(uri, FORMAT_UNDEF, 0, pass_string, desc,
- NULL, NULL, NULL,
- pcert, pcerts, NULL, NULL);
+ ret = load_key_certs_crls(uri, FORMAT_UNDEF, 0, pass_string, desc, 0,
+ NULL, NULL, NULL, pcert, pcerts, NULL, NULL);
clear_free(pass_string);
if (ret) {
@@ -707,7 +767,7 @@ int load_cert_certs(const char *uri,
warn_certs(uri, *pcerts, 1, vpm);
} else {
if (pcerts != NULL) {
- sk_X509_pop_free(*pcerts, X509_free);
+ OSSL_STACK_OF_X509_free(*pcerts);
*pcerts = NULL;
}
}
@@ -733,7 +793,7 @@ STACK_OF(X509) *load_certs_multifile(char *files, const char *pass,
if (!X509_add_certs(result, certs,
X509_ADD_FLAG_UP_REF | X509_ADD_FLAG_NO_DUP))
goto oom;
- sk_X509_pop_free(certs, X509_free);
+ OSSL_STACK_OF_X509_free(certs);
certs = NULL;
files = next;
}
@@ -742,8 +802,8 @@ STACK_OF(X509) *load_certs_multifile(char *files, const char *pass,
oom:
BIO_printf(bio_err, "out of memory\n");
err:
- sk_X509_pop_free(certs, X509_free);
- sk_X509_pop_free(result, X509_free);
+ OSSL_STACK_OF_X509_free(certs);
+ OSSL_STACK_OF_X509_free(result);
return NULL;
}
@@ -784,7 +844,7 @@ X509_STORE *load_certstore(char *input, const char *pass, const char *desc,
return NULL;
}
ok = (store = sk_X509_to_store(store, certs)) != NULL;
- sk_X509_pop_free(certs, X509_free);
+ OSSL_STACK_OF_X509_free(certs);
certs = NULL;
if (!ok)
return NULL;
@@ -800,13 +860,15 @@ X509_STORE *load_certstore(char *input, const char *pass, const char *desc,
int load_certs(const char *uri, int maybe_stdin, STACK_OF(X509) **certs,
const char *pass, const char *desc)
{
- int was_NULL = *certs == NULL;
- int ret = load_key_certs_crls(uri, FORMAT_UNDEF, maybe_stdin,
- pass, desc, NULL, NULL,
- NULL, NULL, certs, NULL, NULL);
+ int ret, was_NULL = *certs == NULL;
+
+ if (desc == NULL)
+ desc = "certificates";
+ ret = load_key_certs_crls(uri, FORMAT_UNDEF, maybe_stdin, pass, desc, 0,
+ NULL, NULL, NULL, NULL, certs, NULL, NULL);
if (!ret && was_NULL) {
- sk_X509_pop_free(*certs, X509_free);
+ OSSL_STACK_OF_X509_free(*certs);
*certs = NULL;
}
return ret;
@@ -819,10 +881,12 @@ int load_certs(const char *uri, int maybe_stdin, STACK_OF(X509) **certs,
int load_crls(const char *uri, STACK_OF(X509_CRL) **crls,
const char *pass, const char *desc)
{
- int was_NULL = *crls == NULL;
- int ret = load_key_certs_crls(uri, FORMAT_UNDEF, 0, pass, desc,
- NULL, NULL, NULL,
- NULL, NULL, NULL, crls);
+ int ret, was_NULL = *crls == NULL;
+
+ if (desc == NULL)
+ desc = "CRLs";
+ ret = load_key_certs_crls(uri, FORMAT_UNDEF, 0, pass, desc, 0,
+ NULL, NULL, NULL, NULL, NULL, NULL, crls);
if (!ret && was_NULL) {
sk_X509_CRL_pop_free(*crls, X509_CRL_free);
@@ -833,20 +897,38 @@ int load_crls(const char *uri, STACK_OF(X509_CRL) **crls,
static const char *format2string(int format)
{
- switch(format) {
+ switch (format) {
case FORMAT_PEM:
return "PEM";
case FORMAT_ASN1:
return "DER";
+ case FORMAT_PVK:
+ return "PVK";
+ case FORMAT_MSBLOB:
+ return "MSBLOB";
}
return NULL;
}
-/* Set type expectation, but clear it if objects of different types expected. */
-#define SET_EXPECT(expect, val) ((expect) = (expect) < 0 ? (val) : ((expect) == (val) ? (val) : 0))
+/* Set type expectation, but set to 0 if objects of multiple types expected. */
+#define SET_EXPECT(val) \
+ (expect = expect < 0 ? (val) : (expect == (val) ? (val) : 0))
+#define SET_EXPECT1(pvar, val) \
+ if ((pvar) != NULL) { \
+ *(pvar) = NULL; \
+ SET_EXPECT(val); \
+ }
+/* Provide (error msg) text for some of the credential types to be loaded. */
+#define FAIL_NAME \
+ (ppkey != NULL ? "private key" : ppubkey != NULL ? "public key" : \
+ pparams != NULL ? "key parameters" : \
+ pcert != NULL ? "certificate" : pcerts != NULL ? "certificates" : \
+ pcrl != NULL ? "CRL" : pcrls != NULL ? "CRLs" : NULL)
/*
* Load those types of credentials for which the result pointer is not NULL.
- * Reads from stdio if uri is NULL and maybe_stdin is nonzero.
+ * Reads from stdin if 'uri' is NULL and 'maybe_stdin' is nonzero.
+ * 'format' parameter may be FORMAT_PEM, FORMAT_ASN1, or 0 for no hint.
+ * desc may contain more detail on the credential(s) to be loaded for error msg
* For non-NULL ppkey, pcert, and pcrl the first suitable value found is loaded.
* If pcerts is non-NULL and *pcerts == NULL then a new cert list is allocated.
* If pcerts is non-NULL then all available certificates are appended to *pcerts
@@ -857,94 +939,88 @@ static const char *format2string(int format)
* In any case (also on error) the caller is responsible for freeing all members
* of *pcerts and *pcrls (as far as they are not NULL).
*/
-static
-int load_key_certs_crls_suppress(const char *uri, int format, int maybe_stdin,
- const char *pass, const char *desc,
- EVP_PKEY **ppkey, EVP_PKEY **ppubkey,
- EVP_PKEY **pparams,
- X509 **pcert, STACK_OF(X509) **pcerts,
- X509_CRL **pcrl, STACK_OF(X509_CRL) **pcrls,
- int suppress_decode_errors)
+int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
+ const char *pass, const char *desc, int quiet,
+ EVP_PKEY **ppkey, EVP_PKEY **ppubkey,
+ EVP_PKEY **pparams,
+ X509 **pcert, STACK_OF(X509) **pcerts,
+ X509_CRL **pcrl, STACK_OF(X509_CRL) **pcrls)
{
PW_CB_DATA uidata;
OSSL_STORE_CTX *ctx = NULL;
OSSL_LIB_CTX *libctx = app_get0_libctx();
const char *propq = app_get0_propq();
- int ncerts = 0;
- int ncrls = 0;
- const char *failed =
- ppkey != NULL ? "key" : ppubkey != NULL ? "public key" :
- pparams != NULL ? "params" : pcert != NULL ? "cert" :
- pcrl != NULL ? "CRL" : pcerts != NULL ? "certs" :
- pcrls != NULL ? "CRLs" : NULL;
- int cnt_expectations = 0;
- int expect = -1;
+ int ncerts = 0, ncrls = 0, expect = -1;
+ const char *failed = FAIL_NAME;
const char *input_type;
OSSL_PARAM itp[2];
const OSSL_PARAM *params = NULL;
- if (ppkey != NULL) {
- *ppkey = NULL;
- cnt_expectations++;
- SET_EXPECT(expect, OSSL_STORE_INFO_PKEY);
- }
- if (ppubkey != NULL) {
- *ppubkey = NULL;
- cnt_expectations++;
- SET_EXPECT(expect, OSSL_STORE_INFO_PUBKEY);
- }
- if (pparams != NULL) {
- *pparams = NULL;
- cnt_expectations++;
- SET_EXPECT(expect, OSSL_STORE_INFO_PARAMS);
- }
- if (pcert != NULL) {
- *pcert = NULL;
- cnt_expectations++;
- SET_EXPECT(expect, OSSL_STORE_INFO_CERT);
+ /* 'failed' describes type of credential to load for potential error msg */
+ if (failed == NULL) {
+ if (!quiet)
+ BIO_printf(bio_err, "Internal error: nothing was requested to load from %s\n",
+ uri != NULL ? uri : "<stdin>");
+ return 0;
}
+ /* suppress any extraneous errors left over from failed parse attempts */
+ ERR_set_mark();
+
+ SET_EXPECT1(ppkey, OSSL_STORE_INFO_PKEY);
+ SET_EXPECT1(ppubkey, OSSL_STORE_INFO_PUBKEY);
+ SET_EXPECT1(pparams, OSSL_STORE_INFO_PARAMS);
+ SET_EXPECT1(pcert, OSSL_STORE_INFO_CERT);
+ /*
+ * Up to here, the follwing holds.
+ * If just one of the ppkey, ppubkey, pparams, and pcert function parameters
+ * is nonzero, expect > 0 indicates which type of credential is expected.
+ * If expect == 0, more than one of them is nonzero (multiple types expected).
+ */
+
if (pcerts != NULL) {
if (*pcerts == NULL && (*pcerts = sk_X509_new_null()) == NULL) {
- BIO_printf(bio_err, "Out of memory loading");
+ if (!quiet)
+ BIO_printf(bio_err, "Out of memory loading");
goto end;
}
- cnt_expectations++;
- SET_EXPECT(expect, OSSL_STORE_INFO_CERT);
- }
- if (pcrl != NULL) {
- *pcrl = NULL;
- cnt_expectations++;
- SET_EXPECT(expect, OSSL_STORE_INFO_CRL);
+ /*
+ * Adapt the 'expect' variable:
+ * set to OSSL_STORE_INFO_CERT if no other type is expected so far,
+ * otherwise set to 0 (indicating that multiple types are expected).
+ */
+ SET_EXPECT(OSSL_STORE_INFO_CERT);
}
+ SET_EXPECT1(pcrl, OSSL_STORE_INFO_CRL);
if (pcrls != NULL) {
if (*pcrls == NULL && (*pcrls = sk_X509_CRL_new_null()) == NULL) {
- BIO_printf(bio_err, "Out of memory loading");
+ if (!quiet)
+ BIO_printf(bio_err, "Out of memory loading");
goto end;
}
- cnt_expectations++;
- SET_EXPECT(expect, OSSL_STORE_INFO_CRL);
- }
- if (cnt_expectations == 0) {
- BIO_printf(bio_err, "Internal error: nothing to load from %s\n",
- uri != NULL ? uri : "<stdin>");
- return 0;
+ /*
+ * Adapt the 'expect' variable:
+ * set to OSSL_STORE_INFO_CRL if no other type is expected so far,
+ * otherwise set to 0 (indicating that multiple types are expected).
+ */
+ SET_EXPECT(OSSL_STORE_INFO_CRL);
}
uidata.password = pass;
uidata.prompt_info = uri;
if ((input_type = format2string(format)) != NULL) {
- itp[0] = OSSL_PARAM_construct_utf8_string(OSSL_STORE_PARAM_INPUT_TYPE,
- (char *)input_type, 0);
- itp[1] = OSSL_PARAM_construct_end();
- params = itp;
+ itp[0] = OSSL_PARAM_construct_utf8_string(OSSL_STORE_PARAM_INPUT_TYPE,
+ (char *)input_type, 0);
+ itp[1] = OSSL_PARAM_construct_end();
+ params = itp;
}
if (uri == NULL) {
BIO *bio;
if (!maybe_stdin) {
- BIO_printf(bio_err, "No filename or uri specified for loading\n");
+ if (!quiet)
+ BIO_printf(bio_err, "No filename or uri specified for loading\n");
goto end;
}
uri = "<stdin>";
@@ -961,16 +1037,23 @@ int load_key_certs_crls_suppress(const char *uri, int format, int maybe_stdin,
params, NULL, NULL);
}
if (ctx == NULL) {
- BIO_printf(bio_err, "Could not open file or uri for loading");
+ if (!quiet)
+ BIO_printf(bio_err, "Could not open file or uri for loading");
goto end;
}
+ /* expect == 0 means here multiple types of credentials are to be loaded */
if (expect > 0 && !OSSL_STORE_expect(ctx, expect)) {
- BIO_printf(bio_err, "Internal error trying to load");
+ if (!quiet)
+ BIO_printf(bio_err, "Internal error trying to load");
goto end;
}
failed = NULL;
- while (cnt_expectations > 0 && !OSSL_STORE_eof(ctx)) {
+ /* from here, failed != NULL only if actually an error has been detected */
+
+ while ((ppkey != NULL || ppubkey != NULL || pparams != NULL
+ || pcert != NULL || pcerts != NULL || pcrl != NULL || pcrls != NULL)
+ && !OSSL_STORE_eof(ctx)) {
OSSL_STORE_INFO *info = OSSL_STORE_load(ctx);
int type, ok = 1;
@@ -988,91 +1071,85 @@ int load_key_certs_crls_suppress(const char *uri, int format, int maybe_stdin,
type = OSSL_STORE_INFO_get_type(info);
switch (type) {
case OSSL_STORE_INFO_PKEY:
- if (ppkey != NULL && *ppkey == NULL) {
+ if (ppkey != NULL) {
ok = (*ppkey = OSSL_STORE_INFO_get1_PKEY(info)) != NULL;
- cnt_expectations -= ok;
+ if (ok)
+ ppkey = NULL;
+ break;
}
/*
* An EVP_PKEY with private parts also holds the public parts,
* so if the caller asked for a public key, and we got a private
* key, we can still pass it back.
*/
- if (ok && ppubkey != NULL && *ppubkey == NULL) {
- ok = ((*ppubkey = OSSL_STORE_INFO_get1_PKEY(info)) != NULL);
- cnt_expectations -= ok;
- }
- break;
+ /* fall through */
case OSSL_STORE_INFO_PUBKEY:
- if (ppubkey != NULL && *ppubkey == NULL) {
- ok = ((*ppubkey = OSSL_STORE_INFO_get1_PUBKEY(info)) != NULL);
- cnt_expectations -= ok;
+ if (ppubkey != NULL) {
+ ok = (*ppubkey = OSSL_STORE_INFO_get1_PUBKEY(info)) != NULL;
+ if (ok)
+ ppubkey = NULL;
}
break;
case OSSL_STORE_INFO_PARAMS:
- if (pparams != NULL && *pparams == NULL) {
- ok = ((*pparams = OSSL_STORE_INFO_get1_PARAMS(info)) != NULL);
- cnt_expectations -= ok;
+ if (pparams != NULL) {
+ ok = (*pparams = OSSL_STORE_INFO_get1_PARAMS(info)) != NULL;
+ if (ok)
+ pparams = NULL;
}
break;
case OSSL_STORE_INFO_CERT:
- if (pcert != NULL && *pcert == NULL) {
+ if (pcert != NULL) {
ok = (*pcert = OSSL_STORE_INFO_get1_CERT(info)) != NULL;
- cnt_expectations -= ok;
- }
- else if (pcerts != NULL)
+ if (ok)
+ pcert = NULL;
+ } else if (pcerts != NULL) {
ok = X509_add_cert(*pcerts,
OSSL_STORE_INFO_get1_CERT(info),
X509_ADD_FLAG_DEFAULT);
+ }
ncerts += ok;
break;
case OSSL_STORE_INFO_CRL:
- if (pcrl != NULL && *pcrl == NULL) {
+ if (pcrl != NULL) {
ok = (*pcrl = OSSL_STORE_INFO_get1_CRL(info)) != NULL;
- cnt_expectations -= ok;
- }
- else if (pcrls != NULL)
+ if (ok)
+ pcrl = NULL;
+ } else if (pcrls != NULL) {
ok = sk_X509_CRL_push(*pcrls, OSSL_STORE_INFO_get1_CRL(info));
+ }
ncrls += ok;
break;
default:
- /* skip any other type */
+ /* skip any other type; ok stays == 1 */
break;
}
OSSL_STORE_INFO_free(info);
if (!ok) {
- failed = info == NULL ? NULL : OSSL_STORE_INFO_type_string(type);
- BIO_printf(bio_err, "Error reading");
+ failed = OSSL_STORE_INFO_type_string(type);
+ if (!quiet)
+ BIO_printf(bio_err, "Error reading");
break;
}
}
end:
OSSL_STORE_close(ctx);
+
+ /* see if any of the requested types of credentials was not found */
if (failed == NULL) {
- int any = 0;
-
- if ((ppkey != NULL && *ppkey == NULL)
- || (ppubkey != NULL && *ppubkey == NULL)) {
- failed = "key";
- } else if (pparams != NULL && *pparams == NULL) {
- failed = "params";
- } else if ((pcert != NULL || pcerts != NULL) && ncerts == 0) {
- if (pcert == NULL)
- any = 1;
- failed = "cert";
- } else if ((pcrl != NULL || pcrls != NULL) && ncrls == 0) {
- if (pcrl == NULL)
- any = 1;
- failed = "CRL";
- }
- if (!suppress_decode_errors) {
- if (failed != NULL)
- BIO_printf(bio_err, "Could not read");
- if (any)
- BIO_printf(bio_err, " any");
- }
+ if (ncerts > 0)
+ pcerts = NULL;
+ if (ncrls > 0)
+ pcrls = NULL;
+ failed = FAIL_NAME;
+ if (failed != NULL && !quiet)
+ BIO_printf(bio_err, "Could not find");
}
- if (!suppress_decode_errors && failed != NULL) {
+
+ if (failed != NULL && !quiet) {
+ unsigned long err = ERR_peek_last_error();
+
+ /* continue the error message with the type of credential affected */
if (desc != NULL && strstr(desc, failed) != NULL) {
BIO_printf(bio_err, " %s", desc);
} else {
@@ -1082,39 +1159,31 @@ int load_key_certs_crls_suppress(const char *uri, int format, int maybe_stdin,
}
if (uri != NULL)
BIO_printf(bio_err, " from %s", uri);
+ if (ERR_SYSTEM_ERROR(err)) {
+ /* provide more readable diagnostic output */
+ BIO_printf(bio_err, ": %s", strerror(ERR_GET_REASON(err)));
+ ERR_pop_to_mark();
+ ERR_set_mark();
+ }
BIO_printf(bio_err, "\n");
ERR_print_errors(bio_err);
}
- if (suppress_decode_errors || failed == NULL)
- /* clear any spurious errors */
- ERR_clear_error();
+ if (quiet || failed == NULL)
+ /* clear any suppressed or spurious errors */
+ ERR_pop_to_mark();
+ else
+ ERR_clear_last_mark();
return failed == NULL;
}
-int load_key_certs_crls(const char *uri, int format, int maybe_stdin,
- const char *pass, const char *desc,
- EVP_PKEY **ppkey, EVP_PKEY **ppubkey,
- EVP_PKEY **pparams,
- X509 **pcert, STACK_OF(X509) **pcerts,
- X509_CRL **pcrl, STACK_OF(X509_CRL) **pcrls)
-{
- return load_key_certs_crls_suppress(uri, format, maybe_stdin, pass, desc,
- ppkey, ppubkey, pparams, pcert, pcerts,
- pcrl, pcrls, 0);
-}
-
-#define X509V3_EXT_UNKNOWN_MASK (0xfL << 16)
-/* Return error for unknown extensions */
-#define X509V3_EXT_DEFAULT 0
-/* Print error for unknown extensions */
-#define X509V3_EXT_ERROR_UNKNOWN (1L << 16)
-/* ASN1 parse unknown extensions */
-#define X509V3_EXT_PARSE_UNKNOWN (2L << 16)
-/* BIO_dump unknown extensions */
-#define X509V3_EXT_DUMP_UNKNOWN (3L << 16)
+#define X509V3_EXT_UNKNOWN_MASK (0xfL << 16)
+#define X509V3_EXT_DEFAULT 0 /* Return error for unknown exts */
+#define X509V3_EXT_ERROR_UNKNOWN (1L << 16) /* Print error for unknown exts */
+#define X509V3_EXT_PARSE_UNKNOWN (2L << 16) /* ASN1 parse unknown extensions */
+#define X509V3_EXT_DUMP_UNKNOWN (3L << 16) /* BIO_dump unknown extensions */
#define X509_FLAG_CA (X509_FLAG_NO_ISSUER | X509_FLAG_NO_PUBKEY | \
- X509_FLAG_NO_HEADER | X509_FLAG_NO_VERSION)
+ X509_FLAG_NO_HEADER | X509_FLAG_NO_VERSION)
int set_cert_ex(unsigned long *flags, const char *arg)
{
@@ -1245,11 +1314,12 @@ int copy_extensions(X509 *x, X509_REQ *req, int copy_type)
}
static int set_multi_opts(unsigned long *flags, const char *arg,
- const NAME_EX_TBL * in_tbl)
+ const NAME_EX_TBL *in_tbl)
{
STACK_OF(CONF_VALUE) *vals;
CONF_VALUE *val;
int i, ret = 1;
+
if (!arg)
return 0;
vals = X509V3_parse_list(arg);
@@ -1263,12 +1333,12 @@ static int set_multi_opts(unsigned long *flags, const char *arg,
}
static int set_table_opts(unsigned long *flags, const char *arg,
- const NAME_EX_TBL * in_tbl)
+ const NAME_EX_TBL *in_tbl)
{
char c;
const NAME_EX_TBL *ptbl;
- c = arg[0];
+ c = arg[0];
if (c == '-') {
c = 0;
arg++;
@@ -1341,7 +1411,7 @@ void print_bignum_var(BIO *out, const BIGNUM *in, const char *var,
BIO_printf(out, "\n };\n");
}
-void print_array(BIO *out, const char* title, int len, const unsigned char* d)
+void print_array(BIO *out, const char *title, int len, const unsigned char *d)
{
int i;
@@ -1375,9 +1445,13 @@ X509_STORE *setup_verify(const char *CAfile, int noCAfile,
goto end;
if (CAfile != NULL) {
if (X509_LOOKUP_load_file_ex(lookup, CAfile, X509_FILETYPE_PEM,
- libctx, propq) <= 0) {
- BIO_printf(bio_err, "Error loading file %s\n", CAfile);
- goto end;
+ libctx, propq) <= 0) {
+ ERR_clear_error();
+ if (X509_LOOKUP_load_file_ex(lookup, CAfile, X509_FILETYPE_ASN1,
+ libctx, propq) <= 0) {
+ BIO_printf(bio_err, "Error loading file %s\n", CAfile);
+ goto end;
+ }
}
} else {
X509_LOOKUP_load_file_ex(lookup, NULL, X509_FILETYPE_DEFAULT,
@@ -1514,8 +1588,8 @@ BIGNUM *load_serial(const char *serialfile, int *exists, int create,
return ret;
}
-int save_serial(const char *serialfile, const char *suffix, const BIGNUM *serial,
- ASN1_INTEGER **retai)
+int save_serial(const char *serialfile, const char *suffix,
+ const BIGNUM *serial, ASN1_INTEGER **retai)
{
char buf[1][BSIZE];
BIO *out = NULL;
@@ -1532,13 +1606,13 @@ int save_serial(const char *serialfile, const char *suffix, const BIGNUM *serial
goto err;
}
- if (suffix == NULL)
+ if (suffix == NULL) {
OPENSSL_strlcpy(buf[0], serialfile, BSIZE);
- else {
+ } else {
#ifndef OPENSSL_SYS_VMS
- j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s.%s", serialfile, suffix);
+ BIO_snprintf(buf[0], sizeof(buf[0]), "%s.%s", serialfile, suffix);
#else
- j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s-%s", serialfile, suffix);
+ BIO_snprintf(buf[0], sizeof(buf[0]), "%s-%s", serialfile, suffix);
#endif
}
out = BIO_new_file(buf[0], "w");
@@ -1580,11 +1654,11 @@ int rotate_serial(const char *serialfile, const char *new_suffix,
goto err;
}
#ifndef OPENSSL_SYS_VMS
- j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s.%s", serialfile, new_suffix);
- j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s.%s", serialfile, old_suffix);
+ BIO_snprintf(buf[0], sizeof(buf[0]), "%s.%s", serialfile, new_suffix);
+ BIO_snprintf(buf[1], sizeof(buf[1]), "%s.%s", serialfile, old_suffix);
#else
- j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s-%s", serialfile, new_suffix);
- j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s-%s", serialfile, old_suffix);
+ BIO_snprintf(buf[0], sizeof(buf[0]), "%s-%s", serialfile, new_suffix);
+ BIO_snprintf(buf[1], sizeof(buf[1]), "%s-%s", serialfile, old_suffix);
#endif
if (rename(serialfile, buf[1]) < 0 && errno != ENOENT
#ifdef ENOTDIR
@@ -1673,21 +1747,20 @@ CA_DB *load_index(const char *dbfile, DB_ATTR *db_attr)
tmpdb = NULL;
if (db_attr)
retdb->attributes = *db_attr;
- else {
+ else
retdb->attributes.unique_subject = 1;
- }
- if (dbattr_conf) {
- char *p = NCONF_get_string(dbattr_conf, NULL, "unique_subject");
- if (p) {
- retdb->attributes.unique_subject = parse_yesno(p, 1);
- } else {
- ERR_clear_error();
- }
+ if (dbattr_conf != NULL) {
+ char *p = app_conf_try_string(dbattr_conf, NULL, "unique_subject");
+ if (p != NULL)
+ retdb->attributes.unique_subject = parse_yesno(p, 1);
}
retdb->dbfname = OPENSSL_strdup(dbfile);
+ if (retdb->dbfname == NULL)
+ goto err;
+
#ifndef OPENSSL_NO_POSIX_IO
retdb->dbst = dbst;
#endif
@@ -1740,13 +1813,13 @@ int save_index(const char *dbfile, const char *suffix, CA_DB *db)
goto err;
}
#ifndef OPENSSL_SYS_VMS
- j = BIO_snprintf(buf[2], sizeof(buf[2]), "%s.attr", dbfile);
- j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s.attr.%s", dbfile, suffix);
- j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s.%s", dbfile, suffix);
+ BIO_snprintf(buf[2], sizeof(buf[2]), "%s.attr", dbfile);
+ BIO_snprintf(buf[1], sizeof(buf[1]), "%s.attr.%s", dbfile, suffix);
+ BIO_snprintf(buf[0], sizeof(buf[0]), "%s.%s", dbfile, suffix);
#else
- j = BIO_snprintf(buf[2], sizeof(buf[2]), "%s-attr", dbfile);
- j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s-attr-%s", dbfile, suffix);
- j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s-%s", dbfile, suffix);
+ BIO_snprintf(buf[2], sizeof(buf[2]), "%s-attr", dbfile);
+ BIO_snprintf(buf[1], sizeof(buf[1]), "%s-attr-%s", dbfile, suffix);
+ BIO_snprintf(buf[0], sizeof(buf[0]), "%s-%s", dbfile, suffix);
#endif
out = BIO_new_file(buf[0], "w");
if (out == NULL) {
@@ -1790,17 +1863,17 @@ int rotate_index(const char *dbfile, const char *new_suffix,
goto err;
}
#ifndef OPENSSL_SYS_VMS
- j = BIO_snprintf(buf[4], sizeof(buf[4]), "%s.attr", dbfile);
- j = BIO_snprintf(buf[3], sizeof(buf[3]), "%s.attr.%s", dbfile, old_suffix);
- j = BIO_snprintf(buf[2], sizeof(buf[2]), "%s.attr.%s", dbfile, new_suffix);
- j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s.%s", dbfile, old_suffix);
- j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s.%s", dbfile, new_suffix);
+ BIO_snprintf(buf[4], sizeof(buf[4]), "%s.attr", dbfile);
+ BIO_snprintf(buf[3], sizeof(buf[3]), "%s.attr.%s", dbfile, old_suffix);
+ BIO_snprintf(buf[2], sizeof(buf[2]), "%s.attr.%s", dbfile, new_suffix);
+ BIO_snprintf(buf[1], sizeof(buf[1]), "%s.%s", dbfile, old_suffix);
+ BIO_snprintf(buf[0], sizeof(buf[0]), "%s.%s", dbfile, new_suffix);
#else
- j = BIO_snprintf(buf[4], sizeof(buf[4]), "%s-attr", dbfile);
- j = BIO_snprintf(buf[3], sizeof(buf[3]), "%s-attr-%s", dbfile, old_suffix);
- j = BIO_snprintf(buf[2], sizeof(buf[2]), "%s-attr-%s", dbfile, new_suffix);
- j = BIO_snprintf(buf[1], sizeof(buf[1]), "%s-%s", dbfile, old_suffix);
- j = BIO_snprintf(buf[0], sizeof(buf[0]), "%s-%s", dbfile, new_suffix);
+ BIO_snprintf(buf[4], sizeof(buf[4]), "%s-attr", dbfile);
+ BIO_snprintf(buf[3], sizeof(buf[3]), "%s-attr-%s", dbfile, old_suffix);
+ BIO_snprintf(buf[2], sizeof(buf[2]), "%s-attr-%s", dbfile, new_suffix);
+ BIO_snprintf(buf[1], sizeof(buf[1]), "%s-%s", dbfile, old_suffix);
+ BIO_snprintf(buf[0], sizeof(buf[0]), "%s-%s", dbfile, new_suffix);
#endif
if (rename(dbfile, buf[1]) < 0 && errno != ENOENT
#ifdef ENOTDIR
@@ -1911,6 +1984,7 @@ X509_NAME *parse_name(const char *cp, int chtype, int canmulti,
unsigned char *valstr;
int nid;
int ismulti = nextismulti;
+
nextismulti = 0;
/* Collect the type */
@@ -1970,7 +2044,7 @@ X509_NAME *parse_name(const char *cp, int chtype, int canmulti,
ERR_print_errors(bio_err);
BIO_printf(bio_err,
"%s: Error adding %s name attribute \"/%s=%s\"\n",
- opt_getprog(), desc, typestr ,valstr);
+ opt_getprog(), desc, typestr, valstr);
goto err;
}
}
@@ -2068,6 +2142,7 @@ void policies_print(X509_STORE_CTX *ctx)
{
X509_POLICY_TREE *tree;
int explicit_policy;
+
tree = X509_STORE_CTX_get0_policy_tree(ctx);
explicit_policy = X509_STORE_CTX_get_explicit_policy(ctx);
@@ -2119,7 +2194,7 @@ unsigned char *next_protos_parse(size_t *outlen, const char *in)
OPENSSL_free(out);
return NULL;
}
- out[start-skipped] = (unsigned char)(i - start);
+ out[start - skipped] = (unsigned char)(i - start);
start = i + 1;
} else {
out[i + 1 - skipped] = in[i];
@@ -2135,29 +2210,43 @@ unsigned char *next_protos_parse(size_t *outlen, const char *in)
return out;
}
-void print_cert_checks(BIO *bio, X509 *x,
- const char *checkhost,
- const char *checkemail, const char *checkip)
+int check_cert_attributes(BIO *bio, X509 *x, const char *checkhost,
+ const char *checkemail, const char *checkip,
+ int print)
{
+ int valid_host = 0;
+ int valid_mail = 0;
+ int valid_ip = 0;
+ int ret = 1;
+
if (x == NULL)
- return;
- if (checkhost) {
- BIO_printf(bio, "Hostname %s does%s match certificate\n",
- checkhost,
- X509_check_host(x, checkhost, 0, 0, NULL) == 1
- ? "" : " NOT");
+ return 0;
+
+ if (checkhost != NULL) {
+ valid_host = X509_check_host(x, checkhost, 0, 0, NULL);
+ if (print)
+ BIO_printf(bio, "Hostname %s does%s match certificate\n",
+ checkhost, valid_host == 1 ? "" : " NOT");
+ ret = ret && valid_host > 0;
}
- if (checkemail) {
- BIO_printf(bio, "Email %s does%s match certificate\n",
- checkemail, X509_check_email(x, checkemail, 0, 0)
- ? "" : " NOT");
+ if (checkemail != NULL) {
+ valid_mail = X509_check_email(x, checkemail, 0, 0);
+ if (print)
+ BIO_printf(bio, "Email %s does%s match certificate\n",
+ checkemail, valid_mail ? "" : " NOT");
+ ret = ret && valid_mail > 0;
}
- if (checkip) {
- BIO_printf(bio, "IP %s does%s match certificate\n",
- checkip, X509_check_ip_asc(x, checkip, 0) ? "" : " NOT");
+ if (checkip != NULL) {
+ valid_ip = X509_check_ip_asc(x, checkip, 0);
+ if (print)
+ BIO_printf(bio, "IP %s does%s match certificate\n",
+ checkip, valid_ip ? "" : " NOT");
+ ret = ret && valid_ip > 0;
}
+
+ return ret;
}
static int do_pkey_ctx_init(EVP_PKEY_CTX *pkctx, STACK_OF(OPENSSL_STRING) *opts)
@@ -2169,6 +2258,7 @@ static int do_pkey_ctx_init(EVP_PKEY_CTX *pkctx, STACK_OF(OPENSSL_STRING) *opts)
for (i = 0; i < sk_OPENSSL_STRING_num(opts); i++) {
char *opt = sk_OPENSSL_STRING_value(opts, i);
+
if (pkey_ctrl_string(pkctx, opt) <= 0) {
BIO_printf(bio_err, "parameter error \"%s\"\n", opt);
ERR_print_errors(bio_err);
@@ -2188,6 +2278,7 @@ static int do_x509_init(X509 *x, STACK_OF(OPENSSL_STRING) *opts)
for (i = 0; i < sk_OPENSSL_STRING_num(opts); i++) {
char *opt = sk_OPENSSL_STRING_value(opts, i);
+
if (x509_ctrl_string(x, opt) <= 0) {
BIO_printf(bio_err, "parameter error \"%s\"\n", opt);
ERR_print_errors(bio_err);
@@ -2207,6 +2298,7 @@ static int do_x509_req_init(X509_REQ *x, STACK_OF(OPENSSL_STRING) *opts)
for (i = 0; i < sk_OPENSSL_STRING_num(opts); i++) {
char *opt = sk_OPENSSL_STRING_value(opts, i);
+
if (x509_req_ctrl_string(x, opt) <= 0) {
BIO_printf(bio_err, "parameter error \"%s\"\n", opt);
ERR_print_errors(bio_err);
@@ -2253,50 +2345,57 @@ static int adapt_keyid_ext(X509 *cert, X509V3_CTX *ext_ctx,
idx = X509v3_get_ext_by_OBJ(exts, X509_EXTENSION_get_object(new_ext), -1);
if (idx >= 0) {
X509_EXTENSION *found_ext = X509v3_get_ext(exts, idx);
- ASN1_OCTET_STRING *data = X509_EXTENSION_get_data(found_ext);
- int disabled = ASN1_STRING_length(data) <= 2; /* config said "none" */
+ ASN1_OCTET_STRING *encoded = X509_EXTENSION_get_data(found_ext);
+ int disabled = ASN1_STRING_length(encoded) <= 2; /* indicating "none" */
if (disabled) {
X509_delete_ext(cert, idx);
X509_EXTENSION_free(found_ext);
} /* else keep existing key identifier, which might be outdated */
rv = 1;
- } else {
+ } else {
rv = !add_default || X509_add_ext(cert, new_ext, -1);
}
X509_EXTENSION_free(new_ext);
return rv;
}
+int cert_matches_key(const X509 *cert, const EVP_PKEY *pkey)
+{
+ int match;
+
+ ERR_set_mark();
+ match = X509_check_private_key(cert, pkey);
+ ERR_pop_to_mark();
+ return match;
+}
+
/* Ensure RFC 5280 compliance, adapt keyIDs as needed, and sign the cert info */
-int do_X509_sign(X509 *cert, EVP_PKEY *pkey, const char *md,
+int do_X509_sign(X509 *cert, int force_v1, EVP_PKEY *pkey, const char *md,
STACK_OF(OPENSSL_STRING) *sigopts, X509V3_CTX *ext_ctx)
{
- const STACK_OF(X509_EXTENSION) *exts = X509_get0_extensions(cert);
EVP_MD_CTX *mctx = EVP_MD_CTX_new();
int self_sign;
int rv = 0;
- if (sk_X509_EXTENSION_num(exts /* may be NULL */) > 0) {
- /* Prevent X509_V_ERR_EXTENSIONS_REQUIRE_VERSION_3 */
+ if (!force_v1) {
if (!X509_set_version(cert, X509_VERSION_3))
goto end;
/*
- * Add default SKID before such that default AKID can make use of it
+ * Add default SKID before AKID such that AKID can make use of it
* in case the certificate is self-signed
*/
/* Prevent X509_V_ERR_MISSING_SUBJECT_KEY_IDENTIFIER */
if (!adapt_keyid_ext(cert, ext_ctx, "subjectKeyIdentifier", "hash", 1))
goto end;
/* Prevent X509_V_ERR_MISSING_AUTHORITY_KEY_IDENTIFIER */
- ERR_set_mark();
- self_sign = X509_check_private_key(cert, pkey);
- ERR_pop_to_mark();
+ self_sign = cert_matches_key(cert, pkey);
if (!adapt_keyid_ext(cert, ext_ctx, "authorityKeyIdentifier",
"keyid, issuer", !self_sign))
goto end;
}
+ /* May add further measures for ensuring RFC 5280 compliance, see #19805 */
if (mctx != NULL && do_sign_init(mctx, pkey, md, sigopts) > 0)
rv = (X509_sign_ctx(cert, mctx) > 0);
@@ -2356,8 +2455,7 @@ int do_X509_REQ_verify(X509_REQ *x, EVP_PKEY *pkey,
int rv = 0;
if (do_x509_req_init(x, vfyopts) > 0)
- rv = X509_REQ_verify_ex(x, pkey,
- app_get0_libctx(), app_get0_propq());
+ rv = X509_REQ_verify_ex(x, pkey, app_get0_libctx(), app_get0_propq());
else
rv = -1;
return rv;
@@ -2371,6 +2469,7 @@ static const char *get_dp_url(DIST_POINT *dp)
GENERAL_NAME *gen;
int i, gtype;
ASN1_STRING *uri;
+
if (!dp->distpoint || dp->distpoint->type != 0)
return NULL;
gens = dp->distpoint->name.fullname;
@@ -2396,8 +2495,10 @@ static X509_CRL *load_crl_crldp(STACK_OF(DIST_POINT) *crldp)
{
int i;
const char *urlptr = NULL;
+
for (i = 0; i < sk_DIST_POINT_num(crldp); i++) {
DIST_POINT *dp = sk_DIST_POINT_value(crldp, i);
+
urlptr = get_dp_url(dp);
if (urlptr != NULL)
return load_crl(urlptr, FORMAT_UNDEF, 0, "CRL via CDP");
@@ -2425,18 +2526,24 @@ static STACK_OF(X509_CRL) *crls_http_cb(const X509_STORE_CTX *ctx,
crldp = X509_get_ext_d2i(x, NID_crl_distribution_points, NULL, NULL);
crl = load_crl_crldp(crldp);
sk_DIST_POINT_pop_free(crldp, DIST_POINT_free);
- if (!crl) {
- sk_X509_CRL_free(crls);
- return NULL;
- }
- sk_X509_CRL_push(crls, crl);
+
+ if (crl == NULL || !sk_X509_CRL_push(crls, crl))
+ goto error;
+
/* Try to download delta CRL */
crldp = X509_get_ext_d2i(x, NID_freshest_crl, NULL, NULL);
crl = load_crl_crldp(crldp);
sk_DIST_POINT_pop_free(crldp, DIST_POINT_free);
- if (crl)
- sk_X509_CRL_push(crls, crl);
+
+ if (crl != NULL && !sk_X509_CRL_push(crls, crl))
+ goto error;
+
return crls;
+
+error:
+ X509_CRL_free(crl);
+ sk_X509_CRL_free(crls);
+ return NULL;
}
void store_setup_crl_download(X509_STORE *st)
@@ -2444,7 +2551,7 @@ void store_setup_crl_download(X509_STORE *st)
X509_STORE_set_lookup_crls_cb(st, crls_http_cb);
}
-#ifndef OPENSSL_NO_SOCK
+#if !defined(OPENSSL_NO_SOCK) && !defined(OPENSSL_NO_HTTP)
static const char *tls_error_hint(void)
{
unsigned long err = ERR_peek_error();
@@ -2452,7 +2559,7 @@ static const char *tls_error_hint(void)
if (ERR_GET_LIB(err) != ERR_LIB_SSL)
err = ERR_peek_last_error();
if (ERR_GET_LIB(err) != ERR_LIB_SSL)
- return NULL;
+ return NULL; /* likely no TLS error */
switch (ERR_GET_REASON(err)) {
case SSL_R_WRONG_VERSION_NUMBER:
@@ -2465,11 +2572,29 @@ static const char *tls_error_hint(void)
return "Server did not accept our TLS certificate, likely due to mismatch with server's trust anchor or missing revocation status";
case SSL_AD_REASON_OFFSET + SSL3_AD_HANDSHAKE_FAILURE:
return "TLS handshake failure. Possibly the server requires our TLS certificate but did not receive it";
- default: /* no error or no hint available for error */
- return NULL;
+ default:
+ return NULL; /* no hint available for TLS error */
}
}
+static BIO *http_tls_shutdown(BIO *bio)
+{
+ if (bio != NULL) {
+ BIO *cbio;
+ const char *hint = tls_error_hint();
+
+ if (hint != NULL)
+ BIO_printf(bio_err, "%s\n", hint);
+ (void)ERR_set_mark();
+ BIO_ssl_shutdown(bio);
+ cbio = BIO_pop(bio); /* connect+HTTP BIO */
+ BIO_free(bio); /* SSL BIO */
+ (void)ERR_pop_to_mark(); /* hide SSL_R_READ_BIO_NOT_SET etc. */
+ bio = cbio;
+ }
+ return bio;
+}
+
/* HTTP callback function that supports TLS connection also via HTTPS proxy */
BIO *app_http_tls_cb(BIO *bio, void *arg, int connect, int detail)
{
@@ -2494,7 +2619,7 @@ BIO *app_http_tls_cb(BIO *bio, void *arg, int connect, int detail)
|| (sbio = BIO_new(BIO_f_ssl())) == NULL) {
return NULL;
}
- if (ssl_ctx == NULL || (ssl = SSL_new(ssl_ctx)) == NULL) {
+ if ((ssl = SSL_new(ssl_ctx)) == NULL) {
BIO_free(sbio);
return NULL;
}
@@ -2506,24 +2631,8 @@ BIO *app_http_tls_cb(BIO *bio, void *arg, int connect, int detail)
BIO_set_ssl(sbio, ssl, BIO_CLOSE);
bio = BIO_push(sbio, bio);
- }
- if (!connect) {
- const char *hint;
- BIO *cbio;
-
- if (!detail) { /* disconnecting after error */
- hint = tls_error_hint();
- if (hint != NULL)
- ERR_add_error_data(2, " : ", hint);
- }
- if (ssl_ctx != NULL) {
- (void)ERR_set_mark();
- BIO_ssl_shutdown(bio);
- cbio = BIO_pop(bio); /* connect+HTTP BIO */
- BIO_free(bio); /* SSL BIO */
- (void)ERR_pop_to_mark(); /* hide SSL_R_READ_BIO_NOT_SET etc. */
- bio = cbio;
- }
+ } else { /* disconnect from TLS */
+ bio = http_tls_shutdown(bio);
}
return bio;
}
@@ -2648,18 +2757,18 @@ static int WIN32_rename(const char *from, const char *to)
tfrom = (TCHAR *)from;
tto = (TCHAR *)to;
} else { /* UNICODE path */
-
size_t i, flen = strlen(from) + 1, tlen = strlen(to) + 1;
+
tfrom = malloc(sizeof(*tfrom) * (flen + tlen));
if (tfrom == NULL)
goto err;
tto = tfrom + flen;
-# if !defined(_WIN32_WCE) || _WIN32_WCE>=101
+# if !defined(_WIN32_WCE) || _WIN32_WCE >= 101
if (!MultiByteToWideChar(CP_ACP, 0, from, flen, (WCHAR *)tfrom, flen))
# endif
for (i = 0; i < flen; i++)
tfrom[i] = (TCHAR)from[i];
-# if !defined(_WIN32_WCE) || _WIN32_WCE>=101
+# if !defined(_WIN32_WCE) || _WIN32_WCE >= 101
if (!MultiByteToWideChar(CP_ACP, 0, to, tlen, (WCHAR *)tto, tlen))
# endif
for (i = 0; i < tlen; i++)
@@ -2697,6 +2806,7 @@ double app_tminterval(int stop, int usertime)
double ret = 0;
static ULARGE_INTEGER tmstart;
static int warning = 1;
+ int use_GetSystemTime = 1;
# ifdef _WIN32_WINNT
static HANDLE proc = NULL;
@@ -2710,10 +2820,12 @@ double app_tminterval(int stop, int usertime)
if (usertime && proc != (HANDLE) - 1) {
FILETIME junk;
+
GetProcessTimes(proc, &junk, &junk, &junk, &now);
- } else
+ use_GetSystemTime = 0;
+ }
# endif
- {
+ if (use_GetSystemTime) {
SYSTEMTIME systime;
if (usertime && warning) {
@@ -2793,6 +2905,7 @@ double app_tminterval(int stop, int usertime)
tmstart = now;
} else {
long int tck = sysconf(_SC_CLK_TCK);
+
ret = (now - tmstart) / (double)tck;
}
@@ -2825,7 +2938,7 @@ double app_tminterval(int stop, int usertime)
}
#endif
-int app_access(const char* name, int flag)
+int app_access(const char *name, int flag)
{
#ifdef _WIN32
return _access(name, flag);
@@ -2846,7 +2959,7 @@ static int stdin_sock = -1;
static void close_stdin_sock(void)
{
- TerminalSocket (TERM_SOCK_DELETE, &stdin_sock);
+ TerminalSocket(TERM_SOCK_DELETE, &stdin_sock);
}
int fileno_stdin(void)
@@ -2874,6 +2987,7 @@ int fileno_stdout(void)
int raw_read_stdin(void *buf, int siz)
{
DWORD n;
+
if (ReadFile(GetStdHandle(STD_INPUT_HANDLE), buf, siz, &n, NULL))
return n;
else
@@ -2887,11 +3001,6 @@ int raw_read_stdin(void *buf, int siz)
return recv(fileno_stdin(), buf, siz, 0);
}
#else
-# if defined(__TANDEM)
-# if defined(OPENSSL_TANDEM_FLOSS)
-# include <floss.h(floss_read)>
-# endif
-# endif
int raw_read_stdin(void *buf, int siz)
{
return read(fileno_stdin(), buf, siz);
@@ -2902,27 +3011,19 @@ int raw_read_stdin(void *buf, int siz)
int raw_write_stdout(const void *buf, int siz)
{
DWORD n;
+
if (WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), buf, siz, &n, NULL))
return n;
else
return -1;
}
-#elif defined(OPENSSL_SYS_TANDEM) && defined(OPENSSL_THREADS) && defined(_SPT_MODEL_)
-# if defined(__TANDEM)
-# if defined(OPENSSL_TANDEM_FLOSS)
-# include <floss.h(floss_write)>
-# endif
-# endif
-int raw_write_stdout(const void *buf,int siz)
+#elif defined(OPENSSL_SYS_TANDEM) && defined(OPENSSL_THREADS) \
+ && defined(_SPT_MODEL_)
+int raw_write_stdout(const void *buf, int siz)
{
- return write(fileno(stdout),(void*)buf,siz);
+ return write(fileno(stdout), (void *)buf, siz);
}
#else
-# if defined(__TANDEM)
-# if defined(OPENSSL_TANDEM_FLOSS)
-# include <floss.h(floss_write)>
-# endif
-# endif
int raw_write_stdout(const void *buf, int siz)
{
return write(fileno_stdout(), buf, siz);
@@ -2969,6 +3070,7 @@ BIO *dup_bio_err(int format)
{
BIO *b = BIO_new_fp(stderr,
BIO_NOCLOSE | (FMT_istext(format) ? BIO_FP_TEXT : 0));
+
#ifdef OPENSSL_SYS_VMS
if (b != NULL && FMT_istext(format))
b = BIO_push(BIO_new(BIO_f_linebuffer()), b);
@@ -3057,7 +3159,8 @@ BIO *bio_open_owner(const char *filename, int format, int private)
}
# ifdef OPENSSL_SYS_VMS
- /* VMS doesn't have O_BINARY, it just doesn't make sense. But,
+ /*
+ * VMS doesn't have O_BINARY, it just doesn't make sense. But,
* it still needs to know that we're going binary, or fdopen()
* will fail with "invalid argument"... so we tell VMS what the
* context is.
@@ -3139,6 +3242,32 @@ BIO *bio_open_default_quiet(const char *filename, char mode, int format)
return bio_open_default_(filename, mode, format, 1);
}
+int mem_bio_to_file(BIO *in, const char *filename, int format, int private)
+{
+ int rv = 0, ret = 0;
+ BIO *out = NULL;
+ BUF_MEM *mem_buffer = NULL;
+
+ rv = BIO_get_mem_ptr(in, &mem_buffer);
+ if (rv <= 0) {
+ BIO_puts(bio_err, "Error reading mem buffer\n");
+ goto end;
+ }
+ out = bio_open_owner(filename, format, private);
+ if (out == NULL)
+ goto end;
+ rv = BIO_write(out, mem_buffer->data, mem_buffer->length);
+ if (rv < 0 || (size_t)rv != mem_buffer->length)
+ BIO_printf(bio_err, "Error writing to output file: '%s'\n", filename);
+ else
+ ret = 1;
+end:
+ if (!ret)
+ ERR_print_errors(bio_err);
+ BIO_free_all(out);
+ return ret;
+}
+
void wait_for_async(SSL *s)
{
/* On Windows select only works for sockets, so we simply don't wait */
@@ -3201,27 +3330,59 @@ int has_stdin_waiting(void)
/* Corrupt a signature by modifying final byte */
void corrupt_signature(const ASN1_STRING *signature)
{
- unsigned char *s = signature->data;
- s[signature->length - 1] ^= 0x1;
+ unsigned char *s = signature->data;
+
+ s[signature->length - 1] ^= 0x1;
+}
+
+int check_cert_time_string(const char *time, const char *desc)
+{
+ if (time == NULL || strcmp(time, "today") == 0
+ || ASN1_TIME_set_string_X509(NULL, time))
+ return 1;
+ BIO_printf(bio_err,
+ "%s is invalid, it should be \"today\" or have format [CC]YYMMDDHHMMSSZ\n",
+ desc);
+ return 0;
}
int set_cert_times(X509 *x, const char *startdate, const char *enddate,
- int days)
+ int days, int strict_compare_times)
{
+ if (!check_cert_time_string(startdate, "start date"))
+ return 0;
+ if (!check_cert_time_string(enddate, "end date"))
+ return 0;
if (startdate == NULL || strcmp(startdate, "today") == 0) {
- if (X509_gmtime_adj(X509_getm_notBefore(x), 0) == NULL)
+ if (X509_gmtime_adj(X509_getm_notBefore(x), 0) == NULL) {
+ BIO_printf(bio_err, "Error setting notBefore certificate field\n");
return 0;
+ }
} else {
- if (!ASN1_TIME_set_string_X509(X509_getm_notBefore(x), startdate))
+ if (!ASN1_TIME_set_string_X509(X509_getm_notBefore(x), startdate)) {
+ BIO_printf(bio_err, "Error setting notBefore certificate field\n");
return 0;
+ }
+ }
+ if (enddate != NULL && strcmp(enddate, "today") == 0) {
+ enddate = NULL;
+ days = 0;
}
if (enddate == NULL) {
- if (X509_time_adj_ex(X509_getm_notAfter(x), days, 0, NULL)
- == NULL)
+ if (X509_time_adj_ex(X509_getm_notAfter(x), days, 0, NULL) == NULL) {
+ BIO_printf(bio_err, "Error setting notAfter certificate field\n");
return 0;
+ }
} else if (!ASN1_TIME_set_string_X509(X509_getm_notAfter(x), enddate)) {
+ BIO_printf(bio_err, "Error setting notAfter certificate field\n");
return 0;
}
+ if (ASN1_TIME_compare(X509_get0_notAfter(x), X509_get0_notBefore(x)) < 0) {
+ BIO_printf(bio_err, "%s: end date before start date\n",
+ strict_compare_times ? "Error" : "Warning");
+ if (strict_compare_times)
+ return 0;
+ }
return 1;
}
@@ -3284,18 +3445,6 @@ void make_uppercase(char *string)
string[i] = toupper((unsigned char)string[i]);
}
-/* This function is defined here due to visibility of bio_err */
-int opt_printf_stderr(const char *fmt, ...)
-{
- va_list ap;
- int ret;
-
- va_start(ap, fmt);
- ret = BIO_vprintf(bio_err, fmt, ap);
- va_end(ap);
- return ret;
-}
-
OSSL_PARAM *app_params_new_from_opts(STACK_OF(OPENSSL_STRING) *opts,
const OSSL_PARAM *paramdefs)
{
@@ -3390,6 +3539,7 @@ int opt_legacy_okay(void)
{
int provider_options = opt_provider_option_given();
int libctx = app_get0_libctx() != NULL || app_get0_propq() != NULL;
+
/*
* Having a provider option specified or a custom library context or
* property query, is a sure sign we're not using legacy.
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-09 23:38:22 +0000