Skip to content

Ministack: Free, open-source local AWS emulator - 60+ services, Terraform compatible, real databases. Free forever. MIT licensed.

feat(kms): support Ed25519 keys (#756)

Georges KABBOUCHIeb770141ba0a
diff --git a/ministack/services/kms.py b/ministack/services/kms.py
index e80c7f7e..dd1a8151 100644
--- a/ministack/services/kms.py
+++ b/ministack/services/kms.py
@@ -27,7 +27,7 @@ logger = logging.getLogger("kms")
try:
from cryptography.exceptions import InvalidSignature
from cryptography.hazmat.primitives import hashes, serialization
- from cryptography.hazmat.primitives.asymmetric import ec, padding, rsa, utils
+ from cryptography.hazmat.primitives.asymmetric import ec, ed25519, padding, rsa, utils
HAS_CRYPTO = True
except ImportError:
InvalidSignature = Exception
@@ -280,6 +280,18 @@ def _create_key(data):
}
rec["SigningAlgorithms"] = signing_algo_map[key_spec]
rec["EncryptionAlgorithms"] = []
+ elif key_spec == "ECC_NIST_EDWARDS25519":
+ err = _require_crypto("CreateKey")
+ if err:
+ return err
+ private_key = ed25519.Ed25519PrivateKey.generate()
+ rec["_private_key"] = private_key
+ rec["_public_key_der"] = private_key.public_key().public_bytes(
+ serialization.Encoding.DER,
+ serialization.PublicFormat.SubjectPublicKeyInfo,
+ )
+ rec["SigningAlgorithms"] = ["ED25519_SHA_512"]
+ rec["EncryptionAlgorithms"] = []
else:
return error_response_json(
"UnsupportedOperationException",
@@ -358,6 +370,21 @@ def _sign(data):
else:
message = message_b64
+ if algorithm == "ED25519_SHA_512":
+ if rec["KeySpec"] != "ECC_NIST_EDWARDS25519":
+ return error_response_json(
+ "UnsupportedOperationException",
+ f"Signing algorithm {algorithm} is not supported for this key",
+ 400,
+ )
+ signature = rec["_private_key"].sign(message)
+ logger.debug("Signed %d bytes with key %s (%s)", len(message), key_id, algorithm)
+ return json_response({
+ "KeyId": rec["Arn"],
+ "Signature": base64.b64encode(signature).decode(),
+ "SigningAlgorithm": algorithm,
+ })
+
pad, hash_algo = _signing_params(algorithm)
if hash_algo is None:
return error_response_json(
@@ -418,6 +445,28 @@ def _verify(data):
message = base64.b64decode(message_b64) if isinstance(message_b64, str) else message_b64
signature = base64.b64decode(signature_b64) if isinstance(signature_b64, str) else signature_b64
+ public_key = rec["_private_key"].public_key()
+ if algorithm == "ED25519_SHA_512":
+ if rec["KeySpec"] != "ECC_NIST_EDWARDS25519":
+ return error_response_json(
+ "UnsupportedOperationException",
+ f"Signing algorithm {algorithm} is not supported for this key",
+ 400,
+ )
+ try:
+ public_key.verify(signature, message)
+ except InvalidSignature:
+ return error_response_json(
+ "KMSInvalidSignatureException",
+ "Signature verification failed",
+ 400,
+ )
+ return json_response({
+ "KeyId": rec["Arn"],
+ "SignatureValid": True,
+ "SigningAlgorithm": algorithm,
+ })
+
pad, hash_algo = _signing_params(algorithm, for_verify=True)
if hash_algo is None:
return error_response_json(
@@ -426,7 +475,6 @@ def _verify(data):
400,
)
- public_key = rec["_private_key"].public_key()
try:
if pad is None:
# ECDSA
diff --git a/tests/test_kms.py b/tests/test_kms.py
index f8403c9a..a5dc1f57 100644
--- a/tests/test_kms.py
+++ b/tests/test_kms.py
@@ -492,6 +492,71 @@ def test_kms_ecc_get_public_key(kms_client):
assert resp["PublicKey"]
assert "ECDSA_SHA_256" in resp["SigningAlgorithms"]
+def test_kms_create_ecc_nist_edwards25519_key(kms_client):
+ resp = kms_client.create_key(
+ KeySpec="ECC_NIST_EDWARDS25519",
+ KeyUsage="SIGN_VERIFY",
+ Description="ed25519 signing key",
+ )
+ meta = resp["KeyMetadata"]
+ assert meta["KeySpec"] == "ECC_NIST_EDWARDS25519"
+ assert meta["KeyUsage"] == "SIGN_VERIFY"
+ assert meta["SigningAlgorithms"] == ["ED25519_SHA_512"]
+ assert meta["EncryptionAlgorithms"] == []
+
+def test_kms_ecc_nist_edwards25519_sign_verify(kms_client):
+ key = kms_client.create_key(KeySpec="ECC_NIST_EDWARDS25519", KeyUsage="SIGN_VERIFY")
+ key_id = key["KeyMetadata"]["KeyId"]
+ message = b"hello ed25519"
+
+ sign_resp = kms_client.sign(
+ KeyId=key_id,
+ Message=message,
+ MessageType="RAW",
+ SigningAlgorithm="ED25519_SHA_512",
+ )
+ assert key_id in sign_resp["KeyId"]
+ assert sign_resp["SigningAlgorithm"] == "ED25519_SHA_512"
+ assert len(sign_resp["Signature"]) > 0
+
+ verify_resp = kms_client.verify(
+ KeyId=key_id,
+ Message=message,
+ MessageType="RAW",
+ Signature=sign_resp["Signature"],
+ SigningAlgorithm="ED25519_SHA_512",
+ )
+ assert verify_resp["SignatureValid"] is True
+
+def test_kms_ecc_nist_edwards25519_verify_wrong_message(kms_client):
+ key = kms_client.create_key(KeySpec="ECC_NIST_EDWARDS25519", KeyUsage="SIGN_VERIFY")
+ key_id = key["KeyMetadata"]["KeyId"]
+
+ sign_resp = kms_client.sign(
+ KeyId=key_id,
+ Message=b"original ed25519",
+ MessageType="RAW",
+ SigningAlgorithm="ED25519_SHA_512",
+ )
+ with pytest.raises(kms_client.exceptions.KMSInvalidSignatureException):
+ kms_client.verify(
+ KeyId=key_id,
+ Message=b"tampered ed25519",
+ MessageType="RAW",
+ Signature=sign_resp["Signature"],
+ SigningAlgorithm="ED25519_SHA_512",
+ )
+
+def test_kms_ecc_nist_edwards25519_get_public_key(kms_client):
+ key = kms_client.create_key(KeySpec="ECC_NIST_EDWARDS25519", KeyUsage="SIGN_VERIFY")
+ key_id = key["KeyMetadata"]["KeyId"]
+
+ resp = kms_client.get_public_key(KeyId=key_id)
+ assert key_id in resp["KeyId"]
+ assert resp["KeySpec"] == "ECC_NIST_EDWARDS25519"
+ assert resp["PublicKey"]
+ assert resp["SigningAlgorithms"] == ["ED25519_SHA_512"]
+
def test_kms_ecc_nist_p256_sign_verify(kms_client):
key = kms_client.create_key(KeySpec="ECC_NIST_P256", KeyUsage="SIGN_VERIFY")
key_id = key["KeyMetadata"]["KeyId"]