Changeset 575 for trunk

Timestamp:

Mar 7, 2022, 7:11:41 PM (3 years ago)

Author:

katerina

Message:

Fix for ticket #463 (gcc 11.2 compiler warnings).

Location:

trunk/src

Files:

• sh_calls.c (modified) (1 diff)
• sh_checksum.c (modified) (2 diffs)
• sh_xfer_server.c (modified) (2 diffs)

trunk/src/sh_calls.c

@@ -933 +933 @@
 }
 
-int aud_pipe (const char * file, int line, int * modus)
+int aud_pipe (const char * file, int line, int modus[2])
 {
   int error;

trunk/src/sh_checksum.c

@@ -408 +408 @@
 }
 
-void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) 
+void SHA256_Final(sha2_byte digest[SHA256_DIGEST_LENGTH], SHA256_CTX* context) 
 {
   sha2_word32     *d = (sha2_word32*)digest;
@@ -482 +482 @@
 
 /* If buffer is of length KEYBUF_SIZE, the digest will fit */
-char *SHA256_End(SHA256_CTX* context, char buffer[]) 
+char *SHA256_End(SHA256_CTX* context, char buffer[KEYBUF_SIZE]) 
 {
   sha2_byte       digest[SHA256_DIGEST_LENGTH];

trunk/src/sh_xfer_server.c

@@ -2407 +2407 @@
                                 (conn->head[0]|SH_PROTO_SRP));
           
-          if (conn->A  != NULL) SH_FREE(conn->A);  conn->A  = NULL;
-          if (conn->M1 != NULL) SH_FREE(conn->M1); conn->M1 = NULL;
+          if (conn->A  != NULL)
+            SH_FREE(conn->A);
+          conn->A  = NULL;
+          if (conn->M1 != NULL)
+            SH_FREE(conn->M1);
+          conn->M1 = NULL;
           sl_strlcpy(conn->client_entry->session_key, 
                      conn->K, KEY_LEN+1);
@@ -2431 +2435 @@
 #endif
           
-          if (conn->K  != NULL) SH_FREE(conn->K);  conn->K  = NULL;
+          if (conn->K  != NULL)
+            SH_FREE(conn->K);
+          conn->K  = NULL;
           
           conn->client_entry->last_connect = time (NULL);