Merge pull request #6044 from jpfr/merge_12_13_10

Merge 1.2. to 1.3
open62541 · Oct 6, 2023 · 086b155 · 086b155
2 parents 1df2db0 + 31c93e6
commit 086b155
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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")
 

diff --git a/plugins/crypto/openssl/ua_openssl_basic256sha256.c b/plugins/crypto/openssl/ua_openssl_basic256sha256.c
@@ -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 =

diff --git a/plugins/crypto/openssl/ua_pki_openssl.c b/plugins/crypto/openssl/ua_pki_openssl.c
@@ -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;