projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
065d050
)
Fix WIN32 warning.
author
Dr. Stephen Henson
<steve@openssl.org>
Thu, 21 Apr 2011 14:54:33 +0000
(14:54 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Thu, 21 Apr 2011 14:54:33 +0000
(14:54 +0000)
crypto/modes/xts128.c
patch
|
blob
|
history
diff --git
a/crypto/modes/xts128.c
b/crypto/modes/xts128.c
index 6859ab65d522e9d93861d1e4c82d34660bca3161..ebdc5ea649d7e8b9c9c3be33ebd85126be411d3d 100644
(file)
--- a/
crypto/modes/xts128.c
+++ b/
crypto/modes/xts128.c
@@
-102,7
+102,7
@@
int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx, const unsigned char iv[16],
unsigned int carry,res;
res = 0x87&(((int)tweak.d[3])>>31);
- carry =
tweak.u[0]>>63
;
+ carry =
(unsigned int)(tweak.u[0]>>63)
;
tweak.u[0] = (tweak.u[0]<<1)^res;
tweak.u[1] = (tweak.u[1]<<1)|carry;
}
@@
-137,7
+137,7
@@
int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx, const unsigned char iv[16],
unsigned int carry,res;
res = 0x87&(((int)tweak.d[3])>>31);
- carry =
tweak.u[0]>>63
;
+ carry =
(unsigned int)(tweak.u[0]>>63)
;
tweak1.u[0] = (tweak.u[0]<<1)^res;
tweak1.u[1] = (tweak.u[1]<<1)|carry;
}