lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-24 20:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

DH key exchange can't be 0 , avoid attack

Browse Source
This commit is contained in:
Cloud Wu
2015-09-18 14:10:12 +08:00
parent 8cc5638f14
commit 00dbf6e996
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lualib-src/lua-crypt.c
View File

@@ -338,8 +338,13 @@ static int
lrandomkey(lua_State *L) { lrandomkey(lua_State *L) {
char tmp[8]; char tmp[8];
int i; int i;
char x = 0;
for (i=0;i<8;i++) { for (i=0;i<8;i++) {
tmp[i] = random() & 0xff; tmp[i] = random() & 0xff;
x ^= tmp[i];
}
if (x==0) {
tmp[0] |= 1; // avoid 0
} }
lua_pushlstring(L, tmp, 8); lua_pushlstring(L, tmp, 8);
return 1; return 1;
@@ -718,8 +723,13 @@ static int
ldhsecret(lua_State *L) { ldhsecret(lua_State *L) {
uint32_t x[2], y[2]; uint32_t x[2], y[2];
read64(L, x, y); read64(L, x, y);
uint64_t r = powmodp((uint64_t)x[0] | (uint64_t)x[1]<<32, uint64_t xx = (uint64_t)x[0] | (uint64_t)x[1]<<32;
(uint64_t)y[0] | (uint64_t)y[1]<<32); uint64_t yy = (uint64_t)y[0] | (uint64_t)y[1]<<32;
if (xx == 0)
xx = 1;
if (yy == 0)
yy = 1;
uint64_t r = powmodp(xx, yy);
push64(L, r); push64(L, r);
@@ -739,7 +749,11 @@ ldhexchange(lua_State *L) {
xx[0] = x[0] | x[1]<<8 | x[2]<<16 | x[3]<<24; xx[0] = x[0] | x[1]<<8 | x[2]<<16 | x[3]<<24;
xx[1] = x[4] | x[5]<<8 | x[6]<<16 | x[7]<<24; xx[1] = x[4] | x[5]<<8 | x[6]<<16 | x[7]<<24;
uint64_t r = powmodp(5, (uint64_t)xx[0] | (uint64_t)xx[1]<<32); uint64_t x64 = (uint64_t)xx[0] | (uint64_t)xx[1]<<32;
if (x64 == 0)
x64 = 1;
uint64_t r = powmodp(5, x64);
push64(L, r); push64(L, r);
return 1; return 1;
} }