Changes in trunk/src/sh_err_log.c [22:20]

File:

• trunk/src/sh_err_log.c (modified) (11 diffs)

trunk/src/sh_err_log.c

@@ -604 +604 @@
   char            sigkey_old[KEY_LEN+1];
   char            sigkey_new[KEY_LEN+1];
-  char            crypto[KEY_LEN+1];
+  char            crypt[KEY_LEN+1]; 
   struct  lfstc * next;
 } open_logfile;
@@ -613 +613 @@
 
 #ifdef SH_WITH_SERVER
-int set_flag_sep_log (const char * str)
+int set_flag_sep_log (char * str)
 {
   return sh_util_flagval(str, &flag_sep_log);
@@ -642 +642 @@
   char               * sigkey_new;
   char               * sigkey_old;
-  char               * crypto;
+  char               * crypt;
 
   SL_ENTER(_("sh_log_file"));
@@ -734 +734 @@
       memset(current->sigkey_old, (int)'\0', KEY_LEN+1);
       memset(current->sigkey_new, (int)'\0', KEY_LEN+1);
-      memset(current->crypto,     (int)'\0', KEY_LEN+1);
+      memset(current->crypt,      (int)'\0', KEY_LEN+1);
       current->next            = logfile_list;
       logfile_list             = current;
@@ -841 +841 @@
       sigkey_old = current->sigkey_old;
       sigkey_new = current->sigkey_new;
-      crypto     = current->crypto;
+      crypt      = current->crypt;
     }
   else
@@ -847 +847 @@
       sigkey_old = skey->sigkey_old;
       sigkey_new = skey->sigkey_new;
-      crypto     = skey->crypt;      /* flawfinder: ignore */
+      crypt      = skey->crypt;
     }
 
@@ -869 +869 @@
       /* Copy it to 'crypt' for encryption.
        */
-      (void) sl_strlcpy(crypto, sigkey_new, KEY_LEN+1);
+      (void) sl_strlcpy(crypt, sigkey_new, KEY_LEN+1);
 
       /* Use message and compiled-in key to encrypt.
        */
       BREAKEXIT(sh_util_encode);
-      sh_util_encode(crypto, log_msg.msg, 0, 'B');
+      sh_util_encode(crypt, log_msg.msg, 0, 'B');
 
       /* Send out the key.
@@ -900 +900 @@
 
       sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_KEY_MAIL,
-                       sh.prg_name, crypto, 
-                       crypto, log_msg.timestamp);
+                       sh.prg_name, crypt, 
+                       crypt, log_msg.timestamp);
 
       /* send to other allowed channels
@@ -913 +913 @@
 
       sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_START_KEY,
-                       sh.prg_name, crypto);
+                       sh.prg_name, crypt);
 
       /* Cleanup.
@@ -926 +926 @@
 
 
-      memset (crypto, (int) '\0', KEY_LEN);
+      memset (crypt, (int) '\0', KEY_LEN);
       sh.flag.log_start    = S_FALSE;  
       current->log_start   = S_FALSE;
@@ -949 +949 @@
   (void) sl_strlcpy (sigkey_old, sigkey_new, KEY_LEN+1); 
 
-  /*@-usedef@*/
+  /*@-bufferoverflowhigh -usedef@*/
 #ifdef SH_USE_XML
   if (log_msg.timestamp[0] != '\0')
-    sl_snprintf(log_msg.sig, sizeof(log_msg.sig),
+    sprintf(log_msg.sig,                            /* known to fit  */
 #ifdef FIX_XML
-                _("\n<sig>%s%s</sig></log>\n"),          /* <sig> FIX XML */
-#else
-                _("\nsig>%s%s</sig></log>\n"),          /* <sig> FIX XML */
-#endif
-                log_msg.signature, log_msg.timestamp);
+            _("\n<sig>%s%s</sig></log>\n"),          /* <sig> FIX XML */
+#else
+            _("\nsig>%s%s</sig></log>\n"),          /* <sig> FIX XML */
+#endif
+            log_msg.signature, log_msg.timestamp);
   else
-    sl_snprintf(log_msg.sig, sizeof(log_msg.sig),
+    sprintf(log_msg.sig,                            /* known to fit  */
 #ifdef FIX_XML
-                _("\n<sig>%s</sig></log>\n"),            /* <sig> FIX XML */
-#else
-                _("\nsig>%s</sig></log>\n"),            /* <sig> FIX XML */
-#endif
-                log_msg.signature);
-  /*@+usedef@*/
+            _("\n<sig>%s</sig></log>\n"),            /* <sig> FIX XML */
+#else
+            _("\nsig>%s</sig></log>\n"),            /* <sig> FIX XML */
+#endif
+            log_msg.signature);
+  /*@+bufferoverflowhigh +usedef@*/
 
 #ifdef SH_STEALTH