[openssl] openssl-3.0 update
Dr. Paul Dale
pauli at openssl.org
Fri Feb 11 02:44:43 UTC 2022
The branch openssl-3.0 has been updated
via fc27d9f3af95aa33e5028c6cef8d56d1c7f17436 (commit)
from b32b2167155cafc4ac133f49d9cd04a249e443c8 (commit)
- Log -----------------------------------------------------------------
commit fc27d9f3af95aa33e5028c6cef8d56d1c7f17436
Author: Pauli <pauli at openssl.org>
Date: Wed Feb 9 11:17:57 2022 +1100
Change condition to avoid spurious compiler complaints.
X509_TRUST_get0() is checking < 0, the code here was checking == -1. Both are
equivalent in this situation but gcc-12 has conniptions about a subsequent
possible NULL dereference (which isn't possible).
Fixes #17665
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17668)
(cherry picked from commit b84c6e86dd8ca88444207080808d1d598856041f)
-----------------------------------------------------------------------
Summary of changes:
crypto/x509/x509_trust.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crypto/x509/x509_trust.c b/crypto/x509/x509_trust.c
index ff578aee73..0888e16c15 100644
--- a/crypto/x509/x509_trust.c
+++ b/crypto/x509/x509_trust.c
@@ -134,7 +134,7 @@ int X509_TRUST_add(int id, int flags, int (*ck) (X509_TRUST *, X509 *, int),
/* Get existing entry if any */
idx = X509_TRUST_get_by_id(id);
/* Need a new entry */
- if (idx == -1) {
+ if (idx < 0) {
if ((trtmp = OPENSSL_malloc(sizeof(*trtmp))) == NULL) {
ERR_raise(ERR_LIB_X509, ERR_R_MALLOC_FAILURE);
return 0;
More information about the openssl-commits
mailing list