From d8ac01dd421504a03813f4fa7cbe999a3ddeac43 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 28 Jun 2019 13:29:56 +0000 Subject: [PATCH] Removed anora from installed apps, and changed PEM key to bytes instead of str. - Legacy-Id: 16318 --- ietf/settings.py | 5 ++--- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ietf/settings.py b/ietf/settings.py index 12e2fe883..d163d472e 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -389,7 +389,6 @@ INSTALLED_APPS = ( 'django.contrib.sites', 'django.contrib.staticfiles', # External apps - 'anora', 'bootstrap3', 'corsheaders', 'django_markup', @@ -1035,13 +1034,13 @@ UTILS_APIKEY_GUI_LOGIN_LIMIT_DAYS = 30 API_KEY_TYPE="ES256" # EC / P=256 -API_PUBLIC_KEY_PEM = """ +API_PUBLIC_KEY_PEM = b""" -----BEGIN PUBLIC KEY----- MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEqVojsaofDJScuMJN+tshumyNM5ME garzVPqkVovmF6yE7IJ/dv4FcV+QKCtJ/rOS8e36Y8ZAEVYuukhes0yZ1w== -----END PUBLIC KEY----- """ -API_PRIVATE_KEY_PEM = """ +API_PRIVATE_KEY_PEM = b""" -----BEGIN PRIVATE KEY----- MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgoI6LJkopKq8XrHi9 QqGQvE4A83TFYjqLz+8gULYecsqhRANCAASpWiOxqh8MlJy4wk362yG6bI0zkwSB diff --git a/requirements.txt b/requirements.txt index 456a64660..45af314a9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ # -*- conf-mode -*- setuptools>=18.5 # Require this first, to prevent later errors # -anora>=0.1.2 +#anora>=0.1.2 argon2-cffi>=16.1.0 # For the Argon2 password hasher option beautifulsoup4>=4.5.0 bibtexparser>=0.6.2,<1.0 # Version 1.0 doesn't work under python 2.7. 1.0.1 doesn't recognize month names or abbreviations.