Skip to content

fix: ec isinstance fix #794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ShubhamChaturvedi7 wants to merge 1 commit into from
Closed

fix: ec isinstance fix #794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/aws_encryption_sdk/internal/crypto/authentication.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ def __init__(self, algorithm, key):

def _set_signature_type(self):
"""Ensures that the algorithm signature type is a known type and sets a reference value."""
if not isinstance(self.algorithm.signing_algorithm_info, type(ec.EllipticCurve)):
try:
if not issubclass(self.algorithm.signing_algorithm_info, ec.EllipticCurve):
raise NotSupportedError("Unsupported signing algorithm info")
except TypeError:
raise NotSupportedError("Unsupported signing algorithm info")
return ec.EllipticCurve

Expand Down
12 changes: 10 additions & 2 deletions test/unit/test_crypto_prehashing_authenticator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import pytest
from mock import MagicMock, sentinel
from pytest_mock import mocker # noqa pylint: disable=unused-import
from cryptography.hazmat.primitives.asymmetric import ec

import aws_encryption_sdk.internal.crypto.authentication
from aws_encryption_sdk.exceptions import NotSupportedError
Expand Down Expand Up @@ -56,12 +57,19 @@ def test_init(patch_set_signature_type, patch_build_hasher):
def test_set_signature_type_elliptic_curve(
patch_build_hasher, patch_cryptography_ec
):
mock_algorithm_info = MagicMock(return_value=sentinel.algorithm_info, spec=patch_cryptography_ec.EllipticCurve)
mock_algorithm = MagicMock(signing_algorithm_info=mock_algorithm_info)
patch_cryptography_ec.EllipticCurve = ec.EllipticCurve
mock_algorithm = MagicMock(signing_algorithm_info=ec.SECP256R1)
test = _PrehashingAuthenticator(algorithm=mock_algorithm, key=sentinel.key)

assert test._signature_type is patch_cryptography_ec.EllipticCurve

def test_set_signature_type_elliptic_curve_known_value(patch_build_hasher):
from cryptography.hazmat.primitives.asymmetric import ec as real_ec

mock_algorithm = MagicMock(signing_algorithm_info=real_ec.SECP384R1)
test = _PrehashingAuthenticator(algorithm=mock_algorithm, key=sentinel.key)

assert test._signature_type is real_ec.EllipticCurve

def test_set_signature_type_unknown(
patch_build_hasher, patch_cryptography_ec
Expand Down
Loading