diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-02-08 21:13:26 +0300 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-03-06 15:08:16 +0300 |
| commit | 0dca5ede0d7a98bc9061f4a50846732e50ffda0f (patch) | |
| tree | 79a8035d8dfe75d769957f4b7ec2a44e715a91a8 /crypto/x509/x509_cmp.c | |
| parent | 9b9d24f0331f7175137bc60023e7a165ee886551 (diff) | |
Make more use of X509_add_certs(); minor related code & comments cleanup
This is a follow-up on #12615.
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14436)
Diffstat (limited to 'crypto/x509/x509_cmp.c')
| -rw-r--r-- | crypto/x509/x509_cmp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c index c29fe3cc5f..a149bf49dc 100644 --- a/crypto/x509/x509_cmp.c +++ b/crypto/x509/x509_cmp.c @@ -177,8 +177,7 @@ int X509_cmp(const X509 *a, const X509 *b) int ossl_x509_add_cert_new(STACK_OF(X509) **p_sk, X509 *cert, int flags) { - if (*p_sk == NULL - && (*p_sk = sk_X509_new_null()) == NULL) { + if (*p_sk == NULL && (*p_sk = sk_X509_new_null()) == NULL) { ERR_raise(ERR_LIB_X509, ERR_R_MALLOC_FAILURE); return 0; } @@ -216,7 +215,7 @@ int X509_add_cert(STACK_OF(X509) *sk, X509 *cert, int flags) } int X509_add_certs(STACK_OF(X509) *sk, STACK_OF(X509) *certs, int flags) -/* compiler would allow 'const' for the list of certs, yet they are up-ref'ed */ +/* compiler would allow 'const' for the certs, yet they may get up-ref'ed */ { if (sk == NULL) { ERR_raise(ERR_LIB_X509, ERR_R_PASSED_NULL_PARAMETER); @@ -227,7 +226,7 @@ int X509_add_certs(STACK_OF(X509) *sk, STACK_OF(X509) *certs, int flags) int ossl_x509_add_certs_new(STACK_OF(X509) **p_sk, STACK_OF(X509) *certs, int flags) -/* compiler would allow 'const' for the list of certs, yet they are up-ref'ed */ +/* compiler would allow 'const' for the certs, yet they may get up-ref'ed */ { int n = sk_X509_num(certs /* may be NULL */); int i; |