1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
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));
|
