Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-08-07 11:26:53 +00:00
Code Issues Projects Releases Wiki Activity

cryptpw: size reduction

Browse Source 
function                                             old     new   delta
cryptpw_main                                         198     140     -58
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-58)             Total: -58 bytes
This commit is contained in:
Denis Vlasenko
2007-05-09 21:27:15 +00:00
parent 68de720723
commit 57bf668d11
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
loginutils/cryptpw.c
View File

@@ -3,7 +3,6 @@
* cryptpw.c * cryptpw.c
* *
* Cooked from passwd.c by Thomas Lundquist <thomasez@zelow.no> * Cooked from passwd.c by Thomas Lundquist <thomasez@zelow.no>
*
*/ */
#include "busybox.h" #include "busybox.h"
@@ -11,27 +10,19 @@
int cryptpw_main(int argc, char **argv); int cryptpw_main(int argc, char **argv);
int cryptpw_main(int argc, char **argv) int cryptpw_main(int argc, char **argv)
{ {
char *clear; char salt[sizeof("$N$XXXXXXXX")];
char salt[sizeof("$N$XXXXXXXX")]; /* "$N$XXXXXXXX" or "XX" */
const char *opt_a = "md5";
getopt32(argc, argv, "a:", &opt_a); if (!getopt32(argc, argv, "a:", NULL) || argv[optind - 1][0] != 'd') {
/* move past the commandline options */
/*argc -= optind; - unused */
argv += optind;
crypt_make_salt(salt, 1); /* des */
if (strcasecmp(opt_a, "md5") == 0) {
strcpy(salt, "$1$"); strcpy(salt, "$1$");
crypt_make_salt(salt + 3, 4); /* Too ugly, and needs even more magic to handle endianness: */
} else if (strcasecmp(opt_a, "des") != 0) { //((uint32_t*)&salt)[0] = '$' + '1'*0x100 + '$'*0x10000;
bb_show_usage(); /* Hope one day gcc will do it itself (inlining strcpy) */
crypt_make_salt(salt + 3, 4); /* md5 */
} else {
crypt_make_salt(salt, 1); /* des */
} }
clear = argv[0]; puts(pw_encrypt(argv[optind] ? argv[optind] : xmalloc_getline(stdin), salt));
if (!clear)
clear = xmalloc_getline(stdin);
puts(pw_encrypt(clear, salt));
return 0; return 0;
} }