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

Commits:

8 changed files:

Changes:

  • gajim/common/modules/omemo.py
    ... ... @@ -59,14 +59,14 @@
    59 59 
     from gajim.common.modules.util import event_node
    60 60 
     from gajim.common.modules.util import as_task
    61 61 
     from gajim.common.modules.httpupload import HTTPFileTransfer
    62 
    -from gajim.common.modules.omemobackend.aes import aes_encrypt_file
    63 
    -from gajim.common.modules.omemobackend.state import OmemoState
    64 
    -from gajim.common.modules.omemobackend.state import KeyExchangeMessage
    65 
    -from gajim.common.modules.omemobackend.state import SelfMessage
    66 
    -from gajim.common.modules.omemobackend.state import MessageNotForDevice
    67 
    -from gajim.common.modules.omemobackend.state import DecryptionFailed
    68 
    -from gajim.common.modules.omemobackend.state import DuplicateMessage
    69 
    -from gajim.common.modules.omemobackend.util import Trust
    62 
    +from gajim.common.omemo.aes import aes_encrypt_file
    63 
    +from gajim.common.omemo.state import OmemoState
    64 
    +from gajim.common.omemo.state import KeyExchangeMessage
    65 
    +from gajim.common.omemo.state import SelfMessage
    66 
    +from gajim.common.omemo.state import MessageNotForDevice
    67 
    +from gajim.common.omemo.state import DecryptionFailed
    68 
    +from gajim.common.omemo.state import DuplicateMessage
    69 
    +from gajim.common.omemo.util import Trust
    70 70 
     from gajim.common.events import OMEMONewFingerprint
    71 71 
     from gajim.common.modules.util import prepare_stanza
    72 72

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

  • gajim/common/modules/omemobackend/aes.py → gajim/common/omemo/aes.py
    1 
    -# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com>
    1 
    +# This file is part of Gajim.
    2 2 
     #
    3 
    -# This file is part of OMEMO Gajim Plugin.
    4 
    -#
    5 
    -# OMEMO Gajim Plugin is free software; you can redistribute it and/or modify
    3 
    +# Gajim is free software; you can redistribute it and/or modify
    6 4 
     # it under the terms of the GNU General Public License as published
    7 5 
     # by the Free Software Foundation; version 3 only.
    8 6 
     #
    9 
    -# OMEMO Gajim Plugin is distributed in the hope that it will be useful,
    7 
    +# Gajim is distributed in the hope that it will be useful,
    10 8 
     # but WITHOUT ANY WARRANTY; without even the implied warranty of
    11 9 
     # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    12 10 
     # GNU General Public License for more details.
    13 11 
     #
    14 12 
     # You should have received a copy of the GNU General Public License
    15 
    -# along with OMEMO Gajim Plugin. If not, see <http://www.gnu.org/licenses/>.
    13 
    +# along with Gajim. If not, see <http://www.gnu.org/licenses/>.
    16 14
    17 15 
     from __future__ import annotations
    18 16
    ... ... @@ -27,7 +25,7 @@
    27 25 
     from cryptography.hazmat.primitives.ciphers.modes import GCM
    28 26 
     from cryptography.hazmat.backends import default_backend
    29 27
    30 
    -log = logging.getLogger('gajim.p.omemo')
    28 
    +log = logging.getLogger('gajim.c.omemo.aes')
    31 29
    32 30 
     IV_SIZE = 12
    33 31

  • gajim/common/modules/omemobackend/devices.py → gajim/common/omemo/devices.py
    ... ... @@ -20,7 +20,7 @@
    20 20
    21 21 
     from gajim.common import app
    22 22
    23 
    -from gajim.common.modules.omemobackend.util import UNACKNOWLEDGED_COUNT
    23 
    +from gajim.common.omemo.util import UNACKNOWLEDGED_COUNT
    24 24
    25 25
    26 26 
     class DeviceManager:

  • gajim/common/modules/omemobackend/state.py → gajim/common/omemo/state.py
    ... ... @@ -40,20 +40,20 @@
    40 40 
     from axolotl.duplicatemessagexception import DuplicateMessageException
    41 41
    42 42 
     from gajim.common import types
    43 
    +from gajim.common.omemo.aes import aes_decrypt
    44 
    +from gajim.common.omemo.aes import aes_encrypt
    45 
    +from gajim.common.omemo.aes import get_new_key
    46 
    +from gajim.common.omemo.aes import get_new_iv
    43 47 
     from gajim.common.storage.omemo import OMEMOStorage
    44 
    -from gajim.common.modules.omemobackend.aes import aes_decrypt
    45 
    -from gajim.common.modules.omemobackend.aes import aes_encrypt
    46 
    -from gajim.common.modules.omemobackend.aes import get_new_key
    47 
    -from gajim.common.modules.omemobackend.aes import get_new_iv
    48 
    -from gajim.common.modules.omemobackend.devices import DeviceManager
    49 
    -from gajim.common.modules.omemobackend.devices import NoDevicesFound
    50 
    -from gajim.common.modules.omemobackend.util import get_fingerprint
    51 
    -from gajim.common.modules.omemobackend.util import Trust
    52 
    -from gajim.common.modules.omemobackend.util import DEFAULT_PREKEY_AMOUNT
    53 
    -from gajim.common.modules.omemobackend.util import MIN_PREKEY_AMOUNT
    54 
    -from gajim.common.modules.omemobackend.util import SPK_CYCLE_TIME
    55 
    -from gajim.common.modules.omemobackend.util import SPK_ARCHIVE_TIME
    56 
    -from gajim.common.modules.omemobackend.util import UNACKNOWLEDGED_COUNT
    48 
    +from gajim.common.omemo.devices import DeviceManager
    49 
    +from gajim.common.omemo.devices import NoDevicesFound
    50 
    +from gajim.common.omemo.util import get_fingerprint
    51 
    +from gajim.common.omemo.util import Trust
    52 
    +from gajim.common.omemo.util import DEFAULT_PREKEY_AMOUNT
    53 
    +from gajim.common.omemo.util import MIN_PREKEY_AMOUNT
    54 
    +from gajim.common.omemo.util import SPK_CYCLE_TIME
    55 
    +from gajim.common.omemo.util import SPK_ARCHIVE_TIME
    56 
    +from gajim.common.omemo.util import UNACKNOWLEDGED_COUNT
    57 57
    58 58
    59 59 
     class OmemoState(DeviceManager):

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

  • gajim/common/storage/omemo.py
    ... ... @@ -39,9 +39,9 @@
    39 39 
     from axolotl.util.keyhelper import KeyHelper
    40 40
    41 41 
     from gajim.common import app
    42 
    -from gajim.common.modules.omemobackend.util import Trust
    43 
    -from gajim.common.modules.omemobackend.util import IdentityKeyExtended
    44 
    -from gajim.common.modules.omemobackend.util import DEFAULT_PREKEY_AMOUNT
    42 
    +from gajim.common.omemo.util import Trust
    43 
    +from gajim.common.omemo.util import IdentityKeyExtended
    44 
    +from gajim.common.omemo.util import DEFAULT_PREKEY_AMOUNT
    45 45 
     from gajim.common.modules.util import LogAdapter
    46 46
    47 47

  • gajim/gtk/omemo_trust_manager.py
    ... ... @@ -42,9 +42,9 @@
    42 42 
     from gajim.common.i18n import _
    43 43 
     from gajim.common.ged import EventHelper
    44 44 
     from gajim.common.modules.contacts import BareContact
    45 
    -from gajim.common.modules.omemobackend.util import Trust
    46 
    -from gajim.common.modules.omemobackend.util import IdentityKeyExtended
    47 
    -from gajim.common.modules.omemobackend.util import get_fingerprint
    45 
    +from gajim.common.omemo.util import Trust
    46 
    +from gajim.common.omemo.util import IdentityKeyExtended
    47 
    +from gajim.common.omemo.util import get_fingerprint
    48 48
    49 49 
     from .builder import get_builder
    50 50 
     from .dialogs import ConfirmationDialog

    • —
    View it on GitLab.
    You're receiving this email because of your account on dev.gajim.org. Manage all notifications · Help