diff options
| author | marha <marha@users.sourceforge.net> | 2010-11-19 13:13:51 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-11-19 13:13:51 +0000 |
| commit | bd5413c3a7e500fa8c8ccd68a33d2fcc4c172e28 (patch) | |
| tree | b77dfbc85a3ad280e488b7840ac42221785e0831 /tools/plink/sshsh512.c | |
| parent | 87e3509a1a9724e6115385686d9121f6c4a0f473 (diff) | |
| parent | 773752eab55047c33bad0d88006bb69f5c601502 (diff) | |
| download | vcxsrv-bd5413c3a7e500fa8c8ccd68a33d2fcc4c172e28.tar.gz vcxsrv-bd5413c3a7e500fa8c8ccd68a33d2fcc4c172e28.tar.bz2 vcxsrv-bd5413c3a7e500fa8c8ccd68a33d2fcc4c172e28.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'tools/plink/sshsh512.c')
| -rw-r--r-- | tools/plink/sshsh512.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/plink/sshsh512.c b/tools/plink/sshsh512.c index c025ffd17..bdb126fcf 100644 --- a/tools/plink/sshsh512.c +++ b/tools/plink/sshsh512.c @@ -13,14 +13,14 @@ * overlap destination with one source, but the others can't.
*/
#define add(r,x,y) ( r.lo = y.lo + x.lo, \
- r.hi = y.hi + x.hi + (r.lo < y.lo) )
-#define rorB(r,x,y) ( r.lo = (x.hi >> ((y)-32)) | (x.lo << (64-(y))), \
- r.hi = (x.lo >> ((y)-32)) | (x.hi << (64-(y))) )
-#define rorL(r,x,y) ( r.lo = (x.lo >> (y)) | (x.hi << (32-(y))), \
- r.hi = (x.hi >> (y)) | (x.lo << (32-(y))) )
-#define shrB(r,x,y) ( r.lo = x.hi >> ((y)-32), r.hi = 0 )
-#define shrL(r,x,y) ( r.lo = (x.lo >> (y)) | (x.hi << (32-(y))), \
- r.hi = x.hi >> (y) )
+ r.hi = y.hi + x.hi + ((uint32)r.lo < (uint32)y.lo) )
+#define rorB(r,x,y) ( r.lo = ((uint32)x.hi >> ((y)-32)) | ((uint32)x.lo << (64-(y))), \
+ r.hi = ((uint32)x.lo >> ((y)-32)) | ((uint32)x.hi << (64-(y))) )
+#define rorL(r,x,y) ( r.lo = ((uint32)x.lo >> (y)) | ((uint32)x.hi << (32-(y))), \
+ r.hi = ((uint32)x.hi >> (y)) | ((uint32)x.lo << (32-(y))) )
+#define shrB(r,x,y) ( r.lo = (uint32)x.hi >> ((y)-32), r.hi = 0 )
+#define shrL(r,x,y) ( r.lo = ((uint32)x.lo >> (y)) | ((uint32)x.hi << (32-(y))), \
+ r.hi = (uint32)x.hi >> (y) )
#define and(r,x,y) ( r.lo = x.lo & y.lo, r.hi = x.hi & y.hi )
#define xor(r,x,y) ( r.lo = x.lo ^ y.lo, r.hi = x.hi ^ y.hi )
#define not(r,x) ( r.lo = ~x.lo, r.hi = ~x.hi )
|