multiple certificate types for the node are supported

bianjieai · Mar 8, 2023 · 8e6507a · 8e6507a
1 parent c7c418f
commit 8e6507a
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/p2p/conn/secret_connection.go b/p2p/conn/secret_connection.go
@@ -22,7 +22,6 @@ import (
 	"golang.org/x/crypto/nacl/box"
 
 	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/algo"
 	cryptoenc "github.com/tendermint/tendermint/crypto/encoding"
 	"github.com/tendermint/tendermint/libs/async"
 	"github.com/tendermint/tendermint/libs/protoio"
@@ -167,8 +166,11 @@ func MakeSecretConnection(conn io.ReadWriteCloser, locPrivKey crypto.PrivKey) (*
 	}
 
 	remPubKey, remSignature := authSigMsg.Key, authSigMsg.Sig
-	if !algo.VerifyPubKeyType(remPubKey) {
-		return nil, fmt.Errorf("expected %s pubkey, got %T", algo.Algo, remPubKey)
+	//if !algo.VerifyPubKeyType(remPubKey) {
+	//	return nil, fmt.Errorf("expected %s pubkey, got %T", algo.Algo, remPubKey)
+	//}
+	if remPubKey == nil {
+		return nil, errors.New("peer sent a nil public key")
 	}
 	if !remPubKey.VerifySignature(challenge[:], remSignature) {
 		return nil, errors.New("challenge verification failed")