diff options
| author | Seeker <meaningseeking@protonmail.com> | 2020-08-03 14:38:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-03 23:38:45 +0200 |
| commit | d22fd6fc348ecf393f535c9b172410f4a82a2d52 (patch) | |
| tree | 9c8c31ea65d65ca4daf9bde2c4c671f217f04183 /src/util | |
| parent | 542df11bed89ebad786220f1162597353ecc277d (diff) | |
| download | minetest-d22fd6fc348ecf393f535c9b172410f4a82a2d52.tar.gz minetest-d22fd6fc348ecf393f535c9b172410f4a82a2d52.tar.bz2 minetest-d22fd6fc348ecf393f535c9b172410f4a82a2d52.zip | |
Fix build for Visual Studio (explicitly cast pointers) (#10256)
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/md32_common.h | 2 | ||||
| -rw-r--r-- | src/util/sha256.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/util/md32_common.h b/src/util/md32_common.h index a4c2099c9..2c050b72a 100644 --- a/src/util/md32_common.h +++ b/src/util/md32_common.h @@ -301,7 +301,7 @@ int HASH_UPDATE(HASH_CTX *c, const void *data_, size_t len) { - const unsigned char *data = data_; + const unsigned char *data = (const unsigned char *)data_; unsigned char *p; HASH_LONG l; size_t n; diff --git a/src/util/sha256.c b/src/util/sha256.c index 4241f31f3..5c8266f9a 100644 --- a/src/util/sha256.c +++ b/src/util/sha256.c @@ -18,13 +18,13 @@ const char SHA256_version[] = "SHA-256" OPENSSL_VERSION_PTEXT; unsigned static char cleanse_ctr = 0; static void OPENSSL_cleanse(void *ptr, size_t len) { - unsigned char *p = ptr; + unsigned char *p = (unsigned char *)ptr; size_t loop = len, ctr = cleanse_ctr; while (loop--) { *(p++) = (unsigned char)ctr; ctr += (17 + ((size_t)p & 0xF)); } - p = memchr(ptr, (unsigned char)ctr, len); + p = (unsigned char *)memchr(ptr, (unsigned char)ctr, len); if (p) ctr += (63 + (size_t)p); cleanse_ctr = (unsigned char)ctr; @@ -262,7 +262,7 @@ static void sha256_block_data_order(SHA256_CTX *ctx, const void *in, unsigned MD32_REG_T a, b, c, d, e, f, g, h, s0, s1, T1; SHA_LONG X[16]; int i; - const unsigned char *data = in; + const unsigned char *data = (const unsigned char *)in; const union { long one; char little; |