diff options
Diffstat (limited to 'crypto/ess/ess_lib.c')
| -rw-r--r-- | crypto/ess/ess_lib.c | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/crypto/ess/ess_lib.c b/crypto/ess/ess_lib.c index cd42f951f7b8..d97f0e795026 100644 --- a/crypto/ess/ess_lib.c +++ b/crypto/ess/ess_lib.c @@ -16,14 +16,14 @@ #include "crypto/x509.h" static ESS_CERT_ID *ESS_CERT_ID_new_init(const X509 *cert, - int set_issuer_serial); + int set_issuer_serial); static ESS_CERT_ID_V2 *ESS_CERT_ID_V2_new_init(const EVP_MD *hash_alg, - const X509 *cert, - int set_issuer_serial); + const X509 *cert, + int set_issuer_serial); ESS_SIGNING_CERT *OSSL_ESS_signing_cert_new_init(const X509 *signcert, - const STACK_OF(X509) *certs, - int set_issuer_serial) + const STACK_OF(X509) *certs, + int set_issuer_serial) { ESS_CERT_ID *cid = NULL; ESS_SIGNING_CERT *sc; @@ -47,7 +47,7 @@ ESS_SIGNING_CERT *OSSL_ESS_signing_cert_new_init(const X509 *signcert, } return sc; - err: +err: ESS_SIGNING_CERT_free(sc); ESS_CERT_ID_free(cid); ERR_raise(ERR_LIB_ESS, ERR_R_MALLOC_FAILURE); @@ -55,7 +55,7 @@ ESS_SIGNING_CERT *OSSL_ESS_signing_cert_new_init(const X509 *signcert, } static ESS_CERT_ID *ESS_CERT_ID_new_init(const X509 *cert, - int set_issuer_serial) + int set_issuer_serial) { ESS_CERT_ID *cid = NULL; GENERAL_NAME *name = NULL; @@ -82,14 +82,13 @@ static ESS_CERT_ID *ESS_CERT_ID_new_init(const X509 *cert, goto err; if (!sk_GENERAL_NAME_push(cid->issuer_serial->issuer, name)) goto err; - name = NULL; /* Ownership is lost. */ + name = NULL; /* Ownership is lost. */ ASN1_INTEGER_free(cid->issuer_serial->serial); - if ((cid->issuer_serial->serial = - ASN1_INTEGER_dup(X509_get0_serialNumber(cert))) == NULL) + if ((cid->issuer_serial->serial = ASN1_INTEGER_dup(X509_get0_serialNumber(cert))) == NULL) goto err; return cid; - err: +err: GENERAL_NAME_free(name); ESS_CERT_ID_free(cid); ERR_raise(ERR_LIB_ESS, ERR_R_MALLOC_FAILURE); @@ -97,10 +96,9 @@ static ESS_CERT_ID *ESS_CERT_ID_new_init(const X509 *cert, } ESS_SIGNING_CERT_V2 *OSSL_ESS_signing_cert_v2_new_init(const EVP_MD *hash_alg, - const X509 *signcert, - const - STACK_OF(X509) *certs, - int set_issuer_serial) + const X509 *signcert, + const STACK_OF(X509) *certs, + int set_issuer_serial) { ESS_CERT_ID_V2 *cid = NULL; ESS_SIGNING_CERT_V2 *sc; @@ -126,7 +124,7 @@ ESS_SIGNING_CERT_V2 *OSSL_ESS_signing_cert_v2_new_init(const EVP_MD *hash_alg, } return sc; - err: +err: ESS_SIGNING_CERT_V2_free(sc); ESS_CERT_ID_V2_free(cid); ERR_raise(ERR_LIB_ESS, ERR_R_MALLOC_FAILURE); @@ -134,8 +132,8 @@ ESS_SIGNING_CERT_V2 *OSSL_ESS_signing_cert_v2_new_init(const EVP_MD *hash_alg, } static ESS_CERT_ID_V2 *ESS_CERT_ID_V2_new_init(const EVP_MD *hash_alg, - const X509 *cert, - int set_issuer_serial) + const X509 *cert, + int set_issuer_serial) { ESS_CERT_ID_V2 *cid; GENERAL_NAME *name = NULL; @@ -179,14 +177,14 @@ static ESS_CERT_ID_V2 *ESS_CERT_ID_V2_new_init(const EVP_MD *hash_alg, goto err; if (!sk_GENERAL_NAME_push(cid->issuer_serial->issuer, name)) goto err; - name = NULL; /* Ownership is lost. */ + name = NULL; /* Ownership is lost. */ ASN1_INTEGER_free(cid->issuer_serial->serial); cid->issuer_serial->serial = ASN1_INTEGER_dup(X509_get0_serialNumber(cert)); if (cid->issuer_serial->serial == NULL) goto err; return cid; - err: +err: X509_ALGOR_free(alg); GENERAL_NAME_free(name); ESS_CERT_ID_V2_free(cid); @@ -215,7 +213,7 @@ static int ess_issuer_serial_cmp(const ESS_ISSUER_SERIAL *is, const X509 *cert) * Return 0 on not found, -1 on error, else 1 + the position in |certs|. */ static int find(const ESS_CERT_ID *cid, const ESS_CERT_ID_V2 *cid_v2, - int index, const STACK_OF(X509) *certs) + int index, const STACK_OF(X509) *certs) { const X509 *cert; EVP_MD *md = NULL; @@ -256,13 +254,14 @@ static int find(const ESS_CERT_ID *cid, const ESS_CERT_ID_V2 *cid_v2, cid_hash_len = cid != NULL ? cid->hash->length : cid_v2->hash->length; if (!X509_digest(cert, md, cert_digest, &len) - || cid_hash_len != len) { + || cid_hash_len != len) { ERR_raise(ERR_LIB_ESS, ESS_R_ESS_CERT_DIGEST_ERROR); goto end; } if (memcmp(cid != NULL ? cid->hash->data : cid_v2->hash->data, - cert_digest, len) == 0) { + cert_digest, len) + == 0) { is = cid != NULL ? cid->issuer_serial : cid_v2->issuer_serial; /* Well, it's not really required to match the serial numbers. */ if (is == NULL || ess_issuer_serial_cmp(is, cert) == 0) { @@ -284,9 +283,9 @@ end: } int OSSL_ESS_check_signing_certs(const ESS_SIGNING_CERT *ss, - const ESS_SIGNING_CERT_V2 *ssv2, - const STACK_OF(X509) *chain, - int require_signing_cert) + const ESS_SIGNING_CERT_V2 *ssv2, + const STACK_OF(X509) *chain, + int require_signing_cert) { int n_v1 = ss == NULL ? -1 : sk_ESS_CERT_ID_num(ss->cert_ids); int n_v2 = ssv2 == NULL ? -1 : sk_ESS_CERT_ID_V2_num(ssv2->cert_ids); |