QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-04-29 03:04:37 +00:00
Code Issues Projects Releases Wiki Activity

Removes CTLOG_new_null from the CT public API

Browse Source 
This is an entirely useless function, given that CTLOG is publicly
immutable.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1406)
This commit is contained in:
Rob Percival 2016-08-04 18:48:48 +01:00 committed by Rich Salz
parent 850864d81c
commit 1ccbe6b32c
3 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crypto/ct/ct_err.c
View File

@ -22,7 +22,6 @@ static ERR_STRING_DATA CT_str_functs[] = {
{ERR_FUNC(CT_F_CTLOG_NEW), "CTLOG_new"}, {ERR_FUNC(CT_F_CTLOG_NEW), "CTLOG_new"},
{ERR_FUNC(CT_F_CTLOG_NEW_FROM_BASE64), "CTLOG_new_from_base64"}, {ERR_FUNC(CT_F_CTLOG_NEW_FROM_BASE64), "CTLOG_new_from_base64"},
{ERR_FUNC(CT_F_CTLOG_NEW_FROM_CONF), "ctlog_new_from_conf"}, {ERR_FUNC(CT_F_CTLOG_NEW_FROM_CONF), "ctlog_new_from_conf"},
{ERR_FUNC(CT_F_CTLOG_NEW_NULL), "CTLOG_new_null"},
{ERR_FUNC(CT_F_CTLOG_STORE_LOAD_CTX_NEW), "ctlog_store_load_ctx_new"}, {ERR_FUNC(CT_F_CTLOG_STORE_LOAD_CTX_NEW), "ctlog_store_load_ctx_new"},
{ERR_FUNC(CT_F_CTLOG_STORE_LOAD_FILE), "CTLOG_STORE_load_file"}, {ERR_FUNC(CT_F_CTLOG_STORE_LOAD_FILE), "CTLOG_STORE_load_file"},
{ERR_FUNC(CT_F_CTLOG_STORE_LOAD_LOG), "ctlog_store_load_log"}, {ERR_FUNC(CT_F_CTLOG_STORE_LOAD_LOG), "ctlog_store_load_log"},

16
crypto/ct/ct_log.c
View File

@ -234,10 +234,12 @@ end:
*/ */
CTLOG *CTLOG_new(EVP_PKEY *public_key, const char *name) 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; return NULL;
}
ret->name = OPENSSL_strdup(name); ret->name = OPENSSL_strdup(name);
if (ret->name == NULL) { if (ret->name == NULL) {
@ -255,16 +257,6 @@ err:
return NULL; 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 */ /* Frees CT log and associated structures */
void CTLOG_free(CTLOG *log) void CTLOG_free(CTLOG *log)
{ {

6
include/openssl/ct.h
View File

@ -412,12 +412,6 @@ __owur int o2i_SCT_signature(SCT *sct, const unsigned char **in, size_t len);
*/ */
CTLOG *CTLOG_new(EVP_PKEY *public_key, const char *name); CTLOG *CTLOG_new(EVP_PKEY *public_key, const char *name);
/*
* Creates a new, blank CT log instance.
* Should be deleted by the caller using CTLOG_free when no longer needed.
*/
CTLOG *CTLOG_new_null(void);
/* /*
* Creates a new CT |ct_log| instance with the given base64 public_key and |name|. * Creates a new CT |ct_log| instance with the given base64 public_key and |name|.
* Should be deleted by the caller using CTLOG_free when no longer needed. * Should be deleted by the caller using CTLOG_free when no longer needed.