mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3291 from matt335672/update_cppcheck_ver

Browse Source 
Update cppcheck version to 2.16.0
This commit is contained in:
matt335672 2024-11-14 10:22:14 +00:00 committed by GitHub
commit 595bda604c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -180,7 +180,7 @@ jobs:
CC: gcc CC: gcc
# This is required to use a version of cppcheck other than that # This is required to use a version of cppcheck other than that
# supplied with the operating system # supplied with the operating system
CPPCHECK_VER: "2.15.0" CPPCHECK_VER: "2.16.0"
CPPCHECK_REPO: https://github.com/danmar/cppcheck.git CPPCHECK_REPO: https://github.com/danmar/cppcheck.git
steps: steps:
# Set steps.os.outputs.image to the specific OS (e.g. 'ubuntu20') # Set steps.os.outputs.image to the specific OS (e.g. 'ubuntu20')

13
common/ssl_calls.c
View File

@ -1104,15 +1104,12 @@ ssl_tls_accept(struct ssl_tls *self, long ssl_protocols,
return 1; return 1;
} }
DH_free(dh); // ok to free, copied into ctx by SSL_CTX_set_tmp_dh() DH_free(dh); // ok to free, copied into ctx by SSL_CTX_set_tmp_dh()
#else
if (!SSL_CTX_set_dh_auto(self->ctx, 1))
{
LOG(LOG_LEVEL_ERROR, "TLS DHE auto failed to be enabled");
dump_ssl_error_stack(self);
return 1;
}
#endif #endif
#if defined(SSL_CTX_set_ecdh_auto)
#if (OPENSSL_VERSION_NUMBER >= 0x10000020L) && \
OPENSSL_VERSION_NUMBER < (0x10100000L)
// SSL_CTX_set_ecdh_auto() added in OpenSSL 1.0.2 and
// removed for OpenSSL 1.1.0
if (!SSL_CTX_set_ecdh_auto(self->ctx, 1)) if (!SSL_CTX_set_ecdh_auto(self->ctx, 1))
{ {
LOG(LOG_LEVEL_WARNING, "TLS ecdh auto failed to be enabled"); LOG(LOG_LEVEL_WARNING, "TLS ecdh auto failed to be enabled");