From e9d8d18571c5c088c963a199984cd80c637d8ee9 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Mon, 4 Feb 2008 00:21:49 +0000 Subject: * updated busybox to 1.8.2 * added new applet vncpasswd to busybox which creates a password suitable for vnc (original code from Sebastian, slightly modified by me) git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1515 95ad53e4-c205-0410-b2fa-d234c58c8868 --- tools/busybox-patches/bzip2-payload-1.7.1.diff | 63 --- tools/busybox-patches/bzip2-payload-1.8.2.diff | 61 +++ tools/busybox-patches/cryptpw-blowfish-1.7.1.diff | 79 --- tools/busybox-patches/cryptpw-blowfish-1.8.2.diff | 79 +++ tools/busybox-patches/series | 7 +- tools/busybox-patches/unionfs-run-init-1.7.1.diff | 14 - tools/busybox-patches/unionfs-run-init-1.8.2.diff | 14 + tools/busybox-patches/vncpasswd-1.8.2.diff | 585 ++++++++++++++++++++++ tools/busybox.i586 | Bin 324524 -> 337292 bytes 9 files changed, 743 insertions(+), 159 deletions(-) delete mode 100644 tools/busybox-patches/bzip2-payload-1.7.1.diff create mode 100644 tools/busybox-patches/bzip2-payload-1.8.2.diff delete mode 100644 tools/busybox-patches/cryptpw-blowfish-1.7.1.diff create mode 100644 tools/busybox-patches/cryptpw-blowfish-1.8.2.diff delete mode 100644 tools/busybox-patches/unionfs-run-init-1.7.1.diff create mode 100644 tools/busybox-patches/unionfs-run-init-1.8.2.diff create mode 100644 tools/busybox-patches/vncpasswd-1.8.2.diff (limited to 'tools') diff --git a/tools/busybox-patches/bzip2-payload-1.7.1.diff b/tools/busybox-patches/bzip2-payload-1.7.1.diff deleted file mode 100644 index 31156fd5..00000000 --- a/tools/busybox-patches/bzip2-payload-1.7.1.diff +++ /dev/null @@ -1,63 +0,0 @@ -diff -ru ./archival/Config.in ../busybox-1.6.0/archival/Config.in ---- ./archival/Config.in 2007-06-01 13:48:31.000000000 +0200 -+++ ../busybox-1.6.0/archival/Config.in 2007-06-15 12:22:16.000000000 +0200 -@@ -127,6 +127,14 @@ - help - Converts an RPM file into a CPIO archive. - -+config FEATURE_RPM2CPIO_BZIP2 -+ bool " Support bzip2 decompression" -+ default n -+ depends on RPM2CPIO -+ help -+ If you enable this option you'll be able to extract -+ rpms compressed with bzip2. -+ - config RPM - bool "rpm" - default n -diff -ru ./archival/libunarchive/Kbuild ../busybox-1.6.0/archival/libunarchive/Kbuild ---- ./archival/libunarchive/Kbuild 2007-06-01 13:48:31.000000000 +0200 -+++ ../busybox-1.6.0/archival/libunarchive/Kbuild 2007-06-15 12:22:46.000000000 +0200 -@@ -56,6 +56,7 @@ - lib-$(CONFIG_GUNZIP) += $(GUNZIP_FILES) - lib-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress.o - lib-$(CONFIG_RPM2CPIO) += $(GUNZIP_FILES) get_header_cpio.o -+lib-$(CONFIG_FEATURE_RPM2CPIO_BZIP2) += $(GUNZIP_FILES) decompress_bunzip2.o - lib-$(CONFIG_RPM) += $(GUNZIP_FILES) get_header_cpio.o - lib-$(CONFIG_FEATURE_RPM_BZ2) += decompress_bunzip2.o - lib-$(CONFIG_TAR) += get_header_tar.o -diff -ru ./archival/rpm2cpio.c ../busybox-1.6.0/archival/rpm2cpio.c ---- ./archival/rpm2cpio.c 2007-06-01 13:48:31.000000000 +0200 -+++ ../busybox-1.6.0/archival/rpm2cpio.c 2007-06-15 12:22:24.000000000 +0200 -@@ -75,14 +75,24 @@ - skip_header(rpm_fd); - - xread(rpm_fd, &magic, 2); -- if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { -- bb_error_msg_and_die("invalid gzip magic"); -+ if ((magic[0] == 0x1f) && (magic[1] == 0x8b)) { -+ check_header_gzip_or_die(rpm_fd); -+ if (unpack_gz_stream(rpm_fd, STDOUT_FILENO) < 0) { -+ bb_error_msg("error inflating (gzip)"); -+ } - } -- -- check_header_gzip_or_die(rpm_fd); -- if (unpack_gz_stream(rpm_fd, STDOUT_FILENO) < 0) { -- bb_error_msg("error inflating"); -+ else if ((magic[0] == 'B') && (magic[1] == 'Z')) { -+#ifdef CONFIG_FEATURE_RPM2CPIO_BZIP2 -+ /* return to position before magic (eek..!) */ -+ lseek(rpm_fd, -2, SEEK_CUR); -+ if (unpack_bz2_stream(rpm_fd, fileno(stdout)) != 0) -+ bb_error_msg("error inflating (bzip2)"); -+#else -+ bb_error_msg_and_die("bzip2 not supported"); -+#endif - } -+ else -+ bb_error_msg_and_die("not gzip or bzip2 compressed"); - - close(rpm_fd); - diff --git a/tools/busybox-patches/bzip2-payload-1.8.2.diff b/tools/busybox-patches/bzip2-payload-1.8.2.diff new file mode 100644 index 00000000..7827a4cd --- /dev/null +++ b/tools/busybox-patches/bzip2-payload-1.8.2.diff @@ -0,0 +1,61 @@ +diff -ruw busybox-1.8.2/archival/Config.in busybox-1.8.2-openslx/archival/Config.in +--- busybox-1.8.2/archival/Config.in 2007-11-10 02:40:49.000000000 +0100 ++++ busybox-1.8.2-openslx/archival/Config.in 2008-02-03 21:48:48.000000000 +0100 +@@ -137,6 +137,14 @@ + help + Converts an RPM file into a CPIO archive. + ++config FEATURE_RPM2CPIO_BZIP2 ++ bool " Support bzip2 decompression" ++ default n ++ depends on RPM2CPIO ++ help ++ If you enable this option you'll be able to extract ++ rpms compressed with bzip2. ++ + config RPM + bool "rpm" + default n +diff -ruw busybox-1.8.2/archival/libunarchive/Kbuild busybox-1.8.2-openslx/archival/libunarchive/Kbuild +--- busybox-1.8.2/archival/libunarchive/Kbuild 2007-11-10 02:40:48.000000000 +0100 ++++ busybox-1.8.2-openslx/archival/libunarchive/Kbuild 2008-02-03 21:48:48.000000000 +0100 +@@ -55,6 +55,7 @@ + lib-$(CONFIG_GUNZIP) += decompress_unzip.o + lib-$(CONFIG_FEATURE_GUNZIP_UNCOMPRESS) += decompress_uncompress.o + lib-$(CONFIG_RPM2CPIO) += decompress_unzip.o get_header_cpio.o ++lib-$(CONFIG_FEATURE_RPM2CPIO_BZIP2) += $(GUNZIP_FILES) decompress_bunzip2.o + lib-$(CONFIG_RPM) += decompress_unzip.o get_header_cpio.o + lib-$(CONFIG_FEATURE_RPM_BZ2) += decompress_bunzip2.o + lib-$(CONFIG_TAR) += get_header_tar.o +diff -ruw busybox-1.8.2/archival/rpm2cpio.c busybox-1.8.2-openslx/archival/rpm2cpio.c +--- busybox-1.8.2/archival/rpm2cpio.c 2007-11-10 02:40:49.000000000 +0100 ++++ busybox-1.8.2-openslx/archival/rpm2cpio.c 2008-02-03 21:48:48.000000000 +0100 +@@ -75,13 +75,23 @@ + skip_header(rpm_fd); + + xread(rpm_fd, &magic, 2); +- if ((magic[0] != 0x1f) || (magic[1] != 0x8b)) { +- bb_error_msg_and_die("invalid gzip magic"); +- } +- ++ if ((magic[0] == 0x1f) && (magic[1] == 0x8b)) { + if (unpack_gz_stream(rpm_fd, STDOUT_FILENO) < 0) { +- bb_error_msg("error inflating"); ++ bb_error_msg("error inflating (gzip)"); ++ } ++ } ++ else if ((magic[0] == 'B') && (magic[1] == 'Z')) { ++#ifdef CONFIG_FEATURE_RPM2CPIO_BZIP2 ++ /* return to position before magic (eek..!) */ ++ lseek(rpm_fd, -2, SEEK_CUR); ++ if (unpack_bz2_stream(rpm_fd, fileno(stdout)) != 0) ++ bb_error_msg("error inflating (bzip2)"); ++#else ++ bb_error_msg_and_die("bzip2 not supported"); ++#endif + } ++ else ++ bb_error_msg_and_die("not gzip or bzip2 compressed"); + + close(rpm_fd); + diff --git a/tools/busybox-patches/cryptpw-blowfish-1.7.1.diff b/tools/busybox-patches/cryptpw-blowfish-1.7.1.diff deleted file mode 100644 index cbe63ca7..00000000 --- a/tools/busybox-patches/cryptpw-blowfish-1.7.1.diff +++ /dev/null @@ -1,79 +0,0 @@ -diff -ruw busybox-1.6.1/include/usage.h busybox-1.6.1-openslx/include/usage.h ---- busybox-1.6.1/include/usage.h 2007-06-30 17:06:45.000000000 +0200 -+++ busybox-1.6.1-openslx/include/usage.h 2007-08-04 15:41:14.000000000 +0200 -@@ -475,12 +475,23 @@ - " -c dir Specify crontab directory" - - #define cryptpw_trivial_usage \ -- "[-a des|md5] [string]" -+ USE_FEATURE_CRYPTPW_BLOWFISH( \ -+ "[-a des|md5|blowfish] [string]" \ -+ ) \ -+ SKIP_FEATURE_CRYPTPW_BLOWFISH( \ -+ "[-a des|md5] [string]" \ -+ ) - #define cryptpw_full_usage \ - "Outputs crypted string.\n" \ - "If string isn't supplied on cmdline, reads it from stdin.\n" \ - "\nOptions:" \ -- "\n -a Algorithm to use (default: md5)" -+ "\n -a Algorithm to use (default: md5)" \ -+ "\n Available algorithms:" \ -+ USE_FEATURE_CRYPTPW_BLOWFISH( \ -+ "\n blowfish" \ -+ ) \ -+ "\n des" \ -+ "\n md5" - - #define cut_trivial_usage \ - "[OPTION]... [FILE]..." -diff -ruw busybox-1.6.1/loginutils/Config.in busybox-1.6.1-openslx/loginutils/Config.in ---- busybox-1.6.1/loginutils/Config.in 2007-06-30 17:06:45.000000000 +0200 -+++ busybox-1.6.1-openslx/loginutils/Config.in 2007-08-04 15:06:36.000000000 +0200 -@@ -187,6 +187,13 @@ - help - Applet for crypting a string. - -+config FEATURE_CRYPTPW_BLOWFISH -+ bool "Support blowfish in cryptpw" -+ default y -+ depends on CRYPTPW -+ help -+ With this option cryptpw will support the blowfish cipher, too. -+ - config CHPASSWD - bool "chpasswd" - default n -diff -ruw busybox-1.6.1/loginutils/cryptpw.c busybox-1.6.1-openslx/loginutils/cryptpw.c ---- busybox-1.6.1/loginutils/cryptpw.c 2007-06-30 17:06:45.000000000 +0200 -+++ busybox-1.6.1-openslx/loginutils/cryptpw.c 2007-08-04 15:32:48.000000000 +0200 -@@ -10,16 +10,22 @@ - int cryptpw_main(int argc, char **argv); - int cryptpw_main(int argc, char **argv) - { -- char salt[sizeof("$N$XXXXXXXX")]; -+ char salt[sizeof("$2a$10$1234567890123456789012X")]; - -- if (!getopt32(argv, "a:", NULL) || argv[optind - 1][0] != 'd') { -+ if (!getopt32(argv, "a:", NULL) -+ || (argv[optind - 1][0] != 'b' && argv[optind - 1][0] != 'd')) { -+ /* md5 */ - strcpy(salt, "$1$"); -- /* Too ugly, and needs even more magic to handle endianness: */ -- //((uint32_t*)&salt)[0] = '$' + '1'*0x100 + '$'*0x10000; -- /* Hope one day gcc will do it itself (inlining strcpy) */ -- crypt_make_salt(salt + 3, 4, 0); /* md5 */ -+ crypt_make_salt(salt + 3, 4, 0); -+#if ENABLE_FEATURE_CRYPTPW_BLOWFISH -+ } else if (argv[optind - 1][0] == 'b') { -+ /* blowfish */ -+ strcpy(salt, "$2a$10$"); -+ crypt_make_salt(salt + 7, 11, 0); -+#endif - } else { -- crypt_make_salt(salt, 1, 0); /* des */ -+ /* des */ -+ crypt_make_salt(salt, 1, 0); - } - - puts(pw_encrypt(argv[optind] ? argv[optind] : xmalloc_getline(stdin), salt)); diff --git a/tools/busybox-patches/cryptpw-blowfish-1.8.2.diff b/tools/busybox-patches/cryptpw-blowfish-1.8.2.diff new file mode 100644 index 00000000..f10e561b --- /dev/null +++ b/tools/busybox-patches/cryptpw-blowfish-1.8.2.diff @@ -0,0 +1,79 @@ +diff -ruw busybox-1.6.1/include/usage.h busybox-1.6.1-openslx/include/usage.h +--- busybox-1.6.1/include/usage.h 2007-06-30 17:06:45.000000000 +0200 ++++ busybox-1.6.1-openslx/include/usage.h 2007-08-04 15:41:14.000000000 +0200 +@@ -502,12 +502,23 @@ + " -c dir Crontab directory" + + #define cryptpw_trivial_usage \ +- "[-a des|md5] [string]" ++ USE_FEATURE_CRYPTPW_BLOWFISH( \ ++ "[-a des|md5|blowfish] [string]" \ ++ ) \ ++ SKIP_FEATURE_CRYPTPW_BLOWFISH( \ ++ "[-a des|md5] [string]" \ ++ ) + #define cryptpw_full_usage \ + "Outputs crypted string.\n" \ + "If string isn't supplied on cmdline, reads it from stdin.\n" \ + "\nOptions:" \ +- "\n -a Algorithm to use (default: md5)" ++ "\n -a Algorithm to use (default: md5)" \ ++ "\n Available algorithms:" \ ++ USE_FEATURE_CRYPTPW_BLOWFISH( \ ++ "\n blowfish" \ ++ ) \ ++ "\n des" \ ++ "\n md5" + + #define cut_trivial_usage \ + "[OPTION]... [FILE]..." +diff -ruw busybox-1.6.1/loginutils/Config.in busybox-1.6.1-openslx/loginutils/Config.in +--- busybox-1.6.1/loginutils/Config.in 2007-06-30 17:06:45.000000000 +0200 ++++ busybox-1.6.1-openslx/loginutils/Config.in 2007-08-04 15:06:36.000000000 +0200 +@@ -187,6 +187,13 @@ + help + Applet for crypting a string. + ++config FEATURE_CRYPTPW_BLOWFISH ++ bool "Support blowfish in cryptpw" ++ default y ++ depends on CRYPTPW ++ help ++ With this option cryptpw will support the blowfish cipher, too. ++ + config CHPASSWD + bool "chpasswd" + default n +diff -ruw busybox-1.6.1/loginutils/cryptpw.c busybox-1.6.1-openslx/loginutils/cryptpw.c +--- busybox-1.6.1/loginutils/cryptpw.c 2007-06-30 17:06:45.000000000 +0200 ++++ busybox-1.6.1-openslx/loginutils/cryptpw.c 2007-08-04 15:32:48.000000000 +0200 +@@ -10,16 +10,22 @@ + int cryptpw_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; + int cryptpw_main(int argc, char **argv) + { +- char salt[sizeof("$N$XXXXXXXX")]; ++ char salt[sizeof("$2a$10$1234567890123456789012X")]; + +- if (!getopt32(argv, "a:", NULL) || argv[optind - 1][0] != 'd') { ++ if (!getopt32(argv, "a:", NULL) ++ || (argv[optind - 1][0] != 'b' && argv[optind - 1][0] != 'd')) { ++ /* md5 */ + strcpy(salt, "$1$"); +- /* Too ugly, and needs even more magic to handle endianness: */ +- //((uint32_t*)&salt)[0] = '$' + '1'*0x100 + '$'*0x10000; +- /* Hope one day gcc will do it itself (inlining strcpy) */ +- crypt_make_salt(salt + 3, 4, 0); /* md5 */ ++ crypt_make_salt(salt + 3, 4, 0); ++#if ENABLE_FEATURE_CRYPTPW_BLOWFISH ++ } else if (argv[optind - 1][0] == 'b') { ++ /* blowfish */ ++ strcpy(salt, "$2a$10$"); ++ crypt_make_salt(salt + 7, 11, 0); ++#endif + } else { +- crypt_make_salt(salt, 1, 0); /* des */ ++ /* des */ ++ crypt_make_salt(salt, 1, 0); + } + + puts(pw_encrypt(argv[optind] ? argv[optind] : xmalloc_getline(stdin), salt)); diff --git a/tools/busybox-patches/series b/tools/busybox-patches/series index 52424afc..0d833277 100644 --- a/tools/busybox-patches/series +++ b/tools/busybox-patches/series @@ -1,4 +1,5 @@ # series file useable by quilt -bzip2-payload-1.7.1.diff -cryptpw-blowfish-1.7.1.diff -unionfs-run-init-1.7.1.diff +bzip2-payload-1.8.2.diff +cryptpw-blowfish-1.8.2.diff +unionfs-run-init-1.8.2.diff +vncpasswd-1.8.2.diff diff --git a/tools/busybox-patches/unionfs-run-init-1.7.1.diff b/tools/busybox-patches/unionfs-run-init-1.7.1.diff deleted file mode 100644 index 768e07c6..00000000 --- a/tools/busybox-patches/unionfs-run-init-1.7.1.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -ruw busybox-1.6.1/util-linux/switch_root.c busybox-1.6.1-openslx/util-linux/switch_root.c ---- busybox-1.6.1/util-linux/switch_root.c 2007-06-30 17:06:48.000000000 +0200 -+++ busybox-1.6.1-openslx/util-linux/switch_root.c 2007-08-03 18:52:59.000000000 +0200 -@@ -105,6 +105,10 @@ - // Overmount / with newdir and chroot into it. The chdir is needed to - // recalculate "." and ".." links. - -+ if ( !lstat("/rorootfs", &st1 ) ) -+ if ( mount("/rorootfs", "/", NULL, MS_MOVE, NULL) ) -+ bb_error_msg_and_die("moving rorootfs"); -+ - if (mount(".", "/", NULL, MS_MOVE, NULL) || chroot(".")) - bb_error_msg_and_die("error moving root"); - xchdir("/"); diff --git a/tools/busybox-patches/unionfs-run-init-1.8.2.diff b/tools/busybox-patches/unionfs-run-init-1.8.2.diff new file mode 100644 index 00000000..768e07c6 --- /dev/null +++ b/tools/busybox-patches/unionfs-run-init-1.8.2.diff @@ -0,0 +1,14 @@ +diff -ruw busybox-1.6.1/util-linux/switch_root.c busybox-1.6.1-openslx/util-linux/switch_root.c +--- busybox-1.6.1/util-linux/switch_root.c 2007-06-30 17:06:48.000000000 +0200 ++++ busybox-1.6.1-openslx/util-linux/switch_root.c 2007-08-03 18:52:59.000000000 +0200 +@@ -105,6 +105,10 @@ + // Overmount / with newdir and chroot into it. The chdir is needed to + // recalculate "." and ".." links. + ++ if ( !lstat("/rorootfs", &st1 ) ) ++ if ( mount("/rorootfs", "/", NULL, MS_MOVE, NULL) ) ++ bb_error_msg_and_die("moving rorootfs"); ++ + if (mount(".", "/", NULL, MS_MOVE, NULL) || chroot(".")) + bb_error_msg_and_die("error moving root"); + xchdir("/"); diff --git a/tools/busybox-patches/vncpasswd-1.8.2.diff b/tools/busybox-patches/vncpasswd-1.8.2.diff new file mode 100644 index 00000000..15c6158b --- /dev/null +++ b/tools/busybox-patches/vncpasswd-1.8.2.diff @@ -0,0 +1,585 @@ +diff -ruw busybox-1.8.2/include/applets.h busybox-1.8.2-openslx/include/applets.h +--- busybox-1.8.2/include/applets.h 2007-11-10 02:40:53.000000000 +0100 ++++ busybox-1.8.2-openslx/include/applets.h 2008-02-04 00:32:29.000000000 +0100 +@@ -371,6 +371,7 @@ + USE_VCONFIG(APPLET(vconfig, _BB_DIR_SBIN, _BB_SUID_NEVER)) + USE_VI(APPLET(vi, _BB_DIR_BIN, _BB_SUID_NEVER)) + USE_VLOCK(APPLET(vlock, _BB_DIR_USR_BIN, _BB_SUID_ALWAYS)) ++USE_VNCPASSWD(APPLET(vncpasswd, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) + USE_WATCH(APPLET(watch, _BB_DIR_BIN, _BB_SUID_NEVER)) + USE_WATCHDOG(APPLET(watchdog, _BB_DIR_SBIN, _BB_SUID_NEVER)) + USE_WC(APPLET(wc, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) +diff -ruw busybox-1.8.2/include/usage.h busybox-1.8.2-openslx/include/usage.h +--- busybox-1.8.2/include/usage.h 2007-11-10 02:40:53.000000000 +0100 ++++ busybox-1.8.2-openslx/include/usage.h 2008-02-04 00:16:18.000000000 +0100 +@@ -4043,6 +4043,11 @@ + "\n\nOptions:\n" \ + " -a Lock all VTs" + ++#define vncpasswd_trivial_usage \ ++ "PASSWD" ++#define vncpasswdl_full_usage \ ++ "Create a password to use for VNC." ++ + #define watch_trivial_usage \ + "[-n seconds] [-t] COMMAND..." + #define watch_full_usage \ +diff -ruw busybox-1.8.2/loginutils/Config.in busybox-1.8.2-openslx/loginutils/Config.in +--- busybox-1.8.2/loginutils/Config.in 2007-11-10 02:40:53.000000000 +0100 ++++ busybox-1.8.2-openslx/loginutils/Config.in 2008-02-04 00:08:58.000000000 +0100 +@@ -242,5 +242,11 @@ + Note that Busybox binary must be setuid root for this applet to + work properly. + ++config VNCPASSWD ++ bool "vncpasswd" ++ default y ++ help ++ Applet for creating a vnc password. ++ + endmenu + +diff -ruw busybox-1.8.2/loginutils/Kbuild busybox-1.8.2-openslx/loginutils/Kbuild +--- busybox-1.8.2/loginutils/Kbuild 2007-11-10 02:40:53.000000000 +0100 ++++ busybox-1.8.2-openslx/loginutils/Kbuild 2008-02-04 00:38:47.000000000 +0100 +@@ -17,3 +17,4 @@ + lib-$(CONFIG_VLOCK) += vlock.o + lib-$(CONFIG_DELUSER) += deluser.o + lib-$(CONFIG_DELGROUP) += deluser.o ++lib-$(CONFIG_VNCPASSWD) += vncpasswd.o d3des.o +diff -ruwN busybox-1.8.2/loginutils/d3des.c busybox-1.8.2-openslx/loginutils/d3des.c +--- busybox-1.8.2/loginutils/d3des.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.8.2-openslx/loginutils/d3des.c 2004-11-17 18:24:24.000000000 +0100 +@@ -0,0 +1,434 @@ ++/* ++ * This is D3DES (V5.09) by Richard Outerbridge with the double and ++ * triple-length support removed for use in VNC. Also the bytebit[] array ++ * has been reversed so that the most significant bit in each byte of the ++ * key is ignored, not the least significant. ++ * ++ * These changes are: ++ * Copyright (C) 1999 AT&T Laboratories Cambridge. All Rights Reserved. ++ * ++ * This software is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++ */ ++ ++/* D3DES (V5.09) - ++ * ++ * A portable, public domain, version of the Data Encryption Standard. ++ * ++ * Written with Symantec's THINK (Lightspeed) C by Richard Outerbridge. ++ * Thanks to: Dan Hoey for his excellent Initial and Inverse permutation ++ * code; Jim Gillogly & Phil Karn for the DES key schedule code; Dennis ++ * Ferguson, Eric Young and Dana How for comparing notes; and Ray Lau, ++ * for humouring me on. ++ * ++ * Copyright (c) 1988,1989,1990,1991,1992 by Richard Outerbridge. ++ * (GEnie : OUTER; CIS : [71755,204]) Graven Imagery, 1992. ++ */ ++ ++#include "d3des.h" ++ ++static void scrunch(unsigned char *, unsigned long *); ++static void unscrun(unsigned long *, unsigned char *); ++static void desfunc(unsigned long *, unsigned long *); ++static void cookey(unsigned long *); ++ ++static unsigned long KnL[32] = { 0L }; ++ ++static unsigned short bytebit[8] = { ++ 01, 02, 04, 010, 020, 040, 0100, 0200 }; ++ ++static unsigned long bigbyte[24] = { ++ 0x800000L, 0x400000L, 0x200000L, 0x100000L, ++ 0x80000L, 0x40000L, 0x20000L, 0x10000L, ++ 0x8000L, 0x4000L, 0x2000L, 0x1000L, ++ 0x800L, 0x400L, 0x200L, 0x100L, ++ 0x80L, 0x40L, 0x20L, 0x10L, ++ 0x8L, 0x4L, 0x2L, 0x1L }; ++ ++/* Use the key schedule specified in the Standard (ANSI X3.92-1981). */ ++ ++static unsigned char pc1[56] = { ++ 56, 48, 40, 32, 24, 16, 8, 0, 57, 49, 41, 33, 25, 17, ++ 9, 1, 58, 50, 42, 34, 26, 18, 10, 2, 59, 51, 43, 35, ++ 62, 54, 46, 38, 30, 22, 14, 6, 61, 53, 45, 37, 29, 21, ++ 13, 5, 60, 52, 44, 36, 28, 20, 12, 4, 27, 19, 11, 3 }; ++ ++static unsigned char totrot[16] = { ++ 1,2,4,6,8,10,12,14,15,17,19,21,23,25,27,28 }; ++ ++static unsigned char pc2[48] = { ++ 13, 16, 10, 23, 0, 4, 2, 27, 14, 5, 20, 9, ++ 22, 18, 11, 3, 25, 7, 15, 6, 26, 19, 12, 1, ++ 40, 51, 30, 36, 46, 54, 29, 39, 50, 44, 32, 47, ++ 43, 48, 38, 55, 33, 52, 45, 41, 49, 35, 28, 31 }; ++ ++void deskey(key, edf) /* Thanks to James Gillogly & Phil Karn! */ ++unsigned char *key; ++int edf; ++{ ++ register int i, j, l, m, n; ++ unsigned char pc1m[56], pcr[56]; ++ unsigned long kn[32]; ++ ++ for ( j = 0; j < 56; j++ ) { ++ l = pc1[j]; ++ m = l & 07; ++ pc1m[j] = (key[l >> 3] & bytebit[m]) ? 1 : 0; ++ } ++ for( i = 0; i < 16; i++ ) { ++ if( edf == DE1 ) m = (15 - i) << 1; ++ else m = i << 1; ++ n = m + 1; ++ kn[m] = kn[n] = 0L; ++ for( j = 0; j < 28; j++ ) { ++ l = j + totrot[i]; ++ if( l < 28 ) pcr[j] = pc1m[l]; ++ else pcr[j] = pc1m[l - 28]; ++ } ++ for( j = 28; j < 56; j++ ) { ++ l = j + totrot[i]; ++ if( l < 56 ) pcr[j] = pc1m[l]; ++ else pcr[j] = pc1m[l - 28]; ++ } ++ for( j = 0; j < 24; j++ ) { ++ if( pcr[pc2[j]] ) kn[m] |= bigbyte[j]; ++ if( pcr[pc2[j+24]] ) kn[n] |= bigbyte[j]; ++ } ++ } ++ cookey(kn); ++ return; ++ } ++ ++static void cookey(raw1) ++register unsigned long *raw1; ++{ ++ register unsigned long *cook, *raw0; ++ unsigned long dough[32]; ++ register int i; ++ ++ cook = dough; ++ for( i = 0; i < 16; i++, raw1++ ) { ++ raw0 = raw1++; ++ *cook = (*raw0 & 0x00fc0000L) << 6; ++ *cook |= (*raw0 & 0x00000fc0L) << 10; ++ *cook |= (*raw1 & 0x00fc0000L) >> 10; ++ *cook++ |= (*raw1 & 0x00000fc0L) >> 6; ++ *cook = (*raw0 & 0x0003f000L) << 12; ++ *cook |= (*raw0 & 0x0000003fL) << 16; ++ *cook |= (*raw1 & 0x0003f000L) >> 4; ++ *cook++ |= (*raw1 & 0x0000003fL); ++ } ++ usekey(dough); ++ return; ++ } ++ ++void cpkey(into) ++register unsigned long *into; ++{ ++ register unsigned long *from, *endp; ++ ++ from = KnL, endp = &KnL[32]; ++ while( from < endp ) *into++ = *from++; ++ return; ++ } ++ ++void usekey(from) ++register unsigned long *from; ++{ ++ register unsigned long *to, *endp; ++ ++ to = KnL, endp = &KnL[32]; ++ while( to < endp ) *to++ = *from++; ++ return; ++ } ++ ++void des(inblock, outblock) ++unsigned char *inblock, *outblock; ++{ ++ unsigned long work[2]; ++ ++ scrunch(inblock, work); ++ desfunc(work, KnL); ++ unscrun(work, outblock); ++ return; ++ } ++ ++static void scrunch(outof, into) ++register unsigned char *outof; ++register unsigned long *into; ++{ ++ *into = (*outof++ & 0xffL) << 24; ++ *into |= (*outof++ & 0xffL) << 16; ++ *into |= (*outof++ & 0xffL) << 8; ++ *into++ |= (*outof++ & 0xffL); ++ *into = (*outof++ & 0xffL) << 24; ++ *into |= (*outof++ & 0xffL) << 16; ++ *into |= (*outof++ & 0xffL) << 8; ++ *into |= (*outof & 0xffL); ++ return; ++ } ++ ++static void unscrun(outof, into) ++register unsigned long *outof; ++register unsigned char *into; ++{ ++ *into++ = (unsigned char)((*outof >> 24) & 0xffL); ++ *into++ = (unsigned char)((*outof >> 16) & 0xffL); ++ *into++ = (unsigned char)((*outof >> 8) & 0xffL); ++ *into++ = (unsigned char)(*outof++ & 0xffL); ++ *into++ = (unsigned char)((*outof >> 24) & 0xffL); ++ *into++ = (unsigned char)((*outof >> 16) & 0xffL); ++ *into++ = (unsigned char)((*outof >> 8) & 0xffL); ++ *into = (unsigned char)(*outof & 0xffL); ++ return; ++ } ++ ++static unsigned long SP1[64] = { ++ 0x01010400L, 0x00000000L, 0x00010000L, 0x01010404L, ++ 0x01010004L, 0x00010404L, 0x00000004L, 0x00010000L, ++ 0x00000400L, 0x01010400L, 0x01010404L, 0x00000400L, ++ 0x01000404L, 0x01010004L, 0x01000000L, 0x00000004L, ++ 0x00000404L, 0x01000400L, 0x01000400L, 0x00010400L, ++ 0x00010400L, 0x01010000L, 0x01010000L, 0x01000404L, ++ 0x00010004L, 0x01000004L, 0x01000004L, 0x00010004L, ++ 0x00000000L, 0x00000404L, 0x00010404L, 0x01000000L, ++ 0x00010000L, 0x01010404L, 0x00000004L, 0x01010000L, ++ 0x01010400L, 0x01000000L, 0x01000000L, 0x00000400L, ++ 0x01010004L, 0x00010000L, 0x00010400L, 0x01000004L, ++ 0x00000400L, 0x00000004L, 0x01000404L, 0x00010404L, ++ 0x01010404L, 0x00010004L, 0x01010000L, 0x01000404L, ++ 0x01000004L, 0x00000404L, 0x00010404L, 0x01010400L, ++ 0x00000404L, 0x01000400L, 0x01000400L, 0x00000000L, ++ 0x00010004L, 0x00010400L, 0x00000000L, 0x01010004L }; ++ ++static unsigned long SP2[64] = { ++ 0x80108020L, 0x80008000L, 0x00008000L, 0x00108020L, ++ 0x00100000L, 0x00000020L, 0x80100020L, 0x80008020L, ++ 0x80000020L, 0x80108020L, 0x80108000L, 0x80000000L, ++ 0x80008000L, 0x00100000L, 0x00000020L, 0x80100020L, ++ 0x00108000L, 0x00100020L, 0x80008020L, 0x00000000L, ++ 0x80000000L, 0x00008000L, 0x00108020L, 0x80100000L, ++ 0x00100020L, 0x80000020L, 0x00000000L, 0x00108000L, ++ 0x00008020L, 0x80108000L, 0x80100000L, 0x00008020L, ++ 0x00000000L, 0x00108020L, 0x80100020L, 0x00100000L, ++ 0x80008020L, 0x80100000L, 0x80108000L, 0x00008000L, ++ 0x80100000L, 0x80008000L, 0x00000020L, 0x80108020L, ++ 0x00108020L, 0x00000020L, 0x00008000L, 0x80000000L, ++ 0x00008020L, 0x80108000L, 0x00100000L, 0x80000020L, ++ 0x00100020L, 0x80008020L, 0x80000020L, 0x00100020L, ++ 0x00108000L, 0x00000000L, 0x80008000L, 0x00008020L, ++ 0x80000000L, 0x80100020L, 0x80108020L, 0x00108000L }; ++ ++static unsigned long SP3[64] = { ++ 0x00000208L, 0x08020200L, 0x00000000L, 0x08020008L, ++ 0x08000200L, 0x00000000L, 0x00020208L, 0x08000200L, ++ 0x00020008L, 0x08000008L, 0x08000008L, 0x00020000L, ++ 0x08020208L, 0x00020008L, 0x08020000L, 0x00000208L, ++ 0x08000000L, 0x00000008L, 0x08020200L, 0x00000200L, ++ 0x00020200L, 0x08020000L, 0x08020008L, 0x00020208L, ++ 0x08000208L, 0x00020200L, 0x00020000L, 0x08000208L, ++ 0x00000008L, 0x08020208L, 0x00000200L, 0x08000000L, ++ 0x08020200L, 0x08000000L, 0x00020008L, 0x00000208L, ++ 0x00020000L, 0x08020200L, 0x08000200L, 0x00000000L, ++ 0x00000200L, 0x00020008L, 0x08020208L, 0x08000200L, ++ 0x08000008L, 0x00000200L, 0x00000000L, 0x08020008L, ++ 0x08000208L, 0x00020000L, 0x08000000L, 0x08020208L, ++ 0x00000008L, 0x00020208L, 0x00020200L, 0x08000008L, ++ 0x08020000L, 0x08000208L, 0x00000208L, 0x08020000L, ++ 0x00020208L, 0x00000008L, 0x08020008L, 0x00020200L }; ++ ++static unsigned long SP4[64] = { ++ 0x00802001L, 0x00002081L, 0x00002081L, 0x00000080L, ++ 0x00802080L, 0x00800081L, 0x00800001L, 0x00002001L, ++ 0x00000000L, 0x00802000L, 0x00802000L, 0x00802081L, ++ 0x00000081L, 0x00000000L, 0x00800080L, 0x00800001L, ++ 0x00000001L, 0x00002000L, 0x00800000L, 0x00802001L, ++ 0x00000080L, 0x00800000L, 0x00002001L, 0x00002080L, ++ 0x00800081L, 0x00000001L, 0x00002080L, 0x00800080L, ++ 0x00002000L, 0x00802080L, 0x00802081L, 0x00000081L, ++ 0x00800080L, 0x00800001L, 0x00802000L, 0x00802081L, ++ 0x00000081L, 0x00000000L, 0x00000000L, 0x00802000L, ++ 0x00002080L, 0x00800080L, 0x00800081L, 0x00000001L, ++ 0x00802001L, 0x00002081L, 0x00002081L, 0x00000080L, ++ 0x00802081L, 0x00000081L, 0x00000001L, 0x00002000L, ++ 0x00800001L, 0x00002001L, 0x00802080L, 0x00800081L, ++ 0x00002001L, 0x00002080L, 0x00800000L, 0x00802001L, ++ 0x00000080L, 0x00800000L, 0x00002000L, 0x00802080L }; ++ ++static unsigned long SP5[64] = { ++ 0x00000100L, 0x02080100L, 0x02080000L, 0x42000100L, ++ 0x00080000L, 0x00000100L, 0x40000000L, 0x02080000L, ++ 0x40080100L, 0x00080000L, 0x02000100L, 0x40080100L, ++ 0x42000100L, 0x42080000L, 0x00080100L, 0x40000000L, ++ 0x02000000L, 0x40080000L, 0x40080000L, 0x00000000L, ++ 0x40000100L, 0x42080100L, 0x42080100L, 0x02000100L, ++ 0x42080000L, 0x40000100L, 0x00000000L, 0x42000000L, ++ 0x02080100L, 0x02000000L, 0x42000000L, 0x00080100L, ++ 0x00080000L, 0x42000100L, 0x00000100L, 0x02000000L, ++ 0x40000000L, 0x02080000L, 0x42000100L, 0x40080100L, ++ 0x02000100L, 0x40000000L, 0x42080000L, 0x02080100L, ++ 0x40080100L, 0x00000100L, 0x02000000L, 0x42080000L, ++ 0x42080100L, 0x00080100L, 0x42000000L, 0x42080100L, ++ 0x02080000L, 0x00000000L, 0x40080000L, 0x42000000L, ++ 0x00080100L, 0x02000100L, 0x40000100L, 0x00080000L, ++ 0x00000000L, 0x40080000L, 0x02080100L, 0x40000100L }; ++ ++static unsigned long SP6[64] = { ++ 0x20000010L, 0x20400000L, 0x00004000L, 0x20404010L, ++ 0x20400000L, 0x00000010L, 0x20404010L, 0x00400000L, ++ 0x20004000L, 0x00404010L, 0x00400000L, 0x20000010L, ++ 0x00400010L, 0x20004000L, 0x20000000L, 0x00004010L, ++ 0x00000000L, 0x00400010L, 0x20004010L, 0x00004000L, ++ 0x00404000L, 0x20004010L, 0x00000010L, 0x20400010L, ++ 0x20400010L, 0x00000000L, 0x00404010L, 0x20404000L, ++ 0x00004010L, 0x00404000L, 0x20404000L, 0x20000000L, ++ 0x20004000L, 0x00000010L, 0x20400010L, 0x00404000L, ++ 0x20404010L, 0x00400000L, 0x00004010L, 0x20000010L, ++ 0x00400000L, 0x20004000L, 0x20000000L, 0x00004010L, ++ 0x20000010L, 0x20404010L, 0x00404000L, 0x20400000L, ++ 0x00404010L, 0x20404000L, 0x00000000L, 0x20400010L, ++ 0x00000010L, 0x00004000L, 0x20400000L, 0x00404010L, ++ 0x00004000L, 0x00400010L, 0x20004010L, 0x00000000L, ++ 0x20404000L, 0x20000000L, 0x00400010L, 0x20004010L }; ++ ++static unsigned long SP7[64] = { ++ 0x00200000L, 0x04200002L, 0x04000802L, 0x00000000L, ++ 0x00000800L, 0x04000802L, 0x00200802L, 0x04200800L, ++ 0x04200802L, 0x00200000L, 0x00000000L, 0x04000002L, ++ 0x00000002L, 0x04000000L, 0x04200002L, 0x00000802L, ++ 0x04000800L, 0x00200802L, 0x00200002L, 0x04000800L, ++ 0x04000002L, 0x04200000L, 0x04200800L, 0x00200002L, ++ 0x04200000L, 0x00000800L, 0x00000802L, 0x04200802L, ++ 0x00200800L, 0x00000002L, 0x04000000L, 0x00200800L, ++ 0x04000000L, 0x00200800L, 0x00200000L, 0x04000802L, ++ 0x04000802L, 0x04200002L, 0x04200002L, 0x00000002L, ++ 0x00200002L, 0x04000000L, 0x04000800L, 0x00200000L, ++ 0x04200800L, 0x00000802L, 0x00200802L, 0x04200800L, ++ 0x00000802L, 0x04000002L, 0x04200802L, 0x04200000L, ++ 0x00200800L, 0x00000000L, 0x00000002L, 0x04200802L, ++ 0x00000000L, 0x00200802L, 0x04200000L, 0x00000800L, ++ 0x04000002L, 0x04000800L, 0x00000800L, 0x00200002L }; ++ ++static unsigned long SP8[64] = { ++ 0x10001040L, 0x00001000L, 0x00040000L, 0x10041040L, ++ 0x10000000L, 0x10001040L, 0x00000040L, 0x10000000L, ++ 0x00040040L, 0x10040000L, 0x10041040L, 0x00041000L, ++ 0x10041000L, 0x00041040L, 0x00001000L, 0x00000040L, ++ 0x10040000L, 0x10000040L, 0x10001000L, 0x00001040L, ++ 0x00041000L, 0x00040040L, 0x10040040L, 0x10041000L, ++ 0x00001040L, 0x00000000L, 0x00000000L, 0x10040040L, ++ 0x10000040L, 0x10001000L, 0x00041040L, 0x00040000L, ++ 0x00041040L, 0x00040000L, 0x10041000L, 0x00001000L, ++ 0x00000040L, 0x10040040L, 0x00001000L, 0x00041040L, ++ 0x10001000L, 0x00000040L, 0x10000040L, 0x10040000L, ++ 0x10040040L, 0x10000000L, 0x00040000L, 0x10001040L, ++ 0x00000000L, 0x10041040L, 0x00040040L, 0x10000040L, ++ 0x10040000L, 0x10001000L, 0x10001040L, 0x00000000L, ++ 0x10041040L, 0x00041000L, 0x00041000L, 0x00001040L, ++ 0x00001040L, 0x00040040L, 0x10000000L, 0x10041000L }; ++ ++static void desfunc(block, keys) ++register unsigned long *block, *keys; ++{ ++ register unsigned long fval, work, right, leftt; ++ register int round; ++ ++ leftt = block[0]; ++ right = block[1]; ++ work = ((leftt >> 4) ^ right) & 0x0f0f0f0fL; ++ right ^= work; ++ leftt ^= (work << 4); ++ work = ((leftt >> 16) ^ right) & 0x0000ffffL; ++ right ^= work; ++ leftt ^= (work << 16); ++ work = ((right >> 2) ^ leftt) & 0x33333333L; ++ leftt ^= work; ++ right ^= (work << 2); ++ work = ((right >> 8) ^ leftt) & 0x00ff00ffL; ++ leftt ^= work; ++ right ^= (work << 8); ++ right = ((right << 1) | ((right >> 31) & 1L)) & 0xffffffffL; ++ work = (leftt ^ right) & 0xaaaaaaaaL; ++ leftt ^= work; ++ right ^= work; ++ leftt = ((leftt << 1) | ((leftt >> 31) & 1L)) & 0xffffffffL; ++ ++ for( round = 0; round < 8; round++ ) { ++ work = (right << 28) | (right >> 4); ++ work ^= *keys++; ++ fval = SP7[ work & 0x3fL]; ++ fval |= SP5[(work >> 8) & 0x3fL]; ++ fval |= SP3[(work >> 16) & 0x3fL]; ++ fval |= SP1[(work >> 24) & 0x3fL]; ++ work = right ^ *keys++; ++ fval |= SP8[ work & 0x3fL]; ++ fval |= SP6[(work >> 8) & 0x3fL]; ++ fval |= SP4[(work >> 16) & 0x3fL]; ++ fval |= SP2[(work >> 24) & 0x3fL]; ++ leftt ^= fval; ++ work = (leftt << 28) | (leftt >> 4); ++ work ^= *keys++; ++ fval = SP7[ work & 0x3fL]; ++ fval |= SP5[(work >> 8) & 0x3fL]; ++ fval |= SP3[(work >> 16) & 0x3fL]; ++ fval |= SP1[(work >> 24) & 0x3fL]; ++ work = leftt ^ *keys++; ++ fval |= SP8[ work & 0x3fL]; ++ fval |= SP6[(work >> 8) & 0x3fL]; ++ fval |= SP4[(work >> 16) & 0x3fL]; ++ fval |= SP2[(work >> 24) & 0x3fL]; ++ right ^= fval; ++ } ++ ++ right = (right << 31) | (right >> 1); ++ work = (leftt ^ right) & 0xaaaaaaaaL; ++ leftt ^= work; ++ right ^= work; ++ leftt = (leftt << 31) | (leftt >> 1); ++ work = ((leftt >> 8) ^ right) & 0x00ff00ffL; ++ right ^= work; ++ leftt ^= (work << 8); ++ work = ((leftt >> 2) ^ right) & 0x33333333L; ++ right ^= work; ++ leftt ^= (work << 2); ++ work = ((right >> 16) ^ leftt) & 0x0000ffffL; ++ leftt ^= work; ++ right ^= (work << 16); ++ work = ((right >> 4) ^ leftt) & 0x0f0f0f0fL; ++ leftt ^= work; ++ right ^= (work << 4); ++ *block++ = right; ++ *block = leftt; ++ return; ++ } ++ ++/* Validation sets: ++ * ++ * Single-length key, single-length plaintext - ++ * Key : 0123 4567 89ab cdef ++ * Plain : 0123 4567 89ab cde7 ++ * Cipher : c957 4425 6a5e d31d ++ * ++ * Double-length key, single-length plaintext - ++ * Key : 0123 4567 89ab cdef fedc ba98 7654 3210 ++ * Plain : 0123 4567 89ab cde7 ++ * Cipher : 7f1d 0a77 826b 8aff ++ * ++ * Double-length key, double-length plaintext - ++ * Key : 0123 4567 89ab cdef fedc ba98 7654 3210 ++ * Plain : 0123 4567 89ab cdef 0123 4567 89ab cdff ++ * Cipher : 27a0 8440 406a df60 278f 47cf 42d6 15d7 ++ * ++ * Triple-length key, single-length plaintext - ++ * Key : 0123 4567 89ab cdef fedc ba98 7654 3210 89ab cdef 0123 4567 ++ * Plain : 0123 4567 89ab cde7 ++ * Cipher : de0b 7c06 ae5e 0ed5 ++ * ++ * Triple-length key, double-length plaintext - ++ * Key : 0123 4567 89ab cdef fedc ba98 7654 3210 89ab cdef 0123 4567 ++ * Plain : 0123 4567 89ab cdef 0123 4567 89ab cdff ++ * Cipher : ad0d 1b30 ac17 cf07 0ed1 1c63 81e4 4de5 ++ * ++ * d3des V5.0a rwo 9208.07 18:44 Graven Imagery ++ **********************************************************************/ +diff -ruwN busybox-1.8.2/loginutils/d3des.h busybox-1.8.2-openslx/loginutils/d3des.h +--- busybox-1.8.2/loginutils/d3des.h 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.8.2-openslx/loginutils/d3des.h 2004-07-07 16:21:48.000000000 +0200 +@@ -0,0 +1,51 @@ ++/* ++ * This is D3DES (V5.09) by Richard Outerbridge with the double and ++ * triple-length support removed for use in VNC. ++ * ++ * These changes are: ++ * Copyright (C) 1999 AT&T Laboratories Cambridge. All Rights Reserved. ++ * ++ * This software is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++ */ ++ ++/* d3des.h - ++ * ++ * Headers and defines for d3des.c ++ * Graven Imagery, 1992. ++ * ++ * Copyright (c) 1988,1989,1990,1991,1992 by Richard Outerbridge ++ * (GEnie : OUTER; CIS : [71755,204]) ++ */ ++ ++#define EN0 0 /* MODE == encrypt */ ++#define DE1 1 /* MODE == decrypt */ ++ ++extern void deskey(unsigned char *, int); ++/* hexkey[8] MODE ++ * Sets the internal key register according to the hexadecimal ++ * key contained in the 8 bytes of hexkey, according to the DES, ++ * for encryption or decryption according to MODE. ++ */ ++ ++extern void usekey(unsigned long *); ++/* cookedkey[32] ++ * Loads the internal key register with the data in cookedkey. ++ */ ++ ++extern void cpkey(unsigned long *); ++/* cookedkey[32] ++ * Copies the contents of the internal key register into the storage ++ * located at &cookedkey[0]. ++ */ ++ ++extern void des(unsigned char *, unsigned char *); ++/* from[8] to[8] ++ * Encrypts/Decrypts (according to the key currently loaded in the ++ * internal key register) one block of eight bytes at address 'from' ++ * into the block at address 'to'. They can be the same. ++ */ ++ ++/* d3des.h V5.09 rwo 9208.04 15:06 Graven Imagery ++ ********************************************************************/ +diff -ruwN busybox-1.8.2/loginutils/vncpasswd.c busybox-1.8.2-openslx/loginutils/vncpasswd.c +--- busybox-1.8.2/loginutils/vncpasswd.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox-1.8.2-openslx/loginutils/vncpasswd.c 2008-02-04 00:48:01.000000000 +0100 +@@ -0,0 +1,39 @@ ++/* vi: set sw=4 ts=4: */ ++/* ++ * vncpasswd.c ++ * ++ * openslx tool for generating a binary password to be used for VNC ++ */ ++ ++#include "libbb.h" ++#include "d3des.h" ++ ++static unsigned char fixedkey[8] = {23,82,107,6,35,78,88,7}; ++ ++int vncpasswd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; ++int vncpasswd_main(int argc, char **argv) ++{ ++ unsigned char *inpasswd; ++ unsigned char passwd[8]; ++ int pwlen, i; ++ if (argc < 2) { ++ puts("You have to specify a password."); ++ return 5; ++ } ++ inpasswd = argv[1]; ++ pwlen = strlen(inpasswd); ++ for (i = 0; i < 8; i++) { ++ if (i < pwlen) { ++ passwd[i] = inpasswd[i]; ++ } else { ++ passwd[i] = 0; ++ } ++ } ++ deskey(fixedkey, 0); ++ des(passwd, passwd); ++ ++ for (i = 0; i < 8; i++) { ++ putchar(passwd[i]); ++ } ++ return 0; ++} diff --git a/tools/busybox.i586 b/tools/busybox.i586 index a7916059..745726b3 100755 Binary files a/tools/busybox.i586 and b/tools/busybox.i586 differ -- cgit v1.2.3-55-g7522