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 pull request #6044 from jpfr/merge_12_13_10

Browse Source 
Merge 1.2. to 1.3
This commit is contained in:
Julius Pfrommer 2023-10-06 13:25:21 +02:00 committed by GitHub
commit 086b1557d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -43,7 +43,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 6)
set(OPEN62541_VER_PATCH 8)
set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
set(OPEN62541_VER_COMMIT "unknown-commit")

1
plugins/crypto/openssl/ua_openssl_basic256sha256.c
View File

@ -129,6 +129,7 @@ UA_ChannelModule_New_Context(const UA_SecurityPolicy * securityPolicy,
if(context->remoteCertificateX509 == NULL) {
UA_ByteString_clear(&context->remoteCertificate);
UA_free(context);
return UA_STATUSCODE_BADINTERNALERROR;
}
context->policyContext =

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

@ -589,7 +589,7 @@ UA_CertificateVerification_VerifyApplicationURI (void * verificat
const unsigned char * pData;
X509 * certificateX509;
UA_String subjectURI;
UA_String subjectURI = UA_STRING_NULL;
GENERAL_NAMES * pNames;
int i;
UA_StatusCode ret;