aboutsummaryrefslogtreecommitdiff
path: root/libbb/pw_encrypt_des.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-05-27 18:01:42 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2009-05-27 18:01:42 +0200
commit20cc390b9bb33cd0ab05c8bbfcd24babad7ec204 (patch)
tree876974f2abe0ae0213e5707fb551af70b73665cd /libbb/pw_encrypt_des.c
parentbae3abf2c7185f0a9145ed2c97abb2d2e7bc2b40 (diff)
downloadbusybox-w32-20cc390b9bb33cd0ab05c8bbfcd24babad7ec204.tar.gz
busybox-w32-20cc390b9bb33cd0ab05c8bbfcd24babad7ec204.tar.bz2
busybox-w32-20cc390b9bb33cd0ab05c8bbfcd24babad7ec204.zip
post-1.14.0 fixes
hush significantly updated. fixes for acpid, awk, depmod, dhcp, gzip, mdev, modprobe, sysctl. libbb fixes. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb/pw_encrypt_des.c')
-rw-r--r--libbb/pw_encrypt_des.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libbb/pw_encrypt_des.c b/libbb/pw_encrypt_des.c
index 52548d623..c8e02ddff 100644
--- 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],
778 to64_msb_first(output + 2, (r0 >> 8)); 778 to64_msb_first(output + 2, (r0 >> 8));
779 /* bits 7..0 of r0 and 31..16 of r1 */ 779 /* bits 7..0 of r0 and 31..16 of r1 */
780 to64_msb_first(output + 6, (r0 << 16) | (r1 >> 16)); 780 to64_msb_first(output + 6, (r0 << 16) | (r1 >> 16));
781 /* (bits 15..0 of r1 + 00) and NUL byte */ 781 /* bits 15..0 of r1 and two zero bits (plus extra zero byte) */
782 to64_msb_first(output + 10, (r1 << 8)); 782 to64_msb_first(output + 10, (r1 << 8));
783 /* extra zero byte is encoded as '.', fixing it */
784 output[13] = '\0';
783#endif 785#endif
784 786
785 return output; 787 return output;