rename ES25519/ES448 to Ed25519/Ed448

Author: jschlyter

src/cryptojwt/jwk/__init__.py

@@ -76,8 +76,8 @@ def __init__(
                     "PS384",
                     "PS512",
                     "EdDSA",
-                    "ES25519",
-                    "ES448",
+                    "Ed25519",
+                    "Ed448",
                     "none",
                 ]:
                     raise UnsupportedAlgorithm("Unknown algorithm: {}".format(alg))
@@ -97,8 +97,8 @@ def __init__(
                     "PS384",
                     "PS512",
                     "EdDSA",
-                    "ES25519",
-                    "ES448",
+                    "Ed25519",
+                    "Ed448",
                     "none",
                     "RSA1_5",
                     "RSA-OAEP",

src/cryptojwt/jws/eddsa.py

@@ -24,9 +24,9 @@ def sign(self, msg, key):
         """
 
         if self.algorithm:
-            if self.algorithm == "ES25519" and not isinstance(key, ed25519.Ed25519PrivateKey):
+            if self.algorithm == "Ed25519" and not isinstance(key, ed25519.Ed25519PrivateKey):
                 raise TypeError("The private key must be an instance of Ed25519PrivateKey")
-            if self.algorithm == "ES448" and not isinstance(key, ed448.Ed448PrivateKey):
+            if self.algorithm == "Ed448" and not isinstance(key, ed448.Ed448PrivateKey):
                 raise TypeError("The private key must be an instance of Ed448PrivateKey")
 
         if not isinstance(key, (ed25519.Ed25519PrivateKey, ed448.Ed448PrivateKey)):
@@ -53,9 +53,9 @@ def verify(self, msg, sig, key):
         """
 
         if self.algorithm:
-            if self.algorithm == "ES25519" and not isinstance(key, ed25519.Ed25519PublicKey):
+            if self.algorithm == "Ed25519" and not isinstance(key, ed25519.Ed25519PublicKey):
                 raise TypeError("The public key must be an instance of Ed25519PublicKey")
-            if self.algorithm == "ES448" and not isinstance(key, ed448.Ed448PublicKey):
+            if self.algorithm == "Ed448" and not isinstance(key, ed448.Ed448PublicKey):
                 raise TypeError("The public key must be an instance of Ed448PublicKey")
 
         if not isinstance(key, (ed25519.Ed25519PublicKey, ed448.Ed448PublicKey)):

src/cryptojwt/jws/jws.py

@@ -48,8 +48,8 @@
     "PS384": PSSSigner("SHA384"),
     "PS512": PSSSigner("SHA512"),
     "EdDSA": EDDSASigner(),
-    "ES25519": EDDSASigner("ES25519"),
-    "ES448": EDDSASigner("ES448"),
+    "Ed25519": EDDSASigner("Ed25519"),
+    "Ed448": EDDSASigner("Ed448"),
     "none": None,
 }
 

src/cryptojwt/jws/utils.py

@@ -47,9 +47,9 @@ def alg2keytype(alg):
         return "RSA"
     elif alg.startswith("HS") or alg.startswith("A"):
         return "oct"
-    elif alg == "ES25519":
+    elif alg == "Ed25519":
         return "OKP"
-    elif alg == "ES448":
+    elif alg == "Ed448":
         return "OKP"
     elif alg.startswith("ES") or alg.startswith("ECDH-ES"):
         return "EC"

tests/test_04_key_jar.py

@@ -564,15 +564,15 @@ def test_load_missing_key_parameter():
         {
             "kid": "OF9xVk9NWE5iQ2N6OGhILTVGcXg4RE1FRk5NWVVsaXZLcFNRNUxCYk9vQQ",
             "use": "sig",
-            "alg": "ES25519",
+            "alg": "Ed25519",
             "kty": "OKP",
             "crv": "Ed25519",
             "x": "M_D8nslNSecjPwiP6DwuNhWRdrgqp02U7f5xo4GhdlY",
         },
         {
             "kid": "RUpoaXktM1JwT0hON3lzNWNfN0RUbVpiWExwbnJnNDRfYWhZY3htaTZ1Zw",
             "use": "sig",
-            "alg": "ES448",
+            "alg": "Ed448",
             "kty": "OKP",
             "crv": "Ed448",
             "x": "C3y5YN00IxyadHXm4NApPGAzv5w8s9e-fbGu2svYrrCuJDYDDZe-uEOPSobII6psCZCEvo2howmA",
@@ -605,9 +605,9 @@ def test_get_eddsa():
     kj = KeyJar()
     kj.import_jwks(JWKS_EDDSA, "")
     assert len(kj.get_issuer_keys("")) == 4
-    k = kj.get("sig", "OKP", alg="ES25519")
+    k = kj.get("sig", "OKP", alg="Ed25519")
     assert k
-    k = kj.get("sig", "OKP", alg="ES448")
+    k = kj.get("sig", "OKP", alg="Ed448")
     assert k
 
 

tests/test_06_jws.py

@@ -613,11 +613,11 @@ def test_signer_eddsa():
     okp = ed25519.Ed25519PrivateKey.generate()
     _key = OKPKey().load_key(okp)
     keys = [_key]
-    _jws = JWS(payload, alg="ES25519")
+    _jws = JWS(payload, alg="Ed25519")
     _jwt = _jws.sign_compact(keys)
 
     _pubkey = OKPKey().load_key(okp.public_key())
-    _rj = JWS(alg="ES25519")
+    _rj = JWS(alg="Ed25519")
     info = _rj.verify_compact(_jwt, [_pubkey])
     assert info == payload
 
@@ -641,12 +641,12 @@ def test_signer_eddsa_fail():
     okp = ed25519.Ed25519PrivateKey.generate()
     _key = OKPKey().load_key(okp)
     keys = [_key]
-    _jws = JWS(payload, alg="ES25519")
+    _jws = JWS(payload, alg="Ed25519")
     _jwt = _jws.sign_compact(keys)
 
     okp2 = ed25519.Ed25519PrivateKey.generate()
     _pubkey = OKPKey().load_key(okp2.public_key())
-    _rj = JWS(alg="ES25519")
+    _rj = JWS(alg="Ed25519")
     try:
         info = _rj.verify_compact(_jwt, [_pubkey])
     except BadSignature: