summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-01-14 08:26:54 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-01-14 08:26:54 +0000
commitd645041d6345ff2802dd2f06ebed1d8f456fee23 (patch)
tree78ecd30d1b5717559dca016ff5aed1b243c41991 /source3
parent61b65aad1361e221828c7eabfdd16b42b1643eb3 (diff)
downloadsamba-d645041d6345ff2802dd2f06ebed1d8f456fee23.tar.gz
samba-d645041d6345ff2802dd2f06ebed1d8f456fee23.tar.bz2
samba-d645041d6345ff2802dd2f06ebed1d8f456fee23.zip
Merge from HEAD:
- remove useless #else - signed/unsigned fixes - use an fstring for LM hash buffer. Andrew Bartlett (This used to be commit c0fb53c31fd7341745d14640e761affc5dae5230)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/signal.c2
-rw-r--r--source3/libsmb/smbencrypt.c21
2 files changed, 11 insertions, 12 deletions
diff --git a/source3/lib/signal.c b/source3/lib/signal.c
index dceb3b53bc..bff4b91c1a 100644
--- a/source3/lib/signal.c
+++ b/source3/lib/signal.c
@@ -57,8 +57,6 @@ static void sig_cld_leave_status(int signum)
#if !defined(HAVE_SIGACTION)
CatchSignal(SIGCLD, sig_cld_leave_status);
-#else
- ;
#endif
}
diff --git a/source3/libsmb/smbencrypt.c b/source3/libsmb/smbencrypt.c
index 42250fc19c..a57a98e3ea 100644
--- a/source3/libsmb/smbencrypt.c
+++ b/source3/libsmb/smbencrypt.c
@@ -73,13 +73,14 @@ void E_md4hash(const char *passwd, uchar p16[16])
void E_deshash(const char *passwd, uchar p16[16])
{
- uchar dospwd[15]; /* Password must not be > 14 chars long. */
+ fstring dospwd;
ZERO_STRUCT(dospwd);
ZERO_STRUCTP(p16);
/* Password must be converted to DOS charset - null terminated, uppercase. */
push_ascii(dospwd, (const char *)passwd, sizeof(dospwd), STR_UPPER|STR_TERMINATE);
+ /* Only the fisrt 14 chars are considered, password need not be null terminated. */
E_P16(dospwd, p16);
ZERO_STRUCT(dospwd);
@@ -122,33 +123,33 @@ BOOL ntv2_owf_gen(const uchar owf[16],
smb_ucs2_t *user;
smb_ucs2_t *domain;
- int user_byte_len;
- int domain_byte_len;
+ size_t user_byte_len;
+ size_t domain_byte_len;
HMACMD5Context ctx;
user_byte_len = push_ucs2_allocate(&user, user_in);
- if (user_byte_len < 0) {
- DEBUG(0, ("push_ucs2_allocate() for user returned %d (probably malloc() failure)\n", user_byte_len));
+ if (user_byte_len == (size_t)-1) {
+ DEBUG(0, ("push_uss2_allocate() for user returned -1 (probably malloc() failure)\n"));
return False;
}
domain_byte_len = push_ucs2_allocate(&domain, domain_in);
- if (domain_byte_len < 0) {
- DEBUG(0, ("push_ucs2_allocate() for domain returned %d (probably malloc() failure)\n", domain_byte_len));
+ if (domain_byte_len == (size_t)-1) {
+ DEBUG(0, ("push_uss2_allocate() for domain returned -1 (probably malloc() failure)\n"));
return False;
}
strupper_w(user);
strupper_w(domain);
+ SMB_ASSERT(user_byte_len >= 2);
+ SMB_ASSERT(domain_byte_len >= 2);
+
/* We don't want null termination */
user_byte_len = user_byte_len - 2;
domain_byte_len = domain_byte_len - 2;
- SMB_ASSERT(user_byte_len >= 0);
- SMB_ASSERT(domain_byte_len >= 0);
-
hmac_md5_init_limK_to_64(owf, 16, &ctx);
hmac_md5_update((const unsigned char *)user, user_byte_len, &ctx);
hmac_md5_update((const unsigned char *)domain, domain_byte_len, &ctx);