Merge pull request #97 from irisnet/hotfix/v0.31.0

Fix for panic in signature verification if a peer sends a nil public key
irisnet · Oct 2, 2019 · b2f339e · b2f339e
2 parents 6258e4d + 8c84f7b
commit b2f339e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/p2p/conn/secret_connection.go b/p2p/conn/secret_connection.go
@@ -120,6 +120,11 @@ func MakeSecretConnection(conn io.ReadWriteCloser, locPrivKey crypto.PrivKey) (*
 	}
 
 	remPubKey, remSignature := authSigMsg.Key, authSigMsg.Sig
+
+	if remPubKey == nil {
+		return nil, errors.New("peer sent a nil public key")
+	}
+
 	if !remPubKey.VerifyBytes(challenge[:], remSignature) {
 		return nil, errors.New("Challenge verification failed")
 	}

diff --git a/version/version.go b/version/version.go
@@ -18,7 +18,7 @@ const (
 	// TMCoreSemVer is the current version of Tendermint Core.
 	// It's the Semantic Version of the software.
 	// Must be a string because scripts like dist.sh read this file.
-	TMCoreSemVer = "0.31.0"
+	TMCoreSemVer = "0.31.1"
 
 	// ABCISemVer is the semantic version of the ABCI library
 	ABCISemVer  = "0.15.0"