diff options
| -rw-r--r-- | src/lib/pbkdf/pgp_s2k/pgp_s2k.cpp | 2 | ||||
| -rw-r--r-- | src/lib/utils/bit_ops.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/pbkdf/pgp_s2k/pgp_s2k.cpp b/src/lib/pbkdf/pgp_s2k/pgp_s2k.cpp index 6555183d1..d04fb47b3 100644 --- a/src/lib/pbkdf/pgp_s2k/pgp_s2k.cpp +++ b/src/lib/pbkdf/pgp_s2k/pgp_s2k.cpp @@ -63,7 +63,7 @@ uint8_t RFC4880_encode_count(size_t desired_iterations) auto i = std::upper_bound(OPENPGP_S2K_ITERS, OPENPGP_S2K_ITERS + 256, desired_iterations); - return (i - OPENPGP_S2K_ITERS); + return static_cast<uint8_t>(i - OPENPGP_S2K_ITERS); } size_t RFC4880_decode_count(uint8_t iter) diff --git a/src/lib/utils/bit_ops.h b/src/lib/utils/bit_ops.h index 36a8d0259..352035bf4 100644 --- a/src/lib/utils/bit_ops.h +++ b/src/lib/utils/bit_ops.h @@ -107,7 +107,7 @@ inline size_t ctz(T n) for(size_t s = 8*sizeof(T) / 2; s > 0; s /= 2) { const T mask = (static_cast<T>(1) << s) - 1; - const T z = s * (ct_is_zero(n & mask) & 1); + const size_t z = s * (ct_is_zero(n & mask) & 1); lb += z; n >>= z; } |