projects
/
oweals
/
busybox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
05ae400
)
des encrypt: fix goof with NUL byte added at the end as '.'
author
Denys Vlasenko
<vda.linux@googlemail.com>
Fri, 1 May 2009 01:41:25 +0000
(
03:41
+0200)
committer
Denys Vlasenko
<vda.linux@googlemail.com>
Fri, 1 May 2009 01:41:25 +0000
(
03:41
+0200)
libbb/pw_encrypt_des.c
patch
|
blob
|
history
diff --git
a/libbb/pw_encrypt_des.c
b/libbb/pw_encrypt_des.c
index 52548d62395a9b8d1c132e38bf79ddc7fc05c05d..c8e02ddff82f2424309f0f0b491c441c23e61ebd 100644
(file)
--- a/
libbb/pw_encrypt_des.c
+++ b/
libbb/pw_encrypt_des.c
@@
-778,8
+778,10
@@
des_crypt(struct des_ctx *ctx, char output[DES_OUT_BUFSIZE],
to64_msb_first(output + 2, (r0 >> 8));
/* bits 7..0 of r0 and 31..16 of r1 */
to64_msb_first(output + 6, (r0 << 16) | (r1 >> 16));
- /*
(bits 15..0 of r1 + 00) and NUL byte
*/
+ /*
bits 15..0 of r1 and two zero bits (plus extra zero byte)
*/
to64_msb_first(output + 10, (r1 << 8));
+ /* extra zero byte is encoded as '.', fixing it */
+ output[13] = '\0';
#endif
return output;