@@ -240,7 +240,7 @@ func calculateSKID(pubKey crypto.PublicKey) ([]byte, error) {
240240 return skid [:], nil
241241}
242242
243- func sign (iss * issuer , domains []string , ipAddresses []string ) (* x509.Certificate , error ) {
243+ func sign (iss * issuer , domains []string , ipAddresses []string , alg x509. PublicKeyAlgorithm ) (* x509.Certificate , error ) {
244244 var cn string
245245 if len (domains ) > 0 {
246246 cn = domains [0 ]
@@ -254,7 +254,7 @@ func sign(iss *issuer, domains []string, ipAddresses []string) (*x509.Certificat
254254 if err != nil && ! os .IsExist (err ) {
255255 return nil , err
256256 }
257- key , err := makeKey (fmt .Sprintf ("%s/key.pem" , cnFolder ), x509 . RSA )
257+ key , err := makeKey (fmt .Sprintf ("%s/key.pem" , cnFolder ), alg )
258258 if err != nil {
259259 return nil , err
260260 }
@@ -314,7 +314,7 @@ func split(s string) (results []string) {
314314func main2 () error {
315315 var caKey = flag .String ("ca-key" , "minica-key.pem" , "Root private key filename, PEM encoded." )
316316 var caCert = flag .String ("ca-cert" , "minica.pem" , "Root certificate filename, PEM encoded." )
317- var caAlg = flag .String ("ca-alg" , "rsa " , "Root keypair algorithm : RSA or ECDSA. Only used if generating new ." )
317+ var caAlg = flag .String ("ca-alg" , "ecdsa " , "Algorithm for any new keypairs : RSA or ECDSA." )
318318 var domains = flag .String ("domains" , "" , "Comma separated domain names to include as Server Alternative Names." )
319319 var ipAddresses = flag .String ("ip-addresses" , "" , "Comma separated IP addresses to include as Server Alternative Names." )
320320 flag .Usage = func () {
@@ -375,6 +375,6 @@ will not overwrite existing keys or certificates.
375375 if err != nil {
376376 return err
377377 }
378- _ , err = sign (issuer , domainSlice , ipSlice )
378+ _ , err = sign (issuer , domainSlice , ipSlice , alg )
379379 return err
380380}
0 commit comments