}
}
-static CTLOG *ctlog_new_from_conf(const CONF *conf, const char *section)
+static int ctlog_new_from_conf(CTLOG **ct_log, const CONF *conf, const char *section)
{
- CTLOG *ret = NULL;
const char *description = NCONF_get_string(conf, section, "description");
char *pkey_base64;
if (description == NULL) {
CTerr(CT_F_CTLOG_NEW_FROM_CONF, CT_R_LOG_CONF_MISSING_DESCRIPTION);
- goto end;
+ return 0;
}
pkey_base64 = NCONF_get_string(conf, section, "key");
if (pkey_base64 == NULL) {
CTerr(CT_F_CTLOG_NEW_FROM_CONF, CT_R_LOG_CONF_MISSING_KEY);
- goto end;
- }
-
- ret = CTLOG_new_from_base64(pkey_base64, description);
- if (ret == NULL) {
- CTerr(CT_F_CTLOG_NEW_FROM_CONF, CT_R_LOG_CONF_INVALID);
- goto end;
+ return 0;
}
-end:
- return ret;
+ return CTLOG_new_from_base64(ct_log, pkey_base64, description);
}
int CTLOG_STORE_load_default_file(CTLOG_STORE *store)
}
/*
- * Called by CONF_parse_list, which stops if this returns <= 0, so don't unless
- * something very bad happens. Otherwise, one bad log entry would stop loading
- * of any of the following log entries.
+ * Called by CONF_parse_list, which stops if this returns <= 0,
+ * Otherwise, one bad log entry would stop loading of any of
+ * the following log entries.
+ * It may stop parsing and returns -1 on any internal (malloc) error.
*/
static int ctlog_store_load_log(const char *log_name, int log_name_len,
void *arg)
CTLOG *ct_log = NULL;
/* log_name may not be null-terminated, so fix that before using it */
char *tmp;
+ int ret = 0;
/* log_name will be NULL for empty list entries */
if (log_name == NULL)
if (tmp == NULL)
goto mem_err;
- ct_log = ctlog_new_from_conf(load_ctx->conf, tmp);
+ ret = ctlog_new_from_conf(&ct_log, load_ctx->conf, tmp);
OPENSSL_free(tmp);
- if (ct_log == NULL) {
- /* TODO: split invalid input case from internal failure */
+
+ if (ret < 0) {
+ /* Propagate any internal error */
+ return ret;
+ }
+ if (ret == 0) {
/* If we can't load this log, record that fact and skip it */
++load_ctx->invalid_log_entries;
return 1;
*/
CTLOG *CTLOG_new(EVP_PKEY *public_key, const char *name)
{
- CTLOG *ret = CTLOG_new_null();
+ CTLOG *ret = OPENSSL_zalloc(sizeof(*ret));
- if (ret == NULL)
+ if (ret == NULL) {
+ CTerr(CT_F_CTLOG_NEW, ERR_R_MALLOC_FAILURE);
return NULL;
+ }
ret->name = OPENSSL_strdup(name);
if (ret->name == NULL) {
goto err;
}
- ret->public_key = public_key;
if (ct_v1_log_id_from_pkey(public_key, ret->log_id) != 1)
goto err;
+ ret->public_key = public_key;
return ret;
err:
CTLOG_free(ret);
return NULL;
}
-CTLOG *CTLOG_new_null(void)
-{
- CTLOG *ret = OPENSSL_zalloc(sizeof(*ret));
-
- if (ret == NULL)
- CTerr(CT_F_CTLOG_NEW_NULL, ERR_R_MALLOC_FAILURE);
-
- return ret;
-}
-
/* Frees CT log and associated structures */
void CTLOG_free(CTLOG *log)
{