Skip to content

Commit 8929c5b

Browse files
committed
Updated version.
Cleaning up.
1 parent 41d3edc commit 8929c5b

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

src/cryptojwt/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
from binascii import unhexlify
1919

20-
__version__ = '0.0.1'
20+
__version__ = '0.1.0'
2121

2222
logger = logging.getLogger(__name__)
2323

src/cryptojwt/jwe.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -434,8 +434,6 @@ def _generate_key(encalg, cek=""):
434434
_key = get_random_bytes(ENCALGLEN2[encalg])
435435
except KeyError:
436436
raise Exception("Unsupported encryption algorithm %s" % encalg)
437-
if cek:
438-
_key = cek
439437

440438
return _key
441439

@@ -978,13 +976,7 @@ def encrypt(self, keys=None, cek="", iv="", **kwargs):
978976
kwargs["iv"] = iv
979977

980978
for key in keys:
981-
if isinstance(encrypter, JWE_EC):
982-
if self.enc:
983-
_key = key.encryption_key(alg=self.enc, private=True)
984-
else:
985-
_key = key.encryption_key(alg=_alg, private=True)
986-
else:
987-
_key = key.encryption_key(alg=_alg, private=True)
979+
_key = key.encryption_key(alg=_alg, private=False)
988980

989981
if key.kid:
990982
encrypter["kid"] = key.kid

0 commit comments

Comments
 (0)