Add String/FromString support for type Algorithm

certs/acme/config.go

@@ -171,7 +171,7 @@ func (providerConfig *ProviderConfig) keyTypeFromKeyPairFactory(keyPairFactory k
 	case keys.ECDSA384:
 		return certcrypto.EC384, nil
 	}
-	return "", fmt.Errorf("unrecognized key algorithm '%s'", alg.Name())
+	return "", fmt.Errorf("unrecognized key algorithm '%s'", alg)
 }
 
 // A DomainConfig defines a domain pattern as well as the challenge types for the matching domains.

keys/ecdsa.go

@@ -57,7 +57,7 @@ func (factory *ecdsaKeyPairFactory) New() (KeyPair, error) {
 }
 
 func newECDSAKeyPairFactory(alg Algorithm, curve elliptic.Curve) KeyPairFactory {
-	logger := log.RootLogger().With().Str("Algorithm", alg.Name()).Logger()
+	logger := log.RootLogger().With().Str("Algorithm", alg.String()).Logger()
 	return &ecdsaKeyPairFactory{alg: alg, curve: curve, logger: &logger}
 }
 

keys/ed25519.go

@@ -55,7 +55,7 @@ func (factory *ed25519KeyPairFactory) New() (KeyPair, error) {
 }
 
 func newED25519KeyPairFactory() KeyPairFactory {
-	logger := log.RootLogger().With().Str("Algorithm", ED25519.Name()).Logger()
+	logger := log.RootLogger().With().Str("Algorithm", ED25519.String()).Logger()
 	return &ed25519KeyPairFactory{logger: &logger}
 }
 

keys/keys.go

@@ -15,6 +15,7 @@ import (
 	"crypto/elliptic"
 	"crypto/rsa"
 	"fmt"
+	"math"
 	"reflect"
 )
 
@@ -104,17 +105,44 @@ func Algs() []Algorithm {
 	}
 }
 
+const unknownAlgorithmNamePattern = "uknown algorithm name (%s)"
+
+// AlgorithmFromString determines an algorithm from its name.
+func AlgorithmFromString(name string) (Algorithm, error) {
+	switch name {
+	case "RSA2048":
+		return RSA2048, nil
+	case "RSA3072":
+		return RSA3072, nil
+	case "RSA4096":
+		return RSA4096, nil
+	case "RSA8192":
+		return RSA8192, nil
+	case "ECDSA224":
+		return ECDSA224, nil
+	case "ECDSA256":
+		return ECDSA256, nil
+	case "ECDSA384":
+		return ECDSA384, nil
+	case "ECDSA521":
+		return ECDSA521, nil
+	case "ED25519":
+		return ED25519, nil
+	}
+	return Algorithm(math.MaxUint), fmt.Errorf(unknownAlgorithmNamePattern, name)
+}
+
 const unknownAlgorithmPattern = "uknown algorithm (%d)"
 
-// Name gets the algorithm's name.
-func (algorithm Algorithm) Name() string {
+// String gets the algorithm's name.
+func (algorithm Algorithm) String() string {
 	switch algorithm {
 	case RSA2048:
 		return "RSA2048"
 	case RSA3072:
 		return "RSA3072"
 	case RSA4096:
-		return "RSA4095"
+		return "RSA4096"
 	case RSA8192:
 		return "RSA8192"
 	case ECDSA224:

keys/keys_test.go

@@ -121,7 +121,10 @@ func checkKey(t *testing.T, key keys.Key, publicKey crypto.PublicKey, hash crypt
 
 func TestAlgs(t *testing.T) {
 	for _, alg := range keys.Algs() {
-		fmt.Printf("Generating %s", alg.Name())
+		alg2, err := keys.AlgorithmFromString(alg.String())
+		require.NoError(t, err)
+		require.Equal(t, alg, alg2)
+		fmt.Printf("Generating %s", alg)
 		start := time.Now()
 		kpf := alg.NewKeyPairFactory()
 		require.NotNil(t, kpf)

keys/rsa.go

@@ -56,7 +56,7 @@ func (factory *rsaKeyPairFactory) New() (KeyPair, error) {
 }
 
 func newRSAKeyPairFactory(alg Algorithm, bits int) KeyPairFactory {
-	logger := log.RootLogger().With().Str("Algorithm", alg.Name()).Logger()
+	logger := log.RootLogger().With().Str("Algorithm", alg.String()).Logger()
 	return &rsaKeyPairFactory{alg: alg, bits: bits, logger: &logger}
 }