Merge Conflicts, CMAKE Typo Fix

nasa · Dec 13, 2023 · 981abf6 · 981abf6
2 parents 848515f + 00cc9f0
commit 981abf6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,7 +30,7 @@ option(CRYPTO_WOLFSSL "Cryptography Module - WolfSSL" OFF)
 option(DEBUG "Debug" OFF)
 option(KEY_CUSTOM "Key Module - Custom" OFF)
 option(KEY_INTERNAL "Key Module - Internal" ON)
-option(KEY_KMC "Key Module - KMC OFF")
+option(KEY_KMC "Key Module - KMC" OFF)
 option(SA_CUSTOM "Security Association - Custom" OFF)
 option(MC_CUSTOM "Monitoring and Control - Custom" OFF)
 option(MC_INTERNAL "Monitoring and Control - Internal" ON)

diff --git a/src/core/crypto_tc.c b/src/core/crypto_tc.c
@@ -1449,4 +1449,4 @@ static int32_t crypto_handle_incrementing_nontransmitted_counter(uint8_t* dest,
     }
     if (!temp_counter) free(temp_counter);
     return status;
-}
+}
diff --git a/support/standalone/standalone.c b/support/standalone/standalone.c
@@ -389,7 +389,9 @@ void *crypto_standalone_tc_apply(void* sock)
             if (!tc_out_ptr) free(tc_out_ptr);
             if (tc_debug == 1)
             {
+            #ifdef CRYPTO_STANDALONE_TC_APPLY_DEBUG
                 printf("\n");
+            #endif
             }
         }
 
@@ -750,4 +752,4 @@ int main(int argc, char* argv[])
 
     printf("\n");
     exit(status);
-}
+}
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         if (!temp_counter) free(temp_counter);
         return status;
-    }
+    }