aboutsummaryrefslogtreecommitdiff
path: root/include/misc.h
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2017-09-20 12:55:16 +0200
committerSzczepan Zalega <szczepan@nitrokey.com>2017-09-20 12:55:16 +0200
commiteb447c7ff965abe92bf49dbf404447b1808322c0 (patch)
tree9309e6614f23cc5cda6042e685b24eaa0a6b5522 /include/misc.h
parent7a04ee7dd3fad10e30581d22956234aeff2b2f3a (diff)
parenta57ed65f90c2ffda245c93aaa4aa710b605550d7 (diff)
downloadlibnitrokey-eb447c7ff965abe92bf49dbf404447b1808322c0.tar.gz
libnitrokey-eb447c7ff965abe92bf49dbf404447b1808322c0.tar.bz2
Merge branch 'windows_MSVC2017' into OSX_merge_cleaned
Diffstat (limited to 'include/misc.h')
-rw-r--r--include/misc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/misc.h b/include/misc.h
index 176b77c..25f3107 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -62,7 +62,7 @@ typename T::CommandPayload get_payload(){
CMDTYPE::CommandTransaction::run(stick, p);
}
- std::string hexdump(const char *p, size_t size, bool print_header=true, bool print_ascii=true,
+ std::string hexdump(const uint8_t *p, size_t size, bool print_header=true, bool print_ascii=true,
bool print_empty=true);
uint32_t stm_crc32(const uint8_t *data, size_t size);
std::vector<uint8_t> hex_string_to_byte(const char* hexString);