Browse Source

small changes to prepare for encryption

Julius Pfrommer 7 years ago
parent
commit
b6e4da9faf
3 changed files with 2 additions and 6 deletions
  1. 1 1
      src/server/ua_server_binary.c
  2. 0 4
      src/ua_connection.c
  3. 1 1
      src/ua_securechannel.c

+ 1 - 1
src/server/ua_server_binary.c

@@ -535,7 +535,7 @@ processMSG(UA_Server *server, UA_SecureChannel *channel,
 
     /* Assert's required for clang-analyzer */
     UA_assert(mc.buf_pos == &mc.messageBuffer.data[UA_SECURE_MESSAGE_HEADER_LENGTH]);
-    UA_assert(mc.buf_end == &mc.messageBuffer.data[mc.messageBuffer.length]);
+    UA_assert(mc.buf_end <= &mc.messageBuffer.data[mc.messageBuffer.length]);
 
     retval = UA_MessageContext_encode(&mc, &typeId, &UA_TYPES[UA_TYPES_NODEID]);
     if(retval != UA_STATUSCODE_GOOD)

+ 0 - 4
src/ua_connection.c

@@ -23,10 +23,6 @@ hideErrors(UA_TcpErrorMessage *const error) {
         error->error = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
         error->reason = UA_STRING_NULL;
         break;
-    case UA_STATUSCODE_BADCERTIFICATEREVOKED:
-        error->error = UA_STATUSCODE_BADSECURITYCHECKSFAILED;
-        error->reason = UA_STRING_NULL;
-        break;
         // TODO: Check if these are all cases that need to be covered.
     default:
         break;

+ 1 - 1
src/ua_securechannel.c

@@ -681,7 +681,7 @@ UA_SecureChannel_sendSymmetricMessage(UA_SecureChannel *channel, UA_UInt32 reque
 
     /* Assert's required for clang-analyzer */
     UA_assert(mc.buf_pos == &mc.messageBuffer.data[UA_SECURE_MESSAGE_HEADER_LENGTH]);
-    UA_assert(mc.buf_end == &mc.messageBuffer.data[mc.messageBuffer.length]);
+    UA_assert(mc.buf_end <= &mc.messageBuffer.data[mc.messageBuffer.length]);
 
     retval |= UA_MessageContext_encode(&mc, &typeId, &UA_TYPES[UA_TYPES_NODEID]);
     if(retval != UA_STATUSCODE_GOOD)