ref: 320c325437539ae91091ce62efec1913cd8093c2
parent: ca4c89314abff54e3806b44e4a08164f8204f09a
parent: 467c5446ac1cb7105f5b3e035761bdfc2193545c
author: Samuel Neves <sneves@users.noreply.github.com>
date: Wed Jul 11 09:05:17 EDT 2018
Merge pull request #50 from mjvk/bitwise-cast Bitwise cast
--- a/neon/blake2-impl.h
+++ b/neon/blake2-impl.h
@@ -72,8 +72,8 @@
return w;
#else
const uint8_t *p = ( const uint8_t * )src;
- return (( uint16_t )( p[0] ) << 0) |
- (( uint16_t )( p[1] ) << 8) ;
+ return ( uint16_t )((( uint32_t )( p[0] ) << 0) |
+ (( uint32_t )( p[1] ) << 8));
#endif
}
--- a/ref/blake2-impl.h
+++ b/ref/blake2-impl.h
@@ -72,8 +72,8 @@
return w;
#else
const uint8_t *p = ( const uint8_t * )src;
- return (( uint16_t )( p[0] ) << 0) |
- (( uint16_t )( p[1] ) << 8) ;
+ return ( uint16_t )((( uint32_t )( p[0] ) << 0) |
+ (( uint32_t )( p[1] ) << 8));
#endif
}
--- a/sse/blake2-impl.h
+++ b/sse/blake2-impl.h
@@ -72,8 +72,8 @@
return w;
#else
const uint8_t *p = ( const uint8_t * )src;
- return (( uint16_t )( p[0] ) << 0) |
- (( uint16_t )( p[1] ) << 8) ;
+ return ( uint16_t )((( uint32_t )( p[0] ) << 0) |
+ (( uint32_t )( p[1] ) << 8));
#endif
}
--
⑨