don't change behavior of user-facing tools yet

slackhq · Nov 1, 2024 · ef58b33 · ef58b33
1 parent 0e5277e
commit ef58b33
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/cmd/nebula-cert/keygen.go b/cmd/nebula-cert/keygen.go
@@ -62,7 +62,7 @@ func keygen(args []string, out io.Writer, errOut io.Writer) error {
 			pub, rawPriv = x25519Keypair()
 			curve = cert.Curve_CURVE25519
 		case "P256":
-			pub, rawPriv = p256Keypair()
+			pub, rawPriv = p256Keypair(false) //todo support generating compressed keys
 			curve = cert.Curve_P256
 		default:
 			return fmt.Errorf("invalid curve: %s", *cf.curve)

diff --git a/cmd/nebula-cert/sign.go b/cmd/nebula-cert/sign.go
@@ -402,7 +402,7 @@ func newKeypair(curve cert.Curve) ([]byte, []byte) {
 	case cert.Curve_CURVE25519:
 		return x25519Keypair()
 	case cert.Curve_P256:
-		return p256KeypairCompressed()
+		return p256Keypair(false) //todo support generating compressed keys
 	default:
 		return nil, nil
 	}
@@ -422,19 +422,14 @@ func x25519Keypair() ([]byte, []byte) {
 	return pubkey, privkey
 }
 
-func p256Keypair() ([]byte, []byte) {
+func p256Keypair(compressed bool) ([]byte, []byte) {
 	privkey, err := ecdh.P256().GenerateKey(rand.Reader)
 	if err != nil {
 		panic(err)
 	}
-	pubkey := privkey.PublicKey()
-	return pubkey.Bytes(), privkey.Bytes()
-}
-
-func p256KeypairCompressed() ([]byte, []byte) {
-	privkey, err := ecdh.P256().GenerateKey(rand.Reader)
-	if err != nil {
-		panic(err)
+	if !compressed {
+		pubkey := privkey.PublicKey()
+		return pubkey.Bytes(), privkey.Bytes()
 	}
 	pubkeyBytes := privkey.PublicKey().Bytes()
 	pubkey, err := noiseutil.LoadP256Pubkey(pubkeyBytes)