Skip to content

Commit

Permalink
Relax keys compatibility check
Browse files Browse the repository at this point in the history
Signed-off-by: Sacha Kozma <[email protected]>
  • Loading branch information
yvgny committed Mar 13, 2023
1 parent ac4696c commit fc13ea6
Showing 1 changed file with 37 additions and 0 deletions.
37 changes: 37 additions & 0 deletions didcomm/core/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,45 @@ def get_did_and_optionally_kid(did_or_kid: DID_OR_DID_URL) -> (DID, Optional[DID
return did, kid


class _Crv(Enum):
ED25519 = "ED25519"
X25519 = "X25519"


def _get_crv_for_verification_method(
key: VerificationMethod,
) -> Optional[str]: # TODO switch to optionnal
if key.type in {
VerificationMethodType.ED25519_VERIFICATION_KEY_2020,
VerificationMethodType.ED25519_VERIFICATION_KEY_2018,
}:
return str(_Crv.ED25519)
elif key.type in {
VerificationMethodType.X25519_KEY_AGREEMENT_KEY_2020,
VerificationMethodType.X25519_KEY_AGREEMENT_KEY_2019,
}:
return str(_Crv.X25519)
elif key.type is VerificationMethodType.JSON_WEB_KEY_2020:
jwk = json_str_to_dict(key.verification_material.value)
return jwk["crv"]
else:
return None


def are_keys_compatible(
method1: Union[Secret, VerificationMethod], method2: VerificationMethod
) -> bool:
crv_1 = _get_crv_for_verification_method(method1)
crv_2 = _get_crv_for_verification_method(method2)

if crv_1 is None or crv_2 is None:
return False

return crv_1 == crv_2


def are_keys_compatible_old(
method1: Union[Secret, VerificationMethod], method2: VerificationMethod
) -> bool:
if method1.type == method2.type and (
method1.verification_material.format == method2.verification_material.format
Expand Down

0 comments on commit fc13ea6

Please sign in to comment.