*/
#include "includes.h"
-#include "pstring.h"
-#include "param/param.h"
+#include "auth/ntlmssp/msrpc_parse.h"
/*
this is a tiny msrpc packet generator. I am only using this to
C = constant ascii string
*/
bool msrpc_gen(TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *iconv_convenience,
DATA_BLOB *blob,
const char *format, ...)
{
case 'U':
s = va_arg(ap, char *);
head_size += 8;
- n = push_ucs2_talloc(pointers, iconv_convenience, (void **)&pointers[i].data, s);
+ n = push_ucs2_talloc(pointers, (void **)&pointers[i].data, s);
if (n == -1) {
return false;
}
case 'A':
s = va_arg(ap, char *);
head_size += 8;
- n = push_ascii_talloc(pointers, iconv_convenience, (char **)&pointers[i].data, s);
+ n = push_ascii_talloc(pointers, (char **)&pointers[i].data, s);
if (n == -1) {
return false;
}
n = va_arg(ap, int);
intargs[i] = n;
s = va_arg(ap, char *);
- n = push_ucs2_talloc(pointers, iconv_convenience, (void **)&pointers[i].data, s);
+ n = push_ucs2_talloc(pointers, (void **)&pointers[i].data, s);
if (n == -1) {
return false;
}
return false; \
}
-/*
+/**
this is a tiny msrpc packet parser. This the the partner of msrpc_gen
format specifiers are:
*/
bool msrpc_parse(TALLOC_CTX *mem_ctx,
- struct smb_iconv_convenience *iconv_convenience,
const DATA_BLOB *blob,
const char *format, ...)
{
ret = false;
goto cleanup;
}
- if (blob->data + ptr < (uint8_t *)ptr ||
+ if (blob->data + ptr < (uint8_t *)(uintptr_t)ptr ||
blob->data + ptr < blob->data) {
ret = false;
goto cleanup;
}
if (0 < len1) {
- pull_string(iconv_convenience, p, blob->data + ptr, p_len,
+ pull_string(p, blob->data + ptr, p_len,
len1, STR_UNICODE|STR_NOALIGN);
(*ps) = talloc_strdup(mem_ctx, p);
if (!(*ps)) {
goto cleanup;
}
- if (blob->data + ptr < (uint8_t *)ptr ||
+ if (blob->data + ptr < (uint8_t *)(uintptr_t)ptr ||
blob->data + ptr < blob->data) {
ret = false;
goto cleanup;
}
if (0 < len1) {
- pull_string(iconv_convenience, p, blob->data + ptr, p_len,
+ pull_string(p, blob->data + ptr, p_len,
len1, STR_ASCII|STR_NOALIGN);
(*ps) = talloc_strdup(mem_ctx, p);
if (!(*ps)) {
goto cleanup;
}
- if (blob->data + ptr < (uint8_t *)ptr ||
+ if (blob->data + ptr < (uint8_t *)(uintptr_t)ptr ||
blob->data + ptr < blob->data) {
ret = false;
goto cleanup;
goto cleanup;
}
- head_ofs += pull_string(iconv_convenience, p,
+ head_ofs += pull_string(p,
blob->data+head_ofs, p_len,
blob->length - head_ofs,
STR_ASCII|STR_TERMINATE);