6 files changed, 12 insertions, 8 deletions

diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c
index bbb4844e..5f04e415 100644
--- a/other/DHT_bootstrap.c
+++ b/other/DHT_bootstrap.c
@@ -156,8 +156,8 @@ int main(int argc, char *argv[])
 
     for (i = 0; i < 32; i++) {
         const uint8_t *const self_public_key = dht_get_self_public_key(dht);
-        printf("%02hhX", self_public_key[i]);
-        fprintf(file, "%02hhX", self_public_key[i]);
+        printf("%02X", self_public_key[i]);
+        fprintf(file, "%02X", self_public_key[i]);
     }
 
     fclose(file);
diff --git a/other/bootstrap_daemon/src/config.c b/other/bootstrap_daemon/src/config.c
index 3f1592e6..a3c1f250 100644
--- a/other/bootstrap_daemon/src/config.c
+++ b/other/bootstrap_daemon/src/config.c
@@ -316,7 +316,9 @@ static uint8_t *hex_string_to_bin(const char *hex_string)
     size_t i;
 
     for (i = 0; i < len; ++i, pos += 2) {
-        sscanf(pos, "%2hhx", &ret[i]);
+        unsigned int val;
+        sscanf(pos, "%02x", &val);
+        ret[i] = val;
     }
 
     return ret;
diff --git a/other/bootstrap_daemon/src/tox-bootstrapd.c b/other/bootstrap_daemon/src/tox-bootstrapd.c
index bdf679c9..9f1a2db4 100644
--- a/other/bootstrap_daemon/src/tox-bootstrapd.c
+++ b/other/bootstrap_daemon/src/tox-bootstrapd.c
@@ -109,7 +109,7 @@ static void print_public_key(const uint8_t *public_key)
     size_t i;
 
     for (i = 0; i < CRYPTO_PUBLIC_KEY_SIZE; i++) {
-        index += sprintf(buffer + index, "%02hhX", public_key[i]);
+        index += sprintf(buffer + index, "%02X", public_key[i]);
     }
 
     log_write(LOG_LEVEL_INFO, "Public Key: %s\n", buffer);
diff --git a/other/fun/cracker.c b/other/fun/cracker.c
index 7b020bb7..9cfe96d7 100644
--- a/other/fun/cracker.c
+++ b/other/fun/cracker.c
@@ -24,7 +24,7 @@ void print_key(uint8_t *client_id)
     uint32_t j;
 
     for (j = 0; j < 32; j++) {
-        printf("%02hhX", client_id[j]);
+        printf("%02X", client_id[j]);
     }
 }
 
diff --git a/other/fun/sign.c b/other/fun/sign.c
index b24cdae7..369bc848 100644
--- a/other/fun/sign.c
+++ b/other/fun/sign.c
@@ -56,13 +56,13 @@ int main(int argc, char *argv[])
         int i;
 
         for (i = 0; i < crypto_sign_ed25519_PUBLICKEYBYTES; i++) {
-            printf("%02hhX", pk[i]);
+            printf("%02X", pk[i]);
         }
 
         printf("\nSecret key:\n");
 
         for (i = 0; i < crypto_sign_ed25519_SECRETKEYBYTES; i++) {
-            printf("%02hhX", sk[i]);
+            printf("%02X", sk[i]);
         }
 
         printf("\n");
diff --git a/other/fun/strkey.c b/other/fun/strkey.c
index 649b26dd..ef54a404 100644
--- a/other/fun/strkey.c
+++ b/other/fun/strkey.c
@@ -86,7 +86,9 @@ int main(int argc, char *argv[])
         size_t i;
 
         for (i = 0; i < len; pos += 2) {
-            sscanf(pos, "%2hhx", &desired_bin[i]);
+            unsigned int value;
+            sscanf(pos, "%02x", &value);
+            desired_bin[i] = value;
             ++i;
         }
     } else {