amery/jpictl
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wireguard: fix KeyPair.Validate() #30

Merged
karasz merged 1 commits from pr-amery-wg-iszero into main 2023-10-27 18:11:17 +02:00
Conversation 1 Commits 1 Files Changed 1
+3 -9
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/wireguard/keys.go
+3 -9
View File
@@ -183,20 +183,14 @@ type KeyPair struct {
// Validate checks the PublicKey matches the PrivateKey, // Validate checks the PublicKey matches the PrivateKey,
// and sets the PublicKey if missing // and sets the PublicKey if missing
func (kp *KeyPair) Validate() error { func (kp *KeyPair) Validate() error {
keyLen := len(kp.PrivateKey)
pubLen := len(kp.PublicKey)
switch { switch {
case keyLen != PrivateKeySize: case kp.PrivateKey.IsZero():
// bad private key // no private key
return ErrInvalidPrivateKey return ErrInvalidPrivateKey
case pubLen == 0: case kp.PublicKey.IsZero():
// no public key, set it // no public key, set it
kp.PublicKey = kp.PrivateKey.Public() kp.PublicKey = kp.PrivateKey.Public()
return nil return nil
case pubLen != PublicKeySize:
// bad public key
return ErrInvalidPublicKey
case !kp.PrivateKey.Public().Equal(kp.PublicKey): case !kp.PrivateKey.Public().Equal(kp.PublicKey):
// wrong public key // wrong public key
return ErrInvalidPublicKey return ErrInvalidPublicKey