diff options
author | Rob Percival <robpercival@google.com> | 2016-03-10 18:17:23 +0000 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-03-10 14:53:04 -0500 |
commit | 8359b57f27bbc320c3c08035917d829b303ea850 (patch) | |
tree | 0a63789a4ffb5b5562a5d5716d9dd502f877eff7 /crypto/ct/ct_prn.c | |
parent | f0667b1430bac3b8c9c5b76985ad24cf9b13a0a9 (diff) |
check reviewer --reviewer=emilia
Remove 'log' field from SCT and related accessors
In order to still have access to an SCT's CTLOG when calling SCT_print,
SSL_CTX_get0_ctlog_store has been added.
Improved documentation for some CT functions in openssl/ssl.h.
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/ct/ct_prn.c')
-rw-r--r-- | crypto/ct/ct_prn.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/crypto/ct/ct_prn.c b/crypto/ct/ct_prn.c index c2e11b1e24..239ffc832c 100644 --- a/crypto/ct/ct_prn.c +++ b/crypto/ct/ct_prn.c @@ -96,7 +96,7 @@ static void timestamp_print(uint64_t timestamp, BIO *out) ASN1_GENERALIZEDTIME_free(gen); } -void SCT_print(const SCT *sct, BIO *out, int indent) +void SCT_print(const SCT *sct, BIO *out, int indent, const CTLOG *log) { BIO_printf(out, "%*sSigned Certificate Timestamp:", indent, ""); BIO_printf(out, "\n%*sVersion : ", indent + 4, ""); @@ -109,9 +109,9 @@ void SCT_print(const SCT *sct, BIO *out, int indent) BIO_printf(out, "v1 (0x0)"); - if (sct->log != NULL) { + if (log != NULL) { BIO_printf(out, "\n%*sLog : %s", indent + 4, "", - SCT_get0_log_name(sct)); + CTLOG_get0_name(log)); } BIO_printf(out, "\n%*sLog ID : ", indent + 4, ""); @@ -133,13 +133,20 @@ void SCT_print(const SCT *sct, BIO *out, int indent) } void SCT_LIST_print(const STACK_OF(SCT) *sct_list, BIO *out, int indent, - const char *separator) + const char *separator, const CTLOG_STORE *log_store) { int i; for (i = 0; i < sk_SCT_num(sct_list); ++i) { SCT *sct = sk_SCT_value(sct_list, i); - SCT_print(sct, out, indent); + const CTLOG *log = NULL; + + if (log_store != NULL) { + log = CTLOG_STORE_get0_log_by_id(log_store, sct->log_id, + sct->log_id_len); + } + + SCT_print(sct, out, indent, log); if (i < sk_SCT_num(sct_list) - 1) BIO_printf(out, "%s", separator); } |