diff options
author | Oliver Tappe | 2008-02-04 01:21:49 +0100 |
---|---|---|
committer | Oliver Tappe | 2008-02-04 01:21:49 +0100 |
commit | e9d8d18571c5c088c963a199984cd80c637d8ee9 (patch) | |
tree | 49f009cca42ac23c7869597b05a84d5a9ff64ad6 /tools/busybox-patches/cryptpw-blowfish-1.8.2.diff | |
parent | * cleaned up the code a bit with respect to the handling of target systems (diff) | |
download | core-e9d8d18571c5c088c963a199984cd80c637d8ee9.tar.gz core-e9d8d18571c5c088c963a199984cd80c637d8ee9.tar.xz core-e9d8d18571c5c088c963a199984cd80c637d8ee9.zip |
* 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
Diffstat (limited to 'tools/busybox-patches/cryptpw-blowfish-1.8.2.diff')
-rw-r--r-- | tools/busybox-patches/cryptpw-blowfish-1.8.2.diff | 79 |
1 files changed, 79 insertions, 0 deletions
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)); |