diff --git a/include/libsmb2-private.h b/include/libsmb2-private.h index 84359cc..8852a9d 100644 --- a/include/libsmb2-private.h +++ b/include/libsmb2-private.h @@ -277,12 +277,12 @@ struct utf16 { /* Returns a string converted to UTF-16 format. Use free() to release * the utf16 string. */ -struct utf16 *utf8_to_utf16(const char *utf8); +struct utf16 *smb2_utf8_to_utf16(const char *utf8); /* Returns a string converted to UTF8 format. Use free() to release * the utf8 string. */ -const char *utf16_to_utf8(const uint16_t *str, int len); +const char *smb2_utf16_to_utf8(const uint16_t *str, int len); /* Convert a win timestamp to a unix timeval */ void win_to_timeval(uint64_t smb2_time, struct smb2_timeval *tv); diff --git a/lib/dcerpc.c b/lib/dcerpc.c index 343bca9..9dafa3b 100644 --- a/lib/dcerpc.c +++ b/lib/dcerpc.c @@ -834,7 +834,7 @@ dcerpc_encode_utf16(struct dcerpc_context *ctx, struct dcerpc_pdu *pdu, uint64_t val; struct utf16 *utf16; - utf16 = utf8_to_utf16(*(char **)ptr); + utf16 = smb2_utf8_to_utf16(*(char **)ptr); if (utf16 == NULL) { return -1; } @@ -884,7 +884,7 @@ dcerpc_decode_utf16(struct dcerpc_context *ctx, struct dcerpc_pdu *pdu, if (offset + actual * 2 > iov->len) { return -1; } - tmp = utf16_to_utf8((uint16_t *)(&iov->buf[offset]), actual); + tmp = smb2_utf16_to_utf8((uint16_t *)(&iov->buf[offset]), actual); offset += actual * 2; str = smb2_alloc_data(ctx->smb2, pdu->payload, strlen(tmp) + 1); diff --git a/lib/libsmb2.c b/lib/libsmb2.c index e1efb27..7c5d32c 100644 --- a/lib/libsmb2.c +++ b/lib/libsmb2.c @@ -1059,7 +1059,7 @@ smb2_connect_share_async(struct smb2_context *smb2, return -ENOMEM; } - c_data->utf16_unc = utf8_to_utf16(c_data->utf8_unc); + c_data->utf16_unc = smb2_utf8_to_utf16(c_data->utf8_unc); if (c_data->utf16_unc == NULL) { smb2_set_error(smb2, "Count not convert UNC:[%s] into UTF-16", c_data->utf8_unc); diff --git a/lib/ntlmssp.c b/lib/ntlmssp.c index dbd3c9d..d8b4bf8 100644 --- a/lib/ntlmssp.c +++ b/lib/ntlmssp.c @@ -215,7 +215,7 @@ ntlm_convert_password_hash(const char *password, unsigned char password_hash[16] int i, hn, ln; struct utf16 *utf16_password = NULL; - utf16_password = utf8_to_utf16(password); + utf16_password = smb2_utf8_to_utf16(password); if (utf16_password == NULL) { return -1; } @@ -243,7 +243,7 @@ NTOWFv1(const char *password, unsigned char password_hash[16]) MD4_CTX ctx; struct utf16 *utf16_password = NULL; - utf16_password = utf8_to_utf16(password); + utf16_password = smb2_utf8_to_utf16(password); if (utf16_password == NULL) { return -1; } @@ -294,7 +294,7 @@ NTOWFv2(const char *user, const char *password, const char *domain, strcat(userdomain, domain); } - utf16_userdomain = utf8_to_utf16(userdomain); + utf16_userdomain = smb2_utf8_to_utf16(userdomain); if (utf16_userdomain == NULL) { free(userdomain); return -1; @@ -460,7 +460,7 @@ encode_ntlm_auth(struct smb2_context *smb2, time_t ti, /* domain name fields */ if (!anonymous && auth_data->domain) { - utf16_domain = utf8_to_utf16(auth_data->domain); + utf16_domain = smb2_utf8_to_utf16(auth_data->domain); if (utf16_domain == NULL) { goto finished; } @@ -477,7 +477,7 @@ encode_ntlm_auth(struct smb2_context *smb2, time_t ti, /* user name fields */ if (!anonymous) { - utf16_user = utf8_to_utf16(auth_data->user); + utf16_user = smb2_utf8_to_utf16(auth_data->user); if (utf16_user == NULL) { goto finished; } @@ -494,7 +494,7 @@ encode_ntlm_auth(struct smb2_context *smb2, time_t ti, /* workstation name fields */ if (!anonymous && auth_data->workstation) { - utf16_workstation = utf8_to_utf16(auth_data->workstation); + utf16_workstation = smb2_utf8_to_utf16(auth_data->workstation); if (utf16_workstation == NULL) { goto finished; } diff --git a/lib/smb2-cmd-create.c b/lib/smb2-cmd-create.c index 93f7b46..862ae38 100644 --- a/lib/smb2-cmd-create.c +++ b/lib/smb2-cmd-create.c @@ -69,7 +69,7 @@ smb2_encode_create_request(struct smb2_context *smb2, /* Name */ if (req->name && req->name[0]) { - name = utf8_to_utf16(req->name); + name = smb2_utf8_to_utf16(req->name); if (name == NULL) { smb2_set_error(smb2, "Could not convert name into UTF-16"); return -1; diff --git a/lib/smb2-cmd-query-directory.c b/lib/smb2-cmd-query-directory.c index 0b43300..b6974fb 100644 --- a/lib/smb2-cmd-query-directory.c +++ b/lib/smb2-cmd-query-directory.c @@ -76,7 +76,7 @@ smb2_decode_fileidfulldirectoryinformation( smb2_get_uint32(vec, 64, &fs->ea_size); smb2_get_uint64(vec, 72, &fs->file_id); - fs->name = utf16_to_utf8((uint16_t *)&vec->buf[80], name_len / 2); + fs->name = smb2_utf16_to_utf8((uint16_t *)&vec->buf[80], name_len / 2); smb2_get_uint64(vec, 8, &t); win_to_timeval(t, &fs->creation_time); @@ -114,7 +114,7 @@ smb2_encode_query_directory_request(struct smb2_context *smb2, /* Name */ if (req->name && req->name[0]) { - name = utf8_to_utf16(req->name); + name = smb2_utf8_to_utf16(req->name); if (name == NULL) { smb2_set_error(smb2, "Could not convert name into UTF-16"); return -1; diff --git a/lib/smb2-cmd-set-info.c b/lib/smb2-cmd-set-info.c index c408348..2363733 100644 --- a/lib/smb2-cmd-set-info.c +++ b/lib/smb2-cmd-set-info.c @@ -112,7 +112,7 @@ smb2_encode_set_info_request(struct smb2_context *smb2, case SMB2_FILE_RENAME_INFORMATION: rni = req->input_data; - struct utf16 *name = utf8_to_utf16((char *)(rni->file_name)); + struct utf16 *name = smb2_utf8_to_utf16((char *)(rni->file_name)); if (name == NULL) { smb2_set_error(smb2, "Could not convert name into UTF-16"); return -1; diff --git a/lib/smb2-data-file-info.c b/lib/smb2-data-file-info.c index bb94e0c..ec0b188 100644 --- a/lib/smb2-data-file-info.c +++ b/lib/smb2-data-file-info.c @@ -155,7 +155,7 @@ smb2_decode_file_all_info(struct smb2_context *smb2, smb2_get_uint32(vec, 92, &fs->alignment_requirement); smb2_get_uint16(vec, 96, &name_len); - name = utf16_to_utf8((uint16_t *)&vec->buf[100], name_len / 2); + name = smb2_utf16_to_utf8((uint16_t *)&vec->buf[100], name_len / 2); fs->name = smb2_alloc_data(smb2, memctx, strlen(name) + 1); if (fs->name == NULL) { free(discard_const(name)); diff --git a/lib/smb2-data-filesystem-info.c b/lib/smb2-data-filesystem-info.c index 0c5869b..c97818e 100644 --- a/lib/smb2-data-filesystem-info.c +++ b/lib/smb2-data-filesystem-info.c @@ -60,7 +60,7 @@ smb2_decode_file_fs_volume_info(struct smb2_context *smb2, smb2_get_uint32(vec, 12, &fs->volume_label_length); smb2_get_uint8(vec, 16, &fs->supports_objects); smb2_get_uint8(vec, 17, &fs->reserved); - name = utf16_to_utf8((uint16_t *)&vec->buf[18], + name = smb2_utf16_to_utf8((uint16_t *)&vec->buf[18], fs->volume_label_length / 2); fs->volume_label = smb2_alloc_data(smb2, memctx, strlen(name) + 1); if (fs->volume_label == NULL) { diff --git a/lib/smb2-data-reparse-point.c b/lib/smb2-data-reparse-point.c index d55cfdc..5c2f5f6 100644 --- a/lib/smb2-data-reparse-point.c +++ b/lib/smb2-data-reparse-point.c @@ -77,7 +77,7 @@ smb2_decode_reparse_data_buffer(struct smb2_context *smb2, return -1; } - tmp = utf16_to_utf8((uint16_t *)(&vec->buf[suboffset + 20]), + tmp = smb2_utf16_to_utf8((uint16_t *)(&vec->buf[suboffset + 20]), sublen / 2); rp->symlink.subname = smb2_alloc_data(smb2, rp, strlen(tmp) + 1); @@ -93,7 +93,7 @@ smb2_decode_reparse_data_buffer(struct smb2_context *smb2, if (printoffset + printlen + 12 > rp->reparse_data_length) { return -1; } - tmp = utf16_to_utf8((uint16_t *)(&vec->buf[printoffset + 20]), + tmp = smb2_utf16_to_utf8((uint16_t *)(&vec->buf[printoffset + 20]), printlen / 2); rp->symlink.printname = smb2_alloc_data(smb2, rp, strlen(tmp) + 1); diff --git a/lib/unicode.c b/lib/unicode.c index c0adf8c..5e3757b 100644 --- a/lib/unicode.c +++ b/lib/unicode.c @@ -156,7 +156,7 @@ validate_utf8_str(const char *utf8) /* Convert a UTF8 string into UTF-16LE */ struct utf16 * -utf8_to_utf16(const char *utf8) +smb2_utf8_to_utf16(const char *utf8) { struct utf16 *utf16; int i, len; @@ -237,7 +237,7 @@ utf16_size(const uint16_t *utf16, int utf16_len) * Convert a UTF-16LE string into UTF8 */ const char * -utf16_to_utf8(const uint16_t *utf16, int utf16_len) +smb2_utf16_to_utf8(const uint16_t *utf16, int utf16_len) { int utf8_len = 1; char *str, *tmp;