diff options
| author | Rob Percival <robpercival@google.com> | 2016-03-04 19:51:43 +0000 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-03-09 11:34:48 -0500 |
| commit | 5da65ef23ce30285e87652469298ce6513560032 (patch) | |
| tree | 5705e2768ab285d640e8d06172903dc158d42354 /crypto/ct/ct_sct_ctx.c | |
| parent | 8fbb93d0e24da283a21bb48c4361e20a17bba955 (diff) | |
| download | openssl-5da65ef23ce30285e87652469298ce6513560032.tar.gz | |
Extensive application of __owur to CT functions that return a boolean
Also improves some documentation of those functions.
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/ct/ct_sct_ctx.c')
| -rw-r--r-- | crypto/ct/ct_sct_ctx.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/crypto/ct/ct_sct_ctx.c b/crypto/ct/ct_sct_ctx.c index 7c50c91d69..89051d2f7c 100644 --- a/crypto/ct/ct_sct_ctx.c +++ b/crypto/ct/ct_sct_ctx.c @@ -111,7 +111,7 @@ static int ct_x509_get_ext(X509 *cert, int nid, int *is_duplicated) * AKID from the presigner certificate, if necessary. * Returns 1 on success, 0 otherwise. */ -static int ct_x509_cert_fixup(X509 *cert, X509 *presigner) +__owur static int ct_x509_cert_fixup(X509 *cert, X509 *presigner) { int preidx, certidx; int pre_akid_ext_is_dup, cert_akid_ext_is_dup; @@ -230,10 +230,10 @@ err: return 0; } -static int ct_public_key_hash(X509_PUBKEY *pkey, unsigned char **hash, - size_t *hash_len) +__owur static int ct_public_key_hash(X509_PUBKEY *pkey, unsigned char **hash, + size_t *hash_len) { - int ret = -1; + int ret = 0; unsigned char *md = NULL, *der = NULL; int der_len; unsigned int md_len; @@ -271,8 +271,7 @@ static int ct_public_key_hash(X509_PUBKEY *pkey, unsigned char **hash, int SCT_CTX_set1_issuer(SCT_CTX *sctx, const X509 *issuer) { - return ct_public_key_hash(X509_get_X509_PUBKEY(issuer), &sctx->ihash, - &sctx->ihashlen); + return SCT_CTX_set1_issuer_pubkey(sctx, X509_get_X509_PUBKEY(issuer)); } int SCT_CTX_set1_issuer_pubkey(SCT_CTX *sctx, X509_PUBKEY *pubkey) |