Lines 1-100
Link Here
|
1 |
--- chntpw.c.orig 2011-05-11 19:33:56 UTC |
|
|
2 |
+++ chntpw.c |
3 |
@@ -142,7 +142,7 @@ void str_to_key(unsigned char *str,unsig |
4 |
for (i=0;i<8;i++) { |
5 |
key[i] = (key[i]<<1); |
6 |
} |
7 |
- DES_set_odd_parity((des_cblock *)key); |
8 |
+ DES_set_odd_parity((DES_cblock *)key); |
9 |
} |
10 |
|
11 |
/* |
12 |
@@ -187,16 +187,16 @@ void sid_to_key2(uint32_t sid,unsigned c |
13 |
|
14 |
void E1(uchar *k, uchar *d, uchar *out) |
15 |
{ |
16 |
- des_key_schedule ks; |
17 |
- des_cblock deskey; |
18 |
+ DES_key_schedule ks; |
19 |
+ DES_cblock deskey; |
20 |
|
21 |
str_to_key(k,(uchar *)deskey); |
22 |
#ifdef __FreeBSD__ |
23 |
- des_set_key(&deskey,ks); |
24 |
+ DES_set_key(&deskey,&ks); |
25 |
#else /* __FreeBsd__ */ |
26 |
- des_set_key((des_cblock *)deskey,ks); |
27 |
+ DES_set_key((DES_cblock *)deskey,&ks); |
28 |
#endif /* __FreeBsd__ */ |
29 |
- des_ecb_encrypt((des_cblock *)d,(des_cblock *)out, ks, DES_ENCRYPT); |
30 |
+ DES_ecb_encrypt((DES_cblock *)d,(DES_cblock *)out, &ks, DES_ENCRYPT); |
31 |
} |
32 |
|
33 |
|
34 |
@@ -504,8 +504,8 @@ char *change_pw(char *buf, int rid, int |
35 |
int dontchange = 0; |
36 |
struct user_V *v; |
37 |
|
38 |
- des_key_schedule ks1, ks2; |
39 |
- des_cblock deskey1, deskey2; |
40 |
+ DES_key_schedule ks1, ks2; |
41 |
+ DES_cblock deskey1, deskey2; |
42 |
|
43 |
MD4_CTX context; |
44 |
unsigned char digest[16]; |
45 |
@@ -623,21 +623,21 @@ char *change_pw(char *buf, int rid, int |
46 |
|
47 |
/* Get the two decrpt keys. */ |
48 |
sid_to_key1(rid,(unsigned char *)deskey1); |
49 |
- des_set_key((des_cblock *)deskey1,ks1); |
50 |
+ DES_set_key((DES_cblock *)deskey1,&ks1); |
51 |
sid_to_key2(rid,(unsigned char *)deskey2); |
52 |
- des_set_key((des_cblock *)deskey2,ks2); |
53 |
+ DES_set_key((DES_cblock *)deskey2,&ks2); |
54 |
|
55 |
/* Decrypt the NT md4 password hash as two 8 byte blocks. */ |
56 |
- des_ecb_encrypt((des_cblock *)(vp+ntpw_offs ), |
57 |
- (des_cblock *)md4, ks1, DES_DECRYPT); |
58 |
- des_ecb_encrypt((des_cblock *)(vp+ntpw_offs + 8), |
59 |
- (des_cblock *)&md4[8], ks2, DES_DECRYPT); |
60 |
+ DES_ecb_encrypt((DES_cblock *)(vp+ntpw_offs ), |
61 |
+ (DES_cblock *)md4, &ks1, DES_DECRYPT); |
62 |
+ DES_ecb_encrypt((DES_cblock *)(vp+ntpw_offs + 8), |
63 |
+ (DES_cblock *)&md4[8], &ks2, DES_DECRYPT); |
64 |
|
65 |
/* Decrypt the lanman password hash as two 8 byte blocks. */ |
66 |
- des_ecb_encrypt((des_cblock *)(vp+lmpw_offs), |
67 |
- (des_cblock *)lanman, ks1, DES_DECRYPT); |
68 |
- des_ecb_encrypt((des_cblock *)(vp+lmpw_offs + 8), |
69 |
- (des_cblock *)&lanman[8], ks2, DES_DECRYPT); |
70 |
+ DES_ecb_encrypt((DES_cblock *)(vp+lmpw_offs), |
71 |
+ (DES_cblock *)lanman, &ks1, DES_DECRYPT); |
72 |
+ DES_ecb_encrypt((DES_cblock *)(vp+lmpw_offs + 8), |
73 |
+ (DES_cblock *)&lanman[8], &ks2, DES_DECRYPT); |
74 |
|
75 |
if (gverbose) { |
76 |
hexprnt("MD4 hash : ",(unsigned char *)md4,16); |
77 |
@@ -705,15 +705,15 @@ char *change_pw(char *buf, int rid, int |
78 |
if (gverbose) hexprnt("NEW LANMAN hash : ",(unsigned char *)lanman,16); |
79 |
|
80 |
/* Encrypt the NT md4 password hash as two 8 byte blocks. */ |
81 |
- des_ecb_encrypt((des_cblock *)digest, |
82 |
- (des_cblock *)despw, ks1, DES_ENCRYPT); |
83 |
- des_ecb_encrypt((des_cblock *)(digest+8), |
84 |
- (des_cblock *)&despw[8], ks2, DES_ENCRYPT); |
85 |
+ DES_ecb_encrypt((DES_cblock *)digest, |
86 |
+ (DES_cblock *)despw, &ks1, DES_ENCRYPT); |
87 |
+ DES_ecb_encrypt((DES_cblock *)digest, |
88 |
+ (DES_cblock *)&despw[8], &ks2, DES_ENCRYPT); |
89 |
|
90 |
- des_ecb_encrypt((des_cblock *)lanman, |
91 |
- (des_cblock *)newlandes, ks1, DES_ENCRYPT); |
92 |
- des_ecb_encrypt((des_cblock *)(lanman+8), |
93 |
- (des_cblock *)&newlandes[8], ks2, DES_ENCRYPT); |
94 |
+ DES_ecb_encrypt((DES_cblock *)lanman, |
95 |
+ (DES_cblock *)newlandes, &ks1, DES_ENCRYPT); |
96 |
+ DES_ecb_encrypt((DES_cblock *)(lanman+8), |
97 |
+ (DES_cblock *)&newlandes[8], &ks2, DES_ENCRYPT); |
98 |
|
99 |
if (gverbose) { |
100 |
hexprnt("NEW DES crypt : ",(unsigned char *)despw,16); |