mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
crypto: remove redundant access() checks before loading certs
The qcrypto_tls_creds_get_path method will perform an access() check on the file and return a NULL path if it fails. By the time we get to loading the cert files we know they must exist on disk and thus the second access() check is redundant. Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
+10
-12
@@ -496,8 +496,7 @@ qcrypto_tls_creds_x509_sanity_check(QCryptoTLSCredsX509 *creds,
|
||||
size_t i;
|
||||
int ret = -1;
|
||||
|
||||
if (certFile &&
|
||||
access(certFile, R_OK) == 0) {
|
||||
if (certFile) {
|
||||
if (qcrypto_tls_creds_load_cert_list(creds,
|
||||
certFile,
|
||||
&certs,
|
||||
@@ -508,16 +507,15 @@ qcrypto_tls_creds_x509_sanity_check(QCryptoTLSCredsX509 *creds,
|
||||
goto cleanup;
|
||||
}
|
||||
}
|
||||
if (access(cacertFile, R_OK) == 0) {
|
||||
if (qcrypto_tls_creds_load_cert_list(creds,
|
||||
cacertFile,
|
||||
&cacerts,
|
||||
&ncacerts,
|
||||
isServer,
|
||||
true,
|
||||
errp) < 0) {
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
if (qcrypto_tls_creds_load_cert_list(creds,
|
||||
cacertFile,
|
||||
&cacerts,
|
||||
&ncacerts,
|
||||
isServer,
|
||||
true,
|
||||
errp) < 0) {
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
for (i = 0; i < ncerts; i++) {
|
||||
|
||||
Reference in New Issue
Block a user