diff options
Diffstat (limited to 'service/pixelated')
-rw-r--r-- | service/pixelated/config/initialize_leap.py | 3 | ||||
-rw-r--r-- | service/pixelated/config/leap_cert.py | 26 |
2 files changed, 3 insertions, 26 deletions
diff --git a/service/pixelated/config/initialize_leap.py b/service/pixelated/config/initialize_leap.py index 856c915b..a008cbff 100644 --- a/service/pixelated/config/initialize_leap.py +++ b/service/pixelated/config/initialize_leap.py @@ -4,6 +4,7 @@ from pixelated.config.config_ua import config_user_agent from pixelated.config.dispatcher import config_dispatcher import pixelated.bitmask_libraries.certs as certs + def initialize_leap(leap_provider_cert, leap_provider_cert_fingerprint, config_file, @@ -32,6 +33,7 @@ def gather_credentials(dispatcher, dispatcher_stdin, config_file): else: return config_user_agent(config_file) + def init_leap_cert(leap_provider_cert, leap_provider_cert_fingerprint): if leap_provider_cert_fingerprint is None: certs.LEAP_CERT = leap_provider_cert or True @@ -40,6 +42,7 @@ def init_leap_cert(leap_provider_cert, leap_provider_cert_fingerprint): certs.LEAP_FINGERPRINT = leap_provider_cert_fingerprint certs.LEAP_CERT = False + def init_monkeypatches(): import pixelated.support.ext_protobuf import pixelated.support.ext_sqlcipher diff --git a/service/pixelated/config/leap_cert.py b/service/pixelated/config/leap_cert.py deleted file mode 100644 index 20251d7c..00000000 --- a/service/pixelated/config/leap_cert.py +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright (c) 2014 ThoughtWorks, Inc. -# -# Pixelated is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Pixelated is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Pixelated. If not, see <http://www.gnu.org/licenses/>. - -import pixelated.bitmask_libraries.certs as certs - - -def init_leap_cert(leap_provider_cert, leap_provider_cert_fingerprint): - if leap_provider_cert_fingerprint is None: - certs.LEAP_CERT = leap_provider_cert or True - certs.LEAP_FINGERPRINT = None - else: - certs.LEAP_FINGERPRINT = leap_provider_cert_fingerprint - certs.LEAP_CERT = False |