Philipp Hörist pushed to branch omemo_integration at gajim / gajim

Commits: 56e14628 by Philipp Hörist at 2022-10-20T19:35:02+02:00 refactor: Move omemo code into common

- - - - -

8 changed files:

- gajim/common/modules/omemo.py - gajim/common/modules/omemobackend/__init__.py → gajim/common/omemo/__init__.py - gajim/common/modules/omemobackend/aes.py → gajim/common/omemo/aes.py - gajim/common/modules/omemobackend/devices.py → gajim/common/omemo/devices.py - gajim/common/modules/omemobackend/state.py → gajim/common/omemo/state.py - gajim/common/modules/omemobackend/util.py → gajim/common/omemo/util.py - gajim/common/storage/omemo.py - gajim/gtk/omemo_trust_manager.py

Changes:

===================================== gajim/common/modules/omemo.py ===================================== @@ -59,14 +59,14 @@ from gajim.common.modules.util import event_node from gajim.common.modules.util import as_task from gajim.common.modules.httpupload import HTTPFileTransfer -from gajim.common.modules.omemobackend.aes import aes_encrypt_file -from gajim.common.modules.omemobackend.state import OmemoState -from gajim.common.modules.omemobackend.state import KeyExchangeMessage -from gajim.common.modules.omemobackend.state import SelfMessage -from gajim.common.modules.omemobackend.state import MessageNotForDevice -from gajim.common.modules.omemobackend.state import DecryptionFailed -from gajim.common.modules.omemobackend.state import DuplicateMessage -from gajim.common.modules.omemobackend.util import Trust +from gajim.common.omemo.aes import aes_encrypt_file +from gajim.common.omemo.state import OmemoState +from gajim.common.omemo.state import KeyExchangeMessage +from gajim.common.omemo.state import SelfMessage +from gajim.common.omemo.state import MessageNotForDevice +from gajim.common.omemo.state import DecryptionFailed +from gajim.common.omemo.state import DuplicateMessage +from gajim.common.omemo.util import Trust from gajim.common.events import OMEMONewFingerprint from gajim.common.modules.util import prepare_stanza

===================================== gajim/common/modules/omemobackend/__init__.py → gajim/common/omemo/__init__.py =====================================

===================================== gajim/common/modules/omemobackend/aes.py → gajim/common/omemo/aes.py ===================================== @@ -1,18 +1,16 @@ -# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com> +# This file is part of Gajim. # -# This file is part of OMEMO Gajim Plugin. -# -# OMEMO Gajim Plugin is free software; you can redistribute it and/or modify +# Gajim is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published # by the Free Software Foundation; version 3 only. # -# OMEMO Gajim Plugin is distributed in the hope that it will be useful, +# Gajim 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 General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with OMEMO Gajim Plugin. If not, see http://www.gnu.org/licenses/. +# along with Gajim. If not, see http://www.gnu.org/licenses/.

from __future__ import annotations

@@ -27,7 +25,7 @@ from cryptography.hazmat.primitives.ciphers.modes import GCM from cryptography.hazmat.backends import default_backend

-log = logging.getLogger('gajim.p.omemo') +log = logging.getLogger('gajim.c.omemo.aes')

IV_SIZE = 12

===================================== gajim/common/modules/omemobackend/devices.py → gajim/common/omemo/devices.py ===================================== @@ -20,7 +20,7 @@

from gajim.common import app

-from gajim.common.modules.omemobackend.util import UNACKNOWLEDGED_COUNT +from gajim.common.omemo.util import UNACKNOWLEDGED_COUNT

class DeviceManager:

===================================== gajim/common/modules/omemobackend/state.py → gajim/common/omemo/state.py ===================================== @@ -40,20 +40,20 @@ from axolotl.duplicatemessagexception import DuplicateMessageException

from gajim.common import types +from gajim.common.omemo.aes import aes_decrypt +from gajim.common.omemo.aes import aes_encrypt +from gajim.common.omemo.aes import get_new_key +from gajim.common.omemo.aes import get_new_iv from gajim.common.storage.omemo import OMEMOStorage -from gajim.common.modules.omemobackend.aes import aes_decrypt -from gajim.common.modules.omemobackend.aes import aes_encrypt -from gajim.common.modules.omemobackend.aes import get_new_key -from gajim.common.modules.omemobackend.aes import get_new_iv -from gajim.common.modules.omemobackend.devices import DeviceManager -from gajim.common.modules.omemobackend.devices import NoDevicesFound -from gajim.common.modules.omemobackend.util import get_fingerprint -from gajim.common.modules.omemobackend.util import Trust -from gajim.common.modules.omemobackend.util import DEFAULT_PREKEY_AMOUNT -from gajim.common.modules.omemobackend.util import MIN_PREKEY_AMOUNT -from gajim.common.modules.omemobackend.util import SPK_CYCLE_TIME -from gajim.common.modules.omemobackend.util import SPK_ARCHIVE_TIME -from gajim.common.modules.omemobackend.util import UNACKNOWLEDGED_COUNT +from gajim.common.omemo.devices import DeviceManager +from gajim.common.omemo.devices import NoDevicesFound +from gajim.common.omemo.util import get_fingerprint +from gajim.common.omemo.util import Trust +from gajim.common.omemo.util import DEFAULT_PREKEY_AMOUNT +from gajim.common.omemo.util import MIN_PREKEY_AMOUNT +from gajim.common.omemo.util import SPK_CYCLE_TIME +from gajim.common.omemo.util import SPK_ARCHIVE_TIME +from gajim.common.omemo.util import UNACKNOWLEDGED_COUNT

class OmemoState(DeviceManager):

===================================== gajim/common/modules/omemobackend/util.py → gajim/common/omemo/util.py =====================================

===================================== gajim/common/storage/omemo.py ===================================== @@ -39,9 +39,9 @@ from axolotl.util.keyhelper import KeyHelper

from gajim.common import app -from gajim.common.modules.omemobackend.util import Trust -from gajim.common.modules.omemobackend.util import IdentityKeyExtended -from gajim.common.modules.omemobackend.util import DEFAULT_PREKEY_AMOUNT +from gajim.common.omemo.util import Trust +from gajim.common.omemo.util import IdentityKeyExtended +from gajim.common.omemo.util import DEFAULT_PREKEY_AMOUNT from gajim.common.modules.util import LogAdapter

===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -42,9 +42,9 @@ from gajim.common.i18n import _ from gajim.common.ged import EventHelper from gajim.common.modules.contacts import BareContact -from gajim.common.modules.omemobackend.util import Trust -from gajim.common.modules.omemobackend.util import IdentityKeyExtended -from gajim.common.modules.omemobackend.util import get_fingerprint +from gajim.common.omemo.util import Trust +from gajim.common.omemo.util import IdentityKeyExtended +from gajim.common.omemo.util import get_fingerprint

from .builder import get_builder from .dialogs import ConfirmationDialog

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/56e14628894e0c1cb4c7fe56d67483961...