Skip to content

Commit 594c413

Browse files
committed
Updated tests.
1 parent e9abbf9 commit 594c413

File tree

2 files changed

+11
-23
lines changed

2 files changed

+11
-23
lines changed

tests/test_02_jwk.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -590,3 +590,11 @@ def test_key_from_jwk_dict_ec():
590590
_key = key_from_jwk_dict(jwk)
591591
assert isinstance(_key, ECKey)
592592
assert _key.has_private_key()
593+
594+
595+
def test_key_from_jwk_dict_sym():
596+
jwk = {'kty': 'oct', 'key': 'abcdefghijklmnopq'}
597+
_key = key_from_jwk_dict(jwk)
598+
assert isinstance(_key, SYMKey)
599+
jwk = _key.serialize()
600+
assert jwk == {'kty': 'oct', 'k': 'YWJjZGVmZ2hpamtsbW5vcHE'}

tests/test_10_key_bundle.py

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@
55
import shutil
66
import time
77

8-
from cryptography.hazmat.primitives.asymmetric import rsa
9-
108
from cryptojwt.jwk.rsa import RSAKey
119
from cryptojwt.jwk.hmac import SYMKey
1210

13-
from cryptojwt.key_bundle import create_and_store_rsa_key_pair
1411
from cryptojwt.key_bundle import dump_jwks
1512
from cryptojwt.key_bundle import rsa_init
1613
from cryptojwt.key_bundle import keybundle_from_local_file
@@ -187,24 +184,6 @@ def full_path(local_file):
187184
shutil.rmtree('keys')
188185

189186

190-
def test_create_and_store_rsa_key_pair():
191-
key = create_and_store_rsa_key_pair()
192-
assert isinstance(key, rsa.RSAPrivateKey)
193-
194-
# default
195-
filename = os.path.join('.', 'oidcmsg')
196-
assert os.path.isfile(filename)
197-
assert os.path.isfile('{}.pub'.format(filename))
198-
199-
sec_key = create_and_store_rsa_key_pair('seckey', 'keys', size=1024)
200-
assert isinstance(sec_key, rsa.RSAPrivateKey)
201-
202-
# default
203-
filename = os.path.join('keys', 'seckey')
204-
assert os.path.isfile(filename)
205-
assert os.path.isfile('{}.pub'.format(filename))
206-
207-
208187
def test_with_sym_key():
209188
kc = KeyBundle({"kty": "oct", "key": "highestsupersecret", "use": "sig"})
210189
assert len(kc.get("oct")) == 1
@@ -323,7 +302,7 @@ def test_get_all():
323302

324303
def test_keybundle_from_local_der():
325304
kb = keybundle_from_local_file(
326-
"{}".format(os.path.join('keys', 'rsa_enc')), "der", ['enc'])
305+
"{}".format(os.path.join('test_keys', 'rsa.key')), "der", ['enc'])
327306
assert len(kb) == 1
328307
keys = kb.get('rsa')
329308
assert len(keys) == 1
@@ -332,7 +311,8 @@ def test_keybundle_from_local_der():
332311

333312
def test_keybundle_from_local_der_update():
334313
kb = keybundle_from_local_file(
335-
"file://{}".format(os.path.join('keys', 'rsa_enc')), "der", ['enc'])
314+
"file://{}".format(os.path.join('test_keys', 'rsa.key')),
315+
"der", ['enc'])
336316
assert len(kb) == 1
337317
keys = kb.get('rsa')
338318
assert len(keys) == 1

0 commit comments

Comments
 (0)