Merge branch 'pr-amery-wg-iszero' into next-amery

wireguard: fix KeyPair.Validate()
PrivateKey and PublicKey are now fixed length arrays, so testing for len 0 is invalid Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-10-27 15:56:09 +00:00 · 2023-10-27 15:55:27 +00:00 · 2023-10-27 15:54:59 +00:00 · 2023-10-27 15:52:50 +00:00 · 2023-10-27 15:52:48 +00:00 · 2023-10-27 17:52:19 +02:00
1 changed files with 3 additions and 9 deletions
@@ -207,20 +207,14 @@ type KeyPair struct {
 // Validate checks the PublicKey matches the PrivateKey,
 // and sets the PublicKey if missing
 func (kp *KeyPair) Validate() error {
-	keyLen := len(kp.PrivateKey)
-	pubLen := len(kp.PublicKey)
-
 	switch {
-	case keyLen != PrivateKeySize:
-		// bad private key
+	case kp.PrivateKey.IsZero():
+		// no private key
 		return ErrInvalidPrivateKey
-	case pubLen == 0:
+	case kp.PublicKey.IsZero():
 		// no public key, set it
 		kp.PublicKey = kp.PrivateKey.Public()
 		return nil
-	case pubLen != PublicKeySize:
-		// bad public key
-		return ErrInvalidPublicKey
 	case !kp.PrivateKey.Public().Equal(kp.PublicKey):
 		// wrong public key
 		return ErrInvalidPublicKey
Author	SHA1	Message	Date
amery	eb6931cd18	Merge branch 'pr-amery-wg-iszero' into next-amery	2023-10-27 15:56:09 +00:00
amery	142ea00577	wireguard: fix KeyPair.Validate() PrivateKey and PublicKey are now fixed length arrays, so testing for len 0 is invalid Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-10-27 15:55:27 +00:00
amery	b5794a189e	Merge branch 'pr-amery-dns-add' into next-amery	2023-10-27 15:54:59 +00:00
amery	052f89152c	jpictl/dns: introduce add command to register new machines Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-10-27 15:52:50 +00:00
amery	557f156579	dns: refactor asSyncRecords() for direct access of the unsorted map Signed-off-by: Alejandro Mery <amery@jpi.io>	2023-10-27 15:52:48 +00:00
amery	e857ff7456	Merge pull request 'dns: refactor record formatting and sort show results' (#28 ) Reviewed-on: #28	2023-10-27 17:52:19 +02:00