diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-04-13 12:24:25 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-04-13 13:16:23 +1000 |
| commit | 9acbbbae6b4c8eb7e967ea47f28b3e6bca8eebc8 (patch) | |
| tree | e54117f5b482e0adaabcb3580a25465ade298adb | |
| parent | 3fed27181a9b5e26216b3cad679b0f601c90ac2a (diff) | |
Fix windows compiler error in kmac_prov.c
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14851)
| -rw-r--r-- | providers/implementations/macs/kmac_prov.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/providers/implementations/macs/kmac_prov.c b/providers/implementations/macs/kmac_prov.c index d6fccf442f..111e0e8ba7 100644 --- a/providers/implementations/macs/kmac_prov.c +++ b/providers/implementations/macs/kmac_prov.c @@ -59,6 +59,7 @@ #include "prov/provider_ctx.h" #include "prov/provider_util.h" #include "prov/providercommon.h" +#include "internal/cryptlib.h" /* ossl_assert */ /* * Forward declaration of everything implemented here. This is not strictly @@ -497,7 +498,7 @@ static int encode_string(unsigned char *out, size_t *out_len, return 0; } - out[0] = len; + out[0] = (unsigned char)len; for (i = len; i > 0; --i) { out[i] = (bits & 0xFF); bits >>= 8; @@ -534,9 +535,12 @@ static int bytepad(unsigned char *out, size_t *out_len, return 1; } + if (!ossl_assert(w <= 255)) + return 0; + /* Left encoded w */ *p++ = 1; - *p++ = w; + *p++ = (unsigned char)w; /* || in1 */ memcpy(p, in1, in1_len); p += in1_len; |