merging

Author: rohe

setup.py

@@ -79,7 +79,7 @@ def run_tests(self):
         "Programming Language :: Python :: 3.10",
         "Topic :: Software Development :: Libraries :: Python Modules"],
     install_requires=[
-        "cryptojwt>=1.8.0",
+        "cryptojwt>=1.8.1",
         "pyOpenSSL",
         "filelock>=3.0.12",
         'pyyaml>=5.1.2',

src/idpyoidc/encrypter.py

@@ -12,8 +12,9 @@ def default_crypt_config():
     return {
         "class": DEFAULT_CRYPTO,
         "kwargs": {
-            "password": os.urandom(16),
-            "salt": os.urandom(16)
+            "key": os.urandom(32),
+            # "password": os.urandom(16),
+            # "salt": os.urandom(16)
             # "keys": {
             #     "key_defs": [
             #         {"type": "OCT", "use": ["enc"], "kid": "password"},

tests/private/token_jwks.json

@@ -1 +1 @@
-{"keys": [{"kty": "oct", "use": "enc", "kid": "code", "k": "-79_--FvcCmJfDcoWkNsQGdsf1u9XOY4"}, {"kty": "oct", "use": "enc", "kid": "refresh", "k": "mgbrjz28uGedHlUyUoJsDJZpRndQLOcQ"}]}
+{"keys": [{"kty": "oct", "use": "enc", "kid": "code", "k": "vSHDkLBHhDStkR0NWu8519rmV5zmnm5_"}]}

tests/test_20_config.py

@@ -96,7 +96,7 @@ def test_entity_config(filename):
 def test_init_crypto_None():
     _res = init_encrypter()
     assert _res["conf"]["class"] == DEFAULT_CRYPTO
-    assert set(_res["conf"]["kwargs"].keys()) == {"password", "salt"}
+    assert set(_res["conf"]["kwargs"].keys()) == {"key"}
     assert isinstance(_res["encrypter"], FernetEncrypter)