diff options
Diffstat (limited to 'fs/cifs/smbencrypt.c')
-rw-r--r-- | fs/cifs/smbencrypt.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/cifs/smbencrypt.c b/fs/cifs/smbencrypt.c index f518c5e45035..4b25ba92180d 100644 --- a/fs/cifs/smbencrypt.c +++ b/fs/cifs/smbencrypt.c | |||
@@ -51,11 +51,8 @@ | |||
51 | 51 | ||
52 | void SMBencrypt(unsigned char *passwd, unsigned char *c8, unsigned char *p24); | 52 | void SMBencrypt(unsigned char *passwd, unsigned char *c8, unsigned char *p24); |
53 | void E_md4hash(const unsigned char *passwd, unsigned char *p16); | 53 | void E_md4hash(const unsigned char *passwd, unsigned char *p16); |
54 | void nt_lm_owf_gen(char *pwd, unsigned char nt_p16[16], unsigned char p16[16]); | ||
55 | static void SMBOWFencrypt(unsigned char passwd[16], unsigned char *c8, | 54 | static void SMBOWFencrypt(unsigned char passwd[16], unsigned char *c8, |
56 | unsigned char p24[24]); | 55 | unsigned char p24[24]); |
57 | void NTLMSSPOWFencrypt(unsigned char passwd[8], | ||
58 | unsigned char *ntlmchalresp, unsigned char p24[24]); | ||
59 | void SMBNTencrypt(unsigned char *passwd, unsigned char *c8, unsigned char *p24); | 56 | void SMBNTencrypt(unsigned char *passwd, unsigned char *c8, unsigned char *p24); |
60 | 57 | ||
61 | /* | 58 | /* |
@@ -144,8 +141,9 @@ E_md4hash(const unsigned char *passwd, unsigned char *p16) | |||
144 | memset(wpwd,0,129 * 2); | 141 | memset(wpwd,0,129 * 2); |
145 | } | 142 | } |
146 | 143 | ||
144 | #if 0 /* currently unused */ | ||
147 | /* Does both the NT and LM owfs of a user's password */ | 145 | /* Does both the NT and LM owfs of a user's password */ |
148 | void | 146 | static void |
149 | nt_lm_owf_gen(char *pwd, unsigned char nt_p16[16], unsigned char p16[16]) | 147 | nt_lm_owf_gen(char *pwd, unsigned char nt_p16[16], unsigned char p16[16]) |
150 | { | 148 | { |
151 | char passwd[514]; | 149 | char passwd[514]; |
@@ -171,6 +169,7 @@ nt_lm_owf_gen(char *pwd, unsigned char nt_p16[16], unsigned char p16[16]) | |||
171 | /* clear out local copy of user's password (just being paranoid). */ | 169 | /* clear out local copy of user's password (just being paranoid). */ |
172 | memset(passwd, '\0', sizeof (passwd)); | 170 | memset(passwd, '\0', sizeof (passwd)); |
173 | } | 171 | } |
172 | #endif | ||
174 | 173 | ||
175 | /* Does the NTLMv2 owfs of a user's password */ | 174 | /* Does the NTLMv2 owfs of a user's password */ |
176 | #if 0 /* function not needed yet - but will be soon */ | 175 | #if 0 /* function not needed yet - but will be soon */ |
@@ -223,7 +222,8 @@ SMBOWFencrypt(unsigned char passwd[16], unsigned char *c8, | |||
223 | } | 222 | } |
224 | 223 | ||
225 | /* Does the des encryption from the FIRST 8 BYTES of the NT or LM MD4 hash. */ | 224 | /* Does the des encryption from the FIRST 8 BYTES of the NT or LM MD4 hash. */ |
226 | void | 225 | #if 0 /* currently unused */ |
226 | static void | ||
227 | NTLMSSPOWFencrypt(unsigned char passwd[8], | 227 | NTLMSSPOWFencrypt(unsigned char passwd[8], |
228 | unsigned char *ntlmchalresp, unsigned char p24[24]) | 228 | unsigned char *ntlmchalresp, unsigned char p24[24]) |
229 | { | 229 | { |
@@ -235,6 +235,7 @@ NTLMSSPOWFencrypt(unsigned char passwd[8], | |||
235 | 235 | ||
236 | E_P24(p21, ntlmchalresp, p24); | 236 | E_P24(p21, ntlmchalresp, p24); |
237 | } | 237 | } |
238 | #endif | ||
238 | 239 | ||
239 | /* Does the NT MD4 hash then des encryption. */ | 240 | /* Does the NT MD4 hash then des encryption. */ |
240 | 241 | ||