diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-03-30 20:24:48 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1997-03-30 20:24:48 +0000 |
| commit | 7b1f0fa815ba5fdc4f2f72dc0b1fbb236e7d1830 (patch) | |
| tree | 5c1298eab1a739cae4731e3aa2df0c16628aaeac | |
| parent | 9897a1465d0ddbd55f5fc47edaafe28c79fcb3d1 (diff) | |
delete the unaligned code
| -rw-r--r-- | lib/libc/crypt/crypt.c | 12 | ||||
| -rw-r--r-- | lib/libc/crypt/morecrypt.c | 12 |
2 files changed, 2 insertions, 22 deletions
diff --git a/lib/libc/crypt/crypt.c b/lib/libc/crypt/crypt.c index 922ac5ba32f..caa58df4862 100644 --- a/lib/libc/crypt/crypt.c +++ b/lib/libc/crypt/crypt.c @@ -50,7 +50,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: crypt.c,v 1.9 1997/03/27 23:36:53 downsj Exp $"; +static char rcsid[] = "$OpenBSD: crypt.c,v 1.10 1997/03/30 20:24:46 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -572,24 +572,14 @@ des_cipher(in, out, salt, count) setup_salt(salt); -#if 0 - rawl = ntohl(*((u_int32_t *) in)++); - rawr = ntohl(*((u_int32_t *) in)); -#else memcpy(x, in, sizeof x); rawl = ntohl(x[0]); rawr = ntohl(x[1]); -#endif retval = do_des(rawl, rawr, &l_out, &r_out, count); -#if 0 - *((u_int32_t *) out)++ = htonl(l_out); - *((u_int32_t *) out) = htonl(r_out); -#else x[0] = htonl(l_out); x[1] = htonl(r_out); memcpy(out, x, sizeof x); -#endif return(retval); } diff --git a/lib/libc/crypt/morecrypt.c b/lib/libc/crypt/morecrypt.c index 2bf7d21c383..1178ef65449 100644 --- a/lib/libc/crypt/morecrypt.c +++ b/lib/libc/crypt/morecrypt.c @@ -51,7 +51,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: morecrypt.c,v 1.7 1996/11/14 05:45:15 etheisen Exp $"; +static char rcsid[] = "$OpenBSD: morecrypt.c,v 1.8 1997/03/30 20:24:47 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -487,24 +487,14 @@ des_cipher(in, out, salt, count) setup_salt((int32_t)salt); -#if 0 - rawl = ntohl(*((u_int32_t *) in)++); - rawr = ntohl(*((u_int32_t *) in)); -#else memcpy(x, in, sizeof x); rawl = ntohl(x[0]); rawr = ntohl(x[1]); -#endif retval = do_des(rawl, rawr, &l_out, &r_out, count); -#if 0 - *((u_int32_t *) out)++ = htonl(l_out); - *((u_int32_t *) out) = htonl(r_out); -#else x[0] = htonl(l_out); x[1] = htonl(r_out); memcpy(out, x, sizeof x); -#endif return(retval); } |