github/open62541
7
0
Fork 0
mirror of https://github.com/open62541/open62541.git synced 2025-06-03 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.3' into 1.4

Browse Source
This commit is contained in:
Julius Pfrommer 2023-07-27 00:15:03 +02:00
commit 04a4599a09
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -46,7 +46,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
# overwritten with more detailed information if git is available.
set(OPEN62541_VER_MAJOR 1)
set(OPEN62541_VER_MINOR 3)
set(OPEN62541_VER_PATCH 5)
set(OPEN62541_VER_PATCH 6)
set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
set(OPEN62541_VER_COMMIT "unknown-commit")

3
plugins/crypto/openssl/ua_pki_openssl.c
View File

@ -638,6 +638,9 @@ UA_CertificateVerification_VerifyApplicationURI (const UA_CertificateVerificatio
UA_LOG_ERROR(*(cv->logging), UA_LOGCATEGORY_USERLAND, "Error processing X509 Certificate");
return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
}
UA_String_init(&subjectURI);
for (i = 0; i < sk_GENERAL_NAME_num (pNames); i++) {
GENERAL_NAME * value = sk_GENERAL_NAME_value (pNames, i);
if (value->type == GEN_URI) {

11
plugins/ua_config_default.c
View File

@ -269,16 +269,16 @@ setDefaultConfig(UA_ServerConfig *conf, UA_UInt16 portNumber) {
/* Logging */
if(!conf->logger.log)
conf->logger = UA_Log_Stdout_withLevel(UA_LOGLEVEL_TRACE);
conf->logger = UA_Log_Stdout_withLevel(UA_LOGLEVEL_INFO);
if(conf->logging == NULL)
conf->logging = &conf->logger;
/* EventLoop */
if(conf->eventLoop == NULL) {
conf->eventLoop = UA_EventLoop_new_POSIX(&conf->logger);
if(conf->eventLoop == NULL) {
return UA_STATUSCODE_BADOUTOFMEMORY;
}
if(conf->eventLoop == NULL)
return UA_STATUSCODE_BADOUTOFMEMORY;
conf->externalEventLoop = false;
/* Add the TCP connection manager */
@ -962,9 +962,8 @@ UA_ClientConfig_setDefault(UA_ClientConfig *config) {
if(config->secureChannelLifeTime == 0)
config->secureChannelLifeTime = 10 * 60 * 1000; /* 10 minutes */
if(!config->logger.log) {
if(!config->logger.log)
config->logger = UA_Log_Stdout_withLevel(UA_LOGLEVEL_INFO);
}
if(config->logging == NULL)
config->logging = &config->logger;