mirror of
https://github.com/slackhq/nebula.git
synced 2025-01-25 17:48:25 +00:00
e0185c4b01
* Support NIST curve P256 This change adds support for NIST curve P256. When you use `nebula-cert ca` or `nebula-cert keygen`, you can specify `-curve P256` to enable it. The curve to use is based on the curve defined in your CA certificate. Internally, we use ECDSA P256 to sign certificates, and ECDH P256 to do Noise handshakes. P256 is not supported natively in Noise Protocol, so we define `DHP256` in the `noiseutil` package to implement support for it. You cannot have a mixed network of Curve25519 and P256 certificates, since the Noise protocol will only attempt to parse using the Curve defined in the host's certificate. * verify the curves match in VerifyPrivateKey This would have failed anyways once we tried to actually use the bytes in the private key, but its better to detect the issue up front with a better error message. * add cert.Curve argument to Sign method * fix mismerge * use crypto/ecdh This is the preferred method for doing ECDH functions now, and also has a boringcrypto specific codepath. * remove other ecdh uses of crypto/elliptic use crypto/ecdh instead
79 lines
1.9 KiB
Go
79 lines
1.9 KiB
Go
package main
|
|
|
|
import (
|
|
"flag"
|
|
"fmt"
|
|
"io"
|
|
"io/ioutil"
|
|
"os"
|
|
|
|
"github.com/slackhq/nebula/cert"
|
|
)
|
|
|
|
type keygenFlags struct {
|
|
set *flag.FlagSet
|
|
outKeyPath *string
|
|
outPubPath *string
|
|
|
|
curve *string
|
|
}
|
|
|
|
func newKeygenFlags() *keygenFlags {
|
|
cf := keygenFlags{set: flag.NewFlagSet("keygen", flag.ContinueOnError)}
|
|
cf.set.Usage = func() {}
|
|
cf.outPubPath = cf.set.String("out-pub", "", "Required: path to write the public key to")
|
|
cf.outKeyPath = cf.set.String("out-key", "", "Required: path to write the private key to")
|
|
cf.curve = cf.set.String("curve", "25519", "ECDH Curve (25519, P256)")
|
|
return &cf
|
|
}
|
|
|
|
func keygen(args []string, out io.Writer, errOut io.Writer) error {
|
|
cf := newKeygenFlags()
|
|
err := cf.set.Parse(args)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if err := mustFlagString("out-key", cf.outKeyPath); err != nil {
|
|
return err
|
|
}
|
|
if err := mustFlagString("out-pub", cf.outPubPath); err != nil {
|
|
return err
|
|
}
|
|
|
|
var pub, rawPriv []byte
|
|
var curve cert.Curve
|
|
switch *cf.curve {
|
|
case "25519", "X25519", "Curve25519", "CURVE25519":
|
|
pub, rawPriv = x25519Keypair()
|
|
curve = cert.Curve_CURVE25519
|
|
case "P256":
|
|
pub, rawPriv = p256Keypair()
|
|
curve = cert.Curve_P256
|
|
default:
|
|
return fmt.Errorf("invalid curve: %s", *cf.curve)
|
|
}
|
|
|
|
err = ioutil.WriteFile(*cf.outKeyPath, cert.MarshalPrivateKey(curve, rawPriv), 0600)
|
|
if err != nil {
|
|
return fmt.Errorf("error while writing out-key: %s", err)
|
|
}
|
|
|
|
err = ioutil.WriteFile(*cf.outPubPath, cert.MarshalPublicKey(curve, pub), 0600)
|
|
if err != nil {
|
|
return fmt.Errorf("error while writing out-pub: %s", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func keygenSummary() string {
|
|
return "keygen <flags>: create a public/private key pair. the public key can be passed to `nebula-cert sign`"
|
|
}
|
|
|
|
func keygenHelp(out io.Writer) {
|
|
cf := newKeygenFlags()
|
|
out.Write([]byte("Usage of " + os.Args[0] + " " + keygenSummary() + "\n"))
|
|
cf.set.SetOutput(out)
|
|
cf.set.PrintDefaults()
|
|
}
|