Added file attribute and added alternative configuration attribute name

Author: rohe

src/oidcmsg/configure.py

@@ -9,7 +9,7 @@
 from oidcmsg.logging import configure_logging
 from oidcmsg.util import load_yaml_config
 
-DEFAULT_FILE_ATTRIBUTE_NAMES = ['server_key', 'server_cert', 'filename',
+DEFAULT_FILE_ATTRIBUTE_NAMES = ['server_key', 'server_cert', 'filename', 'template_dir',
                                 'private_path', 'public_path', 'db_file', 'jwks_file']
 
 DEFAULT_DIR_ATTRIBUTE_NAMES = ['template_dir']

src/oidcmsg/context.py

@@ -35,6 +35,9 @@ def _keyjar(self, keyjar=None, conf=None, entity_id=""):
             if "keys" in conf:
                 keys_args = {k: v for k, v in conf["keys"].items() if k != "uri_path"}
                 _keyjar = init_key_jar(**keys_args)
+            elif "key_conf" in conf:
+                keys_args = {k: v for k, v in conf["key_conf"].items() if k != "uri_path"}
+                _keyjar = init_key_jar(**keys_args)
             else:
                 _keyjar = KeyJar()
                 if "jwks" in conf: