diff options
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp_parse.c | 8 | ||||
| -rw-r--r-- | source4/libcli/auth/smbencrypt.c | 6 | ||||
| -rw-r--r-- | source4/torture/rap/rap.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source4/auth/ntlmssp/ntlmssp_parse.c b/source4/auth/ntlmssp/ntlmssp_parse.c index 4fbfede350..9c711c0a14 100644 --- a/source4/auth/ntlmssp/ntlmssp_parse.c +++ b/source4/auth/ntlmssp/ntlmssp_parse.c @@ -238,8 +238,8 @@ BOOL msrpc_parse(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, return False; if (0 < len1) { - pull_ucs2(p, blob->data + ptr, sizeof(p), - len1, STR_NOALIGN); + pull_string(p, blob->data + ptr, sizeof(p), + len1, STR_UNICODE|STR_NOALIGN); (*ps) = talloc_strdup(mem_ctx, p); if (!(*ps)) { return False; @@ -268,8 +268,8 @@ BOOL msrpc_parse(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, return False; if (0 < len1) { - pull_ascii(p, blob->data + ptr, sizeof(p), - len1, STR_NOALIGN); + pull_string(p, blob->data + ptr, sizeof(p), + len1, STR_ASCII|STR_NOALIGN); (*ps) = talloc_strdup(mem_ctx, p); if (!(*ps)) { return False; diff --git a/source4/libcli/auth/smbencrypt.c b/source4/libcli/auth/smbencrypt.c index 24fdeff33f..98f98a4986 100644 --- a/source4/libcli/auth/smbencrypt.c +++ b/source4/libcli/auth/smbencrypt.c @@ -91,10 +91,10 @@ BOOL E_deshash(const char *passwd, uint8_t p16[16]) BOOL ret = True; fstring dospwd; ZERO_STRUCT(dospwd); - + /* Password must be converted to DOS charset - null terminated, uppercase. */ - push_ascii(dospwd, passwd, sizeof(dospwd), STR_UPPER|STR_TERMINATE); - + push_string(dospwd, passwd, sizeof(dospwd), STR_ASCII|STR_UPPER|STR_TERMINATE); + /* Only the fisrt 14 chars are considered, password need not be null terminated. */ E_P16((const uint8_t *)dospwd, p16); diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c index 787d146076..3ae60f347b 100644 --- a/source4/torture/rap/rap.c +++ b/source4/torture/rap/rap.c @@ -151,7 +151,7 @@ static NTSTATUS rap_pull_string(TALLOC_CTX *mem_ctx, struct ndr_pull *ndr, return NT_STATUS_INVALID_PARAMETER; *dest = talloc_zero_size(mem_ctx, len+1); - pull_ascii(*dest, p, len+1, len, 0); + pull_string(*dest, p, len+1, len, STR_ASCII); return NT_STATUS_OK; } |