Changeset 561 for trunk

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).

Location:

trunk

Files:

• src/sh_sig.c (modified) (1 diff)
• src/sh_xfer_server.c (modified) (2 diffs)
• test/test.sh (modified) (5 diffs)
• test/testrun_1i.sh (modified) (1 diff)
• test/testrun_2h.sh (added)

trunk/src/sh_sig.c

@@ -717 +717 @@
   sl_rewind (fdTmp);
 
-#if 0
+#if defined(SH_DEBUG_SIGNIFY)
   fin_cp = fdopen(dup(get_the_fd(fdTmp)), "rb");
   FILE * fout = fopen("xxx.out", "w+");

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);

trunk/test/test.sh

@@ -164 +164 @@
     echo "  ${S}test.sh 26${E}  -- Test c/s case one        (testrc_2.in)"
     echo "  ${S}test.sh 27${E}  -- Test c/s case two        (testrc_2.in)"
+    echo "  ${S}test.sh 28${E}  -- Test full c/s w/signify  (testrc_2.in)"
     echo "  ${S}test.sh all${E} -- All tests"
 }
@@ -175 +176 @@
     echo " (20) testrun_2.sh  (21) testrun_2a.sh  (22) testrun_2b.sh (23) testrun_2c.sh"
     echo " (24) testrun_2d.sh (25) testrun_2e.sh  (26) testrun_2f.sh (27) testrun_2g.sh"
-}
+    echo " (28) testrun_2h.sh"
+    }
 
 #
@@ -715 +717 @@
     exit $?
 fi
+if test x$1 = x28; then
+    . ${SCRIPTDIR}/testrun_2a.sh
+    . ${SCRIPTDIR}/testrun_2h.sh
+    testrun2h $hostname
+    print_summary
+    exit $?
+fi
 if test x$1 = xall; then
     TEST_MAX=0
@@ -760 +769 @@
     let "TEST_MAX = TEST_MAX + MAXTEST" >/dev/null
     . ${SCRIPTDIR}/testrun_2g.sh
+    let "TEST_MAX = TEST_MAX + MAXTEST" >/dev/null
+    . ${SCRIPTDIR}/testrun_2h.sh
     let "TEST_MAX = TEST_MAX + MAXTEST" >/dev/null
     #
@@ -854 +865 @@
     MAXTEST=${TEST_MAX}; export MAXTEST
     testrun2g $hostname
+    #
+    . ${SCRIPTDIR}/testrun_2h.sh
+    MAXTEST=${TEST_MAX}; export MAXTEST
+    testrun2h $hostname
     #
     print_summary

trunk/test/testrun_1i.sh

@@ -244 +244 @@
     fi
     if [ -z "$SIGNIFY" ]; then
-        log_skip 1 $MAXTEST 'gpg not found in $PATH'
-        log_skip 2 $MAXTEST 'gpg not found in $PATH'
-        log_skip 3 $MAXTEST 'gpg not found in $PATH'
-        log_skip 4 $MAXTEST 'gpg not found in $PATH'
+        log_skip 1 $MAXTEST 'signify not found in $PATH'
+        log_skip 2 $MAXTEST 'signify not found in $PATH'
+        log_skip 3 $MAXTEST 'signify not found in $PATH'
+        log_skip 4 $MAXTEST 'signify not found in $PATH'
     else
         eval "ls ~/.signify/samhain.pub >/dev/null 2>/dev/null"