- (djm) Sync with OpenBSD:

   - markus@cvs.openbsd.org  2000/10/16 15:46:32
     [ssh.1]
     fixes from pekkas@netcore.fi
   - markus@cvs.openbsd.org  2000/10/17 14:28:11
     [atomicio.c]
     return number of characters processed; ok deraadt@
   - markus@cvs.openbsd.org  2000/10/18 12:04:02
     [atomicio.c]
     undo
   - markus@cvs.openbsd.org  2000/10/18 12:23:02
     [scp.c]
     replace atomicio(read,...) with read(); ok deraadt@
   - markus@cvs.openbsd.org  2000/10/18 12:42:00
     [session.c]
     restore old record login behaviour
   - deraadt@cvs.openbsd.org 2000/10/19 10:41:13
     [auth-skey.c]
     fmt string problem in unused code
   - provos@cvs.openbsd.org  2000/10/19 10:45:16
     [sshconnect2.c]
     don't reference freed memory. okay deraadt@
   - markus@cvs.openbsd.org  2000/10/21 11:04:23
     [canohost.c]
     typo, eramore@era-t.ericsson.se; ok niels@
   - markus@cvs.openbsd.org  2000/10/23 13:31:55
     [cipher.c]
     non-alignment dependent swap_bytes(); from
     simonb@wasabisystems.com/netbsd
   - markus@cvs.openbsd.org  2000/10/26 12:38:28
     [compat.c]
     add older vandyke products
   - markus@cvs.openbsd.org  2000/10/27 01:32:19
     [channels.c channels.h clientloop.c serverloop.c session.c]
     [ssh.c util.c]
     enable non-blocking IO on channels, and tty's (except for the
     client ttys).
   - markus@cvs.openbsd.org  2000/10/27 01:48:22
     channels.c channels.h clientloop.c
     deny agent/x11 forwarding unless requested; thanks to jwl@pobox.com

1 files changed, 16 insertions, 23 deletions

diff --git a/cipher.c b/cipher.c
index b9c1b28ab..65cde4732 100644
--- a/cipher.c
+++ b/cipher.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: cipher.c,v 1.36 2000/10/14 10:01:15 markus Exp $");
+RCSID("$OpenBSD: cipher.c,v 1.37 2000/10/23 19:31:54 markus Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -218,28 +218,21 @@ blowfish_cbc_decrypt(CipherContext *cc, u_char *dest, const u_char *src,
  * and after encryption/decryption. Thus the swap_bytes stuff (yuk).
  */
 static void
-swap_bytes(const unsigned char *src, unsigned char *dst_, int n)
-{
-        /* dst must be properly aligned. */
-        u_int32_t *dst = (u_int32_t *) dst_;
-        union {
-                u_int32_t i;
-                char c[4];
-        } t;
-
-        /* Process 8 bytes every lap. */
-        for (n = n / 8; n > 0; n--) {
-                t.c[3] = *src++;
-                t.c[2] = *src++;
-                t.c[1] = *src++;
-                t.c[0] = *src++;
-                *dst++ = t.i;
-
-                t.c[3] = *src++;
-                t.c[2] = *src++;
-                t.c[1] = *src++;
-                t.c[0] = *src++;
-                *dst++ = t.i;
+swap_bytes(const unsigned char *src, unsigned char *dst, int n)
+{
+        char c[4];
+
+        /* Process 4 bytes every lap. */
+        for (n = n / 4; n > 0; n--) {
+                c[3] = *src++;
+                c[2] = *src++;
+                c[1] = *src++;
+                c[0] = *src++;
+
+                *dst++ = c[0];
+                *dst++ = c[1];
+                *dst++ = c[2];
+                *dst++ = c[3];
         }
 }