diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-11-30 16:40:10 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-12-03 15:40:57 -0600 |
| commit | b8e2ab2f5502b68da2c50e62542bf743e66b1958 (patch) | |
| tree | 01b9381cfbf1ce906230cbcec88d31407472ead6 /mediagoblin/tools/crypto.py | |
| parent | a4768df0ca2e956f245e0833331ed8abb203937a (diff) | |
| download | mediagoblin-b8e2ab2f5502b68da2c50e62542bf743e66b1958.tar.lz mediagoblin-b8e2ab2f5502b68da2c50e62542bf743e66b1958.tar.xz mediagoblin-b8e2ab2f5502b68da2c50e62542bf743e66b1958.zip | |
Starting to deprecate the app_config, global_config by attaching stuff to app
- app.global_config, app.app_config
- making setup_crypto use app.app_config
- setting app.workbench_manager
Diffstat (limited to 'mediagoblin/tools/crypto.py')
| -rw-r--r-- | mediagoblin/tools/crypto.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/tools/crypto.py b/mediagoblin/tools/crypto.py index c85ecd4a..1107e200 100644 --- a/mediagoblin/tools/crypto.py +++ b/mediagoblin/tools/crypto.py @@ -36,7 +36,7 @@ try: except AttributeError: getrandbits = random.getrandbits - +# TODO: This should be attached to the MediaGoblinApp __itsda_secret = None @@ -73,9 +73,9 @@ def create_key(key_dir, key_filepath): _log.info("Saved new key for It's Dangerous") -def setup_crypto(): +def setup_crypto(app_config): global __itsda_secret - key_dir = mg_globals.app_config["crypto_path"] + key_dir = app_config["crypto_path"] key_filepath = os.path.join(key_dir, 'itsdangeroussecret.bin') try: load_key(key_filepath) |