sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

fix some casting errors in smbencrypt and some multiply-defined errors

Browse Source 
in clientutil.c (Luke, you can't just copy a global variable
declaration from one file to another, you need to declare one of them
extern)
This commit is contained in:
Andrew Tridgell 0001-01-01 00:00:00 +00:00
parent 4bf5c03b18
commit 944ecbcbd4
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/client/client.c
View File

@ -44,7 +44,6 @@ extern BOOL connect_as_printer;
extern BOOL connect_as_ipc; extern BOOL connect_as_ipc;
extern struct in_addr ipzero; extern struct in_addr ipzero;
char cryptkey[8];
extern BOOL doencrypt; extern BOOL doencrypt;
extern pstring user_socket_options; extern pstring user_socket_options;

2
source/client/clientutil.c
View File

@ -67,7 +67,7 @@ int max_xmit = BUFFER_SIZE;
BOOL have_ip = False; BOOL have_ip = False;
struct in_addr dest_ip; extern struct in_addr dest_ip;
extern int Protocol; extern int Protocol;

5
source/libsmb/smbdes.c
View File

@ -329,11 +329,6 @@ void cred_hash2(unsigned char *out,unsigned char *in,unsigned char *key)
{ {
unsigned char buf[8]; unsigned char buf[8];
static unsigned char key2[8]; static unsigned char key2[8];
int i;
for (i=0;i<8;i++) {
key2[i] = 0;
}
smbhash(buf, in, key); smbhash(buf, in, key);
key2[0] = key[7]; key2[0] = key[7];

10
source/libsmb/smbencrypt.c
View File

@ -111,14 +111,14 @@ void SMBNTencrypt(uchar *passwd, uchar *c8, uchar *p24)
/* Does both the NT and LM owfs of a user's password */ /* Does both the NT and LM owfs of a user's password */
void nt_lm_owf_gen(char *pwd, char nt_p16[16], char p16[16]) void nt_lm_owf_gen(char *pwd, char *nt_p16, char *p16)
{ {
char passwd[129]; char passwd[130];
strncpy(passwd, pwd, 129); StrnCpy(passwd, pwd, sizeof(passwd)-1);
/* Calculate the MD4 hash (NT compatible) of the password */ /* Calculate the MD4 hash (NT compatible) of the password */
memset(nt_p16, '\0', 16); memset(nt_p16, '\0', 16);
E_md4hash((uchar *)passwd, nt_p16); E_md4hash((uchar *)passwd, (uchar *)nt_p16);
/* Mangle the passwords into Lanman format */ /* Mangle the passwords into Lanman format */
passwd[14] = '\0'; passwd[14] = '\0';
@ -127,7 +127,7 @@ void nt_lm_owf_gen(char *pwd, char nt_p16[16], char p16[16])
/* Calculate the SMB (lanman) hash functions of the password */ /* Calculate the SMB (lanman) hash functions of the password */
memset(p16, '\0', 16); memset(p16, '\0', 16);
E_P16((uchar *) passwd, p16); E_P16((uchar *) passwd, (uchar *)p16);
/* clear out local copy of user's password (just being paranoid). */ /* clear out local copy of user's password (just being paranoid). */
bzero(passwd, sizeof(passwd)); bzero(passwd, sizeof(passwd));