Fix UsedRandom race

cbeuw · Mar 5, 2019 · cd399dc · cd399dc
1 parent fd28847
commit cd399dc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/gqserver/auth.go b/gqserver/auth.go
@@ -26,15 +26,14 @@ func IsSS(input *ClientHello, sta *State) bool {
 
  sta.M.Lock()
  used := sta.UsedRandom[random]
+ sta.UsedRandom[random] = int(sta.Now().Unix())
  sta.M.Unlock()
 
  if used != 0 {
  log.Println("Replay! Duplicate random")
  return false
  }
 
- sta.PutUsedRandom(random)
-
  h := sha256.New()
  t := int(sta.Now().Unix()) / (12 * 60 * 60)
  h.Write([]byte(fmt.Sprintf("%v", t) + sta.Key))

diff --git a/gqserver/state.go b/gqserver/state.go
@@ -79,13 +79,6 @@ func (sta *State) SetAESKey() {
  sta.AESKey = h.Sum(nil)
 }
 
-// PutUsedRandom adds a random field into map UsedRandom
-func (sta *State) PutUsedRandom(random [32]byte) {
- sta.M.Lock()
- sta.UsedRandom[random] = int(sta.Now().Unix())
- sta.M.Unlock()
-}
-
 // UsedRandomCleaner clears the cache of used random fields every 12 hours
 func (sta *State) UsedRandomCleaner() {
  for {