Changeset 561 for trunk/src/sh_xfer_server.c

Timestamp:

Jun 29, 2021, 10:19:30 PM (3 years ago)

Author:

katerina

Message:

Fix for ticket #451 (signify-openbsd in client/server mode not working).

File:

• trunk/src/sh_xfer_server.c (modified) (2 diffs)

trunk/src/sh_xfer_server.c

@@ -1230 +1230 @@
   int        bytes;
   SL_TICKET  sfd = -1;
-#ifdef SH_ENCRYPT
-  int        blkfac;
-  int        rem;
-  int        send_bytes;
-#endif
 
   if (conn == NULL    || conn->FileName == NULL)
@@ -1281 +1276 @@
       if (bytes >= 0)
         {
+          send_buf = hash_me(conn->K, read_buf,  bytes);
 #ifdef SH_ENCRYPT
-          /* need to send N * B_SIZ bytes
-           */ 
-          blkfac = bytes / B_SIZ;
-          rem    = bytes - (blkfac * B_SIZ);
-          if (rem != 0)
-            {
-              memset(&read_buf[bytes], '\n', (B_SIZ-rem));
-              ++blkfac;
-              send_bytes = blkfac * B_SIZ;
-            }
-          else
-            send_bytes = bytes;
-          
-          send_buf = hash_me(conn->K, read_buf,  send_bytes);
-          
-          sh_xfer_send_crypt (conn, send_buf, send_bytes+KEY_LEN, _("FILE"),  
+          sh_xfer_send_crypt (conn, send_buf, bytes+KEY_LEN, _("FILE"),  
                                       SH_PROTO_BIG|conn->client_entry->encf_flag);
 #else
-          send_buf = hash_me(conn->K, read_buf, bytes);
           sh_xfer_send_crypt (conn, send_buf, bytes+KEY_LEN, _("FILE"),  
                                       SH_PROTO_BIG);