mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-13 19:29:53 +03:00
Fix tests using updated protos generated with libprotoc 3.21.9. Resolves error with py3-protobuf 5.29.4. Example error: ``` ====================================================================== ERROR: axolotl.tests.groups.test_groupcipher (unittest.loader._FailedTest.axolotl.tests.groups.test_groupcipher) ---------------------------------------------------------------------- ImportError: Failed to import test module: axolotl.tests.groups.test_groupcipher Traceback (most recent call last): File "/usr/lib/python3.12/unittest/loader.py", line 396, in _find_test_path module = self._get_module_from_name(name) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ [...] File "/usr/lib/python3.12/site-packages/google/protobuf/descriptor.py", line 621, in __new__ _message.Message._CheckCalledFromGeneratedFile() TypeError: Descriptors cannot be created directly. If this call came from a _pb2.py file, your generated code is out of date and must be regenerated with protoc >= 3.19.0. If you cannot immediately regenerate your protos, some other possible workarounds are: 1. Downgrade the protobuf package to 3.20.x or lower. 2. Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python (but this will use pure-Python parsing and will be much slower). More information: https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates ```
1357 lines
62 KiB
Diff
1357 lines
62 KiB
Diff
Patch-Source: https://github.com/tgalal/python-axolotl/pull/46
|
|
---
|
|
From f23e151c2f27043c7261eb07dd50f269abf51dce Mon Sep 17 00:00:00 2001
|
|
From: Alfred Wingate <parona@protonmail.com>
|
|
Date: Fri, 28 Feb 2025 22:16:38 +0200
|
|
Subject: [PATCH] Regenerate protos with libprotoc 3.21.9
|
|
|
|
https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
|
|
|
|
Bug: https://bugs.gentoo.org/936053
|
|
Signed-off-by: Alfred Wingate <parona@protonmail.com>
|
|
---
|
|
axolotl/protocol/whisperprotos_pb2.py | 348 +---------
|
|
axolotl/state/storageprotos_pb2.py | 932 ++------------------------
|
|
setup.py | 2 +-
|
|
tox.ini | 2 +-
|
|
4 files changed, 66 insertions(+), 1218 deletions(-)
|
|
|
|
diff --git a/axolotl/protocol/whisperprotos_pb2.py b/axolotl/protocol/whisperprotos_pb2.py
|
|
index 7b5ead4..3aadedc 100644
|
|
--- a/axolotl/protocol/whisperprotos_pb2.py
|
|
+++ b/axolotl/protocol/whisperprotos_pb2.py
|
|
@@ -1,13 +1,11 @@
|
|
+# -*- coding: utf-8 -*-
|
|
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
|
-# source: WhisperTextProtocol.proto
|
|
-
|
|
-import sys
|
|
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
|
+# source: axolotl/protobuf/WhisperTextProtocol.proto
|
|
+"""Generated protocol buffer code."""
|
|
+from google.protobuf.internal import builder as _builder
|
|
from google.protobuf import descriptor as _descriptor
|
|
-from google.protobuf import message as _message
|
|
-from google.protobuf import reflection as _reflection
|
|
+from google.protobuf import descriptor_pool as _descriptor_pool
|
|
from google.protobuf import symbol_database as _symbol_database
|
|
-from google.protobuf import descriptor_pb2
|
|
# @@protoc_insertion_point(imports)
|
|
|
|
_sym_db = _symbol_database.Default()
|
|
@@ -15,326 +13,22 @@
|
|
|
|
|
|
|
|
-DESCRIPTOR = _descriptor.FileDescriptor(
|
|
- name='WhisperTextProtocol.proto',
|
|
- package='textsecure',
|
|
- serialized_pb=_b('\n\x19WhisperTextProtocol.proto\x12\ntextsecure\"b\n\x0eWhisperMessage\x12\x12\n\nratchetKey\x18\x01 \x01(\x0c\x12\x0f\n\x07\x63ounter\x18\x02 \x01(\r\x12\x17\n\x0fpreviousCounter\x18\x03 \x01(\r\x12\x12\n\nciphertext\x18\x04 \x01(\x0c\"\x8f\x01\n\x14PreKeyWhisperMessage\x12\x16\n\x0eregistrationId\x18\x05 \x01(\r\x12\x10\n\x08preKeyId\x18\x01 \x01(\r\x12\x16\n\x0esignedPreKeyId\x18\x06 \x01(\r\x12\x0f\n\x07\x62\x61seKey\x18\x02 \x01(\x0c\x12\x13\n\x0bidentityKey\x18\x03 \x01(\x0c\x12\x0f\n\x07message\x18\x04 \x01(\x0c\"t\n\x12KeyExchangeMessage\x12\n\n\x02id\x18\x01 \x01(\r\x12\x0f\n\x07\x62\x61seKey\x18\x02 \x01(\x0c\x12\x12\n\nratchetKey\x18\x03 \x01(\x0c\x12\x13\n\x0bidentityKey\x18\x04 \x01(\x0c\x12\x18\n\x10\x62\x61seKeySignature\x18\x05 \x01(\x0c\"E\n\x10SenderKeyMessage\x12\n\n\x02id\x18\x01 \x01(\r\x12\x11\n\titeration\x18\x02 \x01(\r\x12\x12\n\nciphertext\x18\x03 \x01(\x0c\"c\n\x1cSenderKeyDistributionMessage\x12\n\n\x02id\x18\x01 \x01(\r\x12\x11\n\titeration\x18\x02 \x01(\r\x12\x10\n\x08\x63hainKey\x18\x03 \x01(\x0c\x12\x12\n\nsigningKey\x18\x04 \x01(\x0c\x42\x37\n&org.whispersystems.libaxolotl.protocolB\rWhisperProtos')
|
|
-)
|
|
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-_WHISPERMESSAGE = _descriptor.Descriptor(
|
|
- name='WhisperMessage',
|
|
- full_name='textsecure.WhisperMessage',
|
|
- filename=None,
|
|
- file=DESCRIPTOR,
|
|
- containing_type=None,
|
|
- fields=[
|
|
- _descriptor.FieldDescriptor(
|
|
- name='ratchetKey', full_name='textsecure.WhisperMessage.ratchetKey', index=0,
|
|
- number=1, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='counter', full_name='textsecure.WhisperMessage.counter', index=1,
|
|
- number=2, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='previousCounter', full_name='textsecure.WhisperMessage.previousCounter', index=2,
|
|
- number=3, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='ciphertext', full_name='textsecure.WhisperMessage.ciphertext', index=3,
|
|
- number=4, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- ],
|
|
- extensions=[
|
|
- ],
|
|
- nested_types=[],
|
|
- enum_types=[
|
|
- ],
|
|
- options=None,
|
|
- is_extendable=False,
|
|
- extension_ranges=[],
|
|
- oneofs=[
|
|
- ],
|
|
- serialized_start=41,
|
|
- serialized_end=139,
|
|
-)
|
|
-
|
|
-
|
|
-_PREKEYWHISPERMESSAGE = _descriptor.Descriptor(
|
|
- name='PreKeyWhisperMessage',
|
|
- full_name='textsecure.PreKeyWhisperMessage',
|
|
- filename=None,
|
|
- file=DESCRIPTOR,
|
|
- containing_type=None,
|
|
- fields=[
|
|
- _descriptor.FieldDescriptor(
|
|
- name='registrationId', full_name='textsecure.PreKeyWhisperMessage.registrationId', index=0,
|
|
- number=5, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='preKeyId', full_name='textsecure.PreKeyWhisperMessage.preKeyId', index=1,
|
|
- number=1, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='signedPreKeyId', full_name='textsecure.PreKeyWhisperMessage.signedPreKeyId', index=2,
|
|
- number=6, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='baseKey', full_name='textsecure.PreKeyWhisperMessage.baseKey', index=3,
|
|
- number=2, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='identityKey', full_name='textsecure.PreKeyWhisperMessage.identityKey', index=4,
|
|
- number=3, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='message', full_name='textsecure.PreKeyWhisperMessage.message', index=5,
|
|
- number=4, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- ],
|
|
- extensions=[
|
|
- ],
|
|
- nested_types=[],
|
|
- enum_types=[
|
|
- ],
|
|
- options=None,
|
|
- is_extendable=False,
|
|
- extension_ranges=[],
|
|
- oneofs=[
|
|
- ],
|
|
- serialized_start=142,
|
|
- serialized_end=285,
|
|
-)
|
|
-
|
|
-
|
|
-_KEYEXCHANGEMESSAGE = _descriptor.Descriptor(
|
|
- name='KeyExchangeMessage',
|
|
- full_name='textsecure.KeyExchangeMessage',
|
|
- filename=None,
|
|
- file=DESCRIPTOR,
|
|
- containing_type=None,
|
|
- fields=[
|
|
- _descriptor.FieldDescriptor(
|
|
- name='id', full_name='textsecure.KeyExchangeMessage.id', index=0,
|
|
- number=1, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='baseKey', full_name='textsecure.KeyExchangeMessage.baseKey', index=1,
|
|
- number=2, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='ratchetKey', full_name='textsecure.KeyExchangeMessage.ratchetKey', index=2,
|
|
- number=3, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='identityKey', full_name='textsecure.KeyExchangeMessage.identityKey', index=3,
|
|
- number=4, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='baseKeySignature', full_name='textsecure.KeyExchangeMessage.baseKeySignature', index=4,
|
|
- number=5, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- ],
|
|
- extensions=[
|
|
- ],
|
|
- nested_types=[],
|
|
- enum_types=[
|
|
- ],
|
|
- options=None,
|
|
- is_extendable=False,
|
|
- extension_ranges=[],
|
|
- oneofs=[
|
|
- ],
|
|
- serialized_start=287,
|
|
- serialized_end=403,
|
|
-)
|
|
-
|
|
-
|
|
-_SENDERKEYMESSAGE = _descriptor.Descriptor(
|
|
- name='SenderKeyMessage',
|
|
- full_name='textsecure.SenderKeyMessage',
|
|
- filename=None,
|
|
- file=DESCRIPTOR,
|
|
- containing_type=None,
|
|
- fields=[
|
|
- _descriptor.FieldDescriptor(
|
|
- name='id', full_name='textsecure.SenderKeyMessage.id', index=0,
|
|
- number=1, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='iteration', full_name='textsecure.SenderKeyMessage.iteration', index=1,
|
|
- number=2, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='ciphertext', full_name='textsecure.SenderKeyMessage.ciphertext', index=2,
|
|
- number=3, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- ],
|
|
- extensions=[
|
|
- ],
|
|
- nested_types=[],
|
|
- enum_types=[
|
|
- ],
|
|
- options=None,
|
|
- is_extendable=False,
|
|
- extension_ranges=[],
|
|
- oneofs=[
|
|
- ],
|
|
- serialized_start=405,
|
|
- serialized_end=474,
|
|
-)
|
|
-
|
|
-
|
|
-_SENDERKEYDISTRIBUTIONMESSAGE = _descriptor.Descriptor(
|
|
- name='SenderKeyDistributionMessage',
|
|
- full_name='textsecure.SenderKeyDistributionMessage',
|
|
- filename=None,
|
|
- file=DESCRIPTOR,
|
|
- containing_type=None,
|
|
- fields=[
|
|
- _descriptor.FieldDescriptor(
|
|
- name='id', full_name='textsecure.SenderKeyDistributionMessage.id', index=0,
|
|
- number=1, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='iteration', full_name='textsecure.SenderKeyDistributionMessage.iteration', index=1,
|
|
- number=2, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='chainKey', full_name='textsecure.SenderKeyDistributionMessage.chainKey', index=2,
|
|
- number=3, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='signingKey', full_name='textsecure.SenderKeyDistributionMessage.signingKey', index=3,
|
|
- number=4, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- ],
|
|
- extensions=[
|
|
- ],
|
|
- nested_types=[],
|
|
- enum_types=[
|
|
- ],
|
|
- options=None,
|
|
- is_extendable=False,
|
|
- extension_ranges=[],
|
|
- oneofs=[
|
|
- ],
|
|
- serialized_start=476,
|
|
- serialized_end=575,
|
|
-)
|
|
-
|
|
-DESCRIPTOR.message_types_by_name['WhisperMessage'] = _WHISPERMESSAGE
|
|
-DESCRIPTOR.message_types_by_name['PreKeyWhisperMessage'] = _PREKEYWHISPERMESSAGE
|
|
-DESCRIPTOR.message_types_by_name['KeyExchangeMessage'] = _KEYEXCHANGEMESSAGE
|
|
-DESCRIPTOR.message_types_by_name['SenderKeyMessage'] = _SENDERKEYMESSAGE
|
|
-DESCRIPTOR.message_types_by_name['SenderKeyDistributionMessage'] = _SENDERKEYDISTRIBUTIONMESSAGE
|
|
-
|
|
-WhisperMessage = _reflection.GeneratedProtocolMessageType('WhisperMessage', (_message.Message,), dict(
|
|
- DESCRIPTOR = _WHISPERMESSAGE,
|
|
- __module__ = 'WhisperTextProtocol_pb2'
|
|
- # @@protoc_insertion_point(class_scope:textsecure.WhisperMessage)
|
|
- ))
|
|
-_sym_db.RegisterMessage(WhisperMessage)
|
|
-
|
|
-PreKeyWhisperMessage = _reflection.GeneratedProtocolMessageType('PreKeyWhisperMessage', (_message.Message,), dict(
|
|
- DESCRIPTOR = _PREKEYWHISPERMESSAGE,
|
|
- __module__ = 'WhisperTextProtocol_pb2'
|
|
- # @@protoc_insertion_point(class_scope:textsecure.PreKeyWhisperMessage)
|
|
- ))
|
|
-_sym_db.RegisterMessage(PreKeyWhisperMessage)
|
|
-
|
|
-KeyExchangeMessage = _reflection.GeneratedProtocolMessageType('KeyExchangeMessage', (_message.Message,), dict(
|
|
- DESCRIPTOR = _KEYEXCHANGEMESSAGE,
|
|
- __module__ = 'WhisperTextProtocol_pb2'
|
|
- # @@protoc_insertion_point(class_scope:textsecure.KeyExchangeMessage)
|
|
- ))
|
|
-_sym_db.RegisterMessage(KeyExchangeMessage)
|
|
-
|
|
-SenderKeyMessage = _reflection.GeneratedProtocolMessageType('SenderKeyMessage', (_message.Message,), dict(
|
|
- DESCRIPTOR = _SENDERKEYMESSAGE,
|
|
- __module__ = 'WhisperTextProtocol_pb2'
|
|
- # @@protoc_insertion_point(class_scope:textsecure.SenderKeyMessage)
|
|
- ))
|
|
-_sym_db.RegisterMessage(SenderKeyMessage)
|
|
-
|
|
-SenderKeyDistributionMessage = _reflection.GeneratedProtocolMessageType('SenderKeyDistributionMessage', (_message.Message,), dict(
|
|
- DESCRIPTOR = _SENDERKEYDISTRIBUTIONMESSAGE,
|
|
- __module__ = 'WhisperTextProtocol_pb2'
|
|
- # @@protoc_insertion_point(class_scope:textsecure.SenderKeyDistributionMessage)
|
|
- ))
|
|
-_sym_db.RegisterMessage(SenderKeyDistributionMessage)
|
|
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n*axolotl/protobuf/WhisperTextProtocol.proto\x12\ntextsecure\"b\n\x0eWhisperMessage\x12\x12\n\nratchetKey\x18\x01 \x01(\x0c\x12\x0f\n\x07\x63ounter\x18\x02 \x01(\r\x12\x17\n\x0fpreviousCounter\x18\x03 \x01(\r\x12\x12\n\nciphertext\x18\x04 \x01(\x0c\"\x8f\x01\n\x14PreKeyWhisperMessage\x12\x16\n\x0eregistrationId\x18\x05 \x01(\r\x12\x10\n\x08preKeyId\x18\x01 \x01(\r\x12\x16\n\x0esignedPreKeyId\x18\x06 \x01(\r\x12\x0f\n\x07\x62\x61seKey\x18\x02 \x01(\x0c\x12\x13\n\x0bidentityKey\x18\x03 \x01(\x0c\x12\x0f\n\x07message\x18\x04 \x01(\x0c\"t\n\x12KeyExchangeMessage\x12\n\n\x02id\x18\x01 \x01(\r\x12\x0f\n\x07\x62\x61seKey\x18\x02 \x01(\x0c\x12\x12\n\nratchetKey\x18\x03 \x01(\x0c\x12\x13\n\x0bidentityKey\x18\x04 \x01(\x0c\x12\x18\n\x10\x62\x61seKeySignature\x18\x05 \x01(\x0c\"E\n\x10SenderKeyMessage\x12\n\n\x02id\x18\x01 \x01(\r\x12\x11\n\titeration\x18\x02 \x01(\r\x12\x12\n\nciphertext\x18\x03 \x01(\x0c\"c\n\x1cSenderKeyDistributionMessage\x12\n\n\x02id\x18\x01 \x01(\r\x12\x11\n\titeration\x18\x02 \x01(\r\x12\x10\n\x08\x63hainKey\x18\x03 \x01(\x0c\x12\x12\n\nsigningKey\x18\x04 \x01(\x0c\x42\x37\n&org.whispersystems.libaxolotl.protocolB\rWhisperProtos')
|
|
|
|
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
|
|
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'axolotl.protobuf.WhisperTextProtocol_pb2', globals())
|
|
+if _descriptor._USE_C_DESCRIPTORS == False:
|
|
|
|
-DESCRIPTOR.has_options = True
|
|
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n&org.whispersystems.libaxolotl.protocolB\rWhisperProtos'))
|
|
+ DESCRIPTOR._options = None
|
|
+ DESCRIPTOR._serialized_options = b'\n&org.whispersystems.libaxolotl.protocolB\rWhisperProtos'
|
|
+ _WHISPERMESSAGE._serialized_start=58
|
|
+ _WHISPERMESSAGE._serialized_end=156
|
|
+ _PREKEYWHISPERMESSAGE._serialized_start=159
|
|
+ _PREKEYWHISPERMESSAGE._serialized_end=302
|
|
+ _KEYEXCHANGEMESSAGE._serialized_start=304
|
|
+ _KEYEXCHANGEMESSAGE._serialized_end=420
|
|
+ _SENDERKEYMESSAGE._serialized_start=422
|
|
+ _SENDERKEYMESSAGE._serialized_end=491
|
|
+ _SENDERKEYDISTRIBUTIONMESSAGE._serialized_start=493
|
|
+ _SENDERKEYDISTRIBUTIONMESSAGE._serialized_end=592
|
|
# @@protoc_insertion_point(module_scope)
|
|
diff --git a/axolotl/state/storageprotos_pb2.py b/axolotl/state/storageprotos_pb2.py
|
|
index 20bb325..8454449 100644
|
|
--- a/axolotl/state/storageprotos_pb2.py
|
|
+++ b/axolotl/state/storageprotos_pb2.py
|
|
@@ -1,13 +1,11 @@
|
|
+# -*- coding: utf-8 -*-
|
|
# Generated by the protocol buffer compiler. DO NOT EDIT!
|
|
-# source: LocalStorageProtocol.proto
|
|
-
|
|
-import sys
|
|
-_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
|
|
+# source: axolotl/protobuf/LocalStorageProtocol.proto
|
|
+"""Generated protocol buffer code."""
|
|
+from google.protobuf.internal import builder as _builder
|
|
from google.protobuf import descriptor as _descriptor
|
|
-from google.protobuf import message as _message
|
|
-from google.protobuf import reflection as _reflection
|
|
+from google.protobuf import descriptor_pool as _descriptor_pool
|
|
from google.protobuf import symbol_database as _symbol_database
|
|
-from google.protobuf import descriptor_pb2
|
|
# @@protoc_insertion_point(imports)
|
|
|
|
_sym_db = _symbol_database.Default()
|
|
@@ -15,886 +13,42 @@
|
|
|
|
|
|
|
|
-DESCRIPTOR = _descriptor.FileDescriptor(
|
|
- name='LocalStorageProtocol.proto',
|
|
- package='textsecure',
|
|
- serialized_pb=_b('\n\x1aLocalStorageProtocol.proto\x12\ntextsecure\"\xd3\x08\n\x10SessionStructure\x12\x16\n\x0esessionVersion\x18\x01 \x01(\r\x12\x1b\n\x13localIdentityPublic\x18\x02 \x01(\x0c\x12\x1c\n\x14remoteIdentityPublic\x18\x03 \x01(\x0c\x12\x0f\n\x07rootKey\x18\x04 \x01(\x0c\x12\x17\n\x0fpreviousCounter\x18\x05 \x01(\r\x12\x37\n\x0bsenderChain\x18\x06 \x01(\x0b\x32\".textsecure.SessionStructure.Chain\x12:\n\x0ereceiverChains\x18\x07 \x03(\x0b\x32\".textsecure.SessionStructure.Chain\x12K\n\x12pendingKeyExchange\x18\x08 \x01(\x0b\x32/.textsecure.SessionStructure.PendingKeyExchange\x12\x41\n\rpendingPreKey\x18\t \x01(\x0b\x32*.textsecure.SessionStructure.PendingPreKey\x12\x1c\n\x14remoteRegistrationId\x18\n \x01(\r\x12\x1b\n\x13localRegistrationId\x18\x0b \x01(\r\x12\x14\n\x0cneedsRefresh\x18\x0c \x01(\x08\x12\x14\n\x0c\x61liceBaseKey\x18\r \x01(\x0c\x1a\xb9\x02\n\x05\x43hain\x12\x18\n\x10senderRatchetKey\x18\x01 \x01(\x0c\x12\x1f\n\x17senderRatchetKeyPrivate\x18\x02 \x01(\x0c\x12=\n\x08\x63hainKey\x18\x03 \x01(\x0b\x32+.textsecure.SessionStructure.Chain.ChainKey\x12\x42\n\x0bmessageKeys\x18\x04 \x03(\x0b\x32-.textsecure.SessionStructure.Chain.MessageKey\x1a&\n\x08\x43hainKey\x12\r\n\x05index\x18\x01 \x01(\r\x12\x0b\n\x03key\x18\x02 \x01(\x0c\x1aJ\n\nMessageKey\x12\r\n\x05index\x18\x01 \x01(\r\x12\x11\n\tcipherKey\x18\x02 \x01(\x0c\x12\x0e\n\x06macKey\x18\x03 \x01(\x0c\x12\n\n\x02iv\x18\x04 \x01(\x0c\x1a\xcd\x01\n\x12PendingKeyExchange\x12\x10\n\x08sequence\x18\x01 \x01(\r\x12\x14\n\x0clocalBaseKey\x18\x02 \x01(\x0c\x12\x1b\n\x13localBaseKeyPrivate\x18\x03 \x01(\x0c\x12\x17\n\x0flocalRatchetKey\x18\x04 \x01(\x0c\x12\x1e\n\x16localRatchetKeyPrivate\x18\x05 \x01(\x0c\x12\x18\n\x10localIdentityKey\x18\x07 \x01(\x0c\x12\x1f\n\x17localIdentityKeyPrivate\x18\x08 \x01(\x0c\x1aJ\n\rPendingPreKey\x12\x10\n\x08preKeyId\x18\x01 \x01(\r\x12\x16\n\x0esignedPreKeyId\x18\x03 \x01(\x05\x12\x0f\n\x07\x62\x61seKey\x18\x02 \x01(\x0c\"\x7f\n\x0fRecordStructure\x12\x34\n\x0e\x63urrentSession\x18\x01 \x01(\x0b\x32\x1c.textsecure.SessionStructure\x12\x36\n\x10previousSessions\x18\x02 \x03(\x0b\x32\x1c.textsecure.SessionStructure\"J\n\x15PreKeyRecordStructure\x12\n\n\x02id\x18\x01 \x01(\r\x12\x11\n\tpublicKey\x18\x02 \x01(\x0c\x12\x12\n\nprivateKey\x18\x03 \x01(\x0c\"v\n\x1bSignedPreKeyRecordStructure\x12\n\n\x02id\x18\x01 \x01(\r\x12\x11\n\tpublicKey\x18\x02 \x01(\x0c\x12\x12\n\nprivateKey\x18\x03 \x01(\x0c\x12\x11\n\tsignature\x18\x04 \x01(\x0c\x12\x11\n\ttimestamp\x18\x05 \x01(\x06\"A\n\x18IdentityKeyPairStructure\x12\x11\n\tpublicKey\x18\x01 \x01(\x0c\x12\x12\n\nprivateKey\x18\x02 \x01(\x0c\"\xb8\x03\n\x17SenderKeyStateStructure\x12\x13\n\x0bsenderKeyId\x18\x01 \x01(\r\x12J\n\x0esenderChainKey\x18\x02 \x01(\x0b\x32\x32.textsecure.SenderKeyStateStructure.SenderChainKey\x12N\n\x10senderSigningKey\x18\x03 \x01(\x0b\x32\x34.textsecure.SenderKeyStateStructure.SenderSigningKey\x12O\n\x11senderMessageKeys\x18\x04 \x03(\x0b\x32\x34.textsecure.SenderKeyStateStructure.SenderMessageKey\x1a\x31\n\x0eSenderChainKey\x12\x11\n\titeration\x18\x01 \x01(\r\x12\x0c\n\x04seed\x18\x02 \x01(\x0c\x1a\x33\n\x10SenderMessageKey\x12\x11\n\titeration\x18\x01 \x01(\r\x12\x0c\n\x04seed\x18\x02 \x01(\x0c\x1a\x33\n\x10SenderSigningKey\x12\x0e\n\x06public\x18\x01 \x01(\x0c\x12\x0f\n\x07private\x18\x02 \x01(\x0c\"X\n\x18SenderKeyRecordStructure\x12<\n\x0fsenderKeyStates\x18\x01 \x03(\x0b\x32#.textsecure.SenderKeyStateStructureB4\n#org.whispersystems.libaxolotl.stateB\rStorageProtos')
|
|
-)
|
|
-_sym_db.RegisterFileDescriptor(DESCRIPTOR)
|
|
-
|
|
-
|
|
-
|
|
-
|
|
-_SESSIONSTRUCTURE_CHAIN_CHAINKEY = _descriptor.Descriptor(
|
|
- name='ChainKey',
|
|
- full_name='textsecure.SessionStructure.Chain.ChainKey',
|
|
- filename=None,
|
|
- file=DESCRIPTOR,
|
|
- containing_type=None,
|
|
- fields=[
|
|
- _descriptor.FieldDescriptor(
|
|
- name='index', full_name='textsecure.SessionStructure.Chain.ChainKey.index', index=0,
|
|
- number=1, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='key', full_name='textsecure.SessionStructure.Chain.ChainKey.key', index=1,
|
|
- number=2, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- ],
|
|
- extensions=[
|
|
- ],
|
|
- nested_types=[],
|
|
- enum_types=[
|
|
- ],
|
|
- options=None,
|
|
- is_extendable=False,
|
|
- extension_ranges=[],
|
|
- oneofs=[
|
|
- ],
|
|
- serialized_start=752,
|
|
- serialized_end=790,
|
|
-)
|
|
-
|
|
-_SESSIONSTRUCTURE_CHAIN_MESSAGEKEY = _descriptor.Descriptor(
|
|
- name='MessageKey',
|
|
- full_name='textsecure.SessionStructure.Chain.MessageKey',
|
|
- filename=None,
|
|
- file=DESCRIPTOR,
|
|
- containing_type=None,
|
|
- fields=[
|
|
- _descriptor.FieldDescriptor(
|
|
- name='index', full_name='textsecure.SessionStructure.Chain.MessageKey.index', index=0,
|
|
- number=1, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='cipherKey', full_name='textsecure.SessionStructure.Chain.MessageKey.cipherKey', index=1,
|
|
- number=2, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='macKey', full_name='textsecure.SessionStructure.Chain.MessageKey.macKey', index=2,
|
|
- number=3, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='iv', full_name='textsecure.SessionStructure.Chain.MessageKey.iv', index=3,
|
|
- number=4, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- ],
|
|
- extensions=[
|
|
- ],
|
|
- nested_types=[],
|
|
- enum_types=[
|
|
- ],
|
|
- options=None,
|
|
- is_extendable=False,
|
|
- extension_ranges=[],
|
|
- oneofs=[
|
|
- ],
|
|
- serialized_start=792,
|
|
- serialized_end=866,
|
|
-)
|
|
-
|
|
-_SESSIONSTRUCTURE_CHAIN = _descriptor.Descriptor(
|
|
- name='Chain',
|
|
- full_name='textsecure.SessionStructure.Chain',
|
|
- filename=None,
|
|
- file=DESCRIPTOR,
|
|
- containing_type=None,
|
|
- fields=[
|
|
- _descriptor.FieldDescriptor(
|
|
- name='senderRatchetKey', full_name='textsecure.SessionStructure.Chain.senderRatchetKey', index=0,
|
|
- number=1, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='senderRatchetKeyPrivate', full_name='textsecure.SessionStructure.Chain.senderRatchetKeyPrivate', index=1,
|
|
- number=2, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='chainKey', full_name='textsecure.SessionStructure.Chain.chainKey', index=2,
|
|
- number=3, type=11, cpp_type=10, label=1,
|
|
- has_default_value=False, default_value=None,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='messageKeys', full_name='textsecure.SessionStructure.Chain.messageKeys', index=3,
|
|
- number=4, type=11, cpp_type=10, label=3,
|
|
- has_default_value=False, default_value=[],
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- ],
|
|
- extensions=[
|
|
- ],
|
|
- nested_types=[_SESSIONSTRUCTURE_CHAIN_CHAINKEY, _SESSIONSTRUCTURE_CHAIN_MESSAGEKEY, ],
|
|
- enum_types=[
|
|
- ],
|
|
- options=None,
|
|
- is_extendable=False,
|
|
- extension_ranges=[],
|
|
- oneofs=[
|
|
- ],
|
|
- serialized_start=553,
|
|
- serialized_end=866,
|
|
-)
|
|
-
|
|
-_SESSIONSTRUCTURE_PENDINGKEYEXCHANGE = _descriptor.Descriptor(
|
|
- name='PendingKeyExchange',
|
|
- full_name='textsecure.SessionStructure.PendingKeyExchange',
|
|
- filename=None,
|
|
- file=DESCRIPTOR,
|
|
- containing_type=None,
|
|
- fields=[
|
|
- _descriptor.FieldDescriptor(
|
|
- name='sequence', full_name='textsecure.SessionStructure.PendingKeyExchange.sequence', index=0,
|
|
- number=1, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='localBaseKey', full_name='textsecure.SessionStructure.PendingKeyExchange.localBaseKey', index=1,
|
|
- number=2, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='localBaseKeyPrivate', full_name='textsecure.SessionStructure.PendingKeyExchange.localBaseKeyPrivate', index=2,
|
|
- number=3, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='localRatchetKey', full_name='textsecure.SessionStructure.PendingKeyExchange.localRatchetKey', index=3,
|
|
- number=4, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='localRatchetKeyPrivate', full_name='textsecure.SessionStructure.PendingKeyExchange.localRatchetKeyPrivate', index=4,
|
|
- number=5, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='localIdentityKey', full_name='textsecure.SessionStructure.PendingKeyExchange.localIdentityKey', index=5,
|
|
- number=7, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='localIdentityKeyPrivate', full_name='textsecure.SessionStructure.PendingKeyExchange.localIdentityKeyPrivate', index=6,
|
|
- number=8, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- ],
|
|
- extensions=[
|
|
- ],
|
|
- nested_types=[],
|
|
- enum_types=[
|
|
- ],
|
|
- options=None,
|
|
- is_extendable=False,
|
|
- extension_ranges=[],
|
|
- oneofs=[
|
|
- ],
|
|
- serialized_start=869,
|
|
- serialized_end=1074,
|
|
-)
|
|
-
|
|
-_SESSIONSTRUCTURE_PENDINGPREKEY = _descriptor.Descriptor(
|
|
- name='PendingPreKey',
|
|
- full_name='textsecure.SessionStructure.PendingPreKey',
|
|
- filename=None,
|
|
- file=DESCRIPTOR,
|
|
- containing_type=None,
|
|
- fields=[
|
|
- _descriptor.FieldDescriptor(
|
|
- name='preKeyId', full_name='textsecure.SessionStructure.PendingPreKey.preKeyId', index=0,
|
|
- number=1, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='signedPreKeyId', full_name='textsecure.SessionStructure.PendingPreKey.signedPreKeyId', index=1,
|
|
- number=3, type=5, cpp_type=1, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='baseKey', full_name='textsecure.SessionStructure.PendingPreKey.baseKey', index=2,
|
|
- number=2, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- ],
|
|
- extensions=[
|
|
- ],
|
|
- nested_types=[],
|
|
- enum_types=[
|
|
- ],
|
|
- options=None,
|
|
- is_extendable=False,
|
|
- extension_ranges=[],
|
|
- oneofs=[
|
|
- ],
|
|
- serialized_start=1076,
|
|
- serialized_end=1150,
|
|
-)
|
|
-
|
|
-_SESSIONSTRUCTURE = _descriptor.Descriptor(
|
|
- name='SessionStructure',
|
|
- full_name='textsecure.SessionStructure',
|
|
- filename=None,
|
|
- file=DESCRIPTOR,
|
|
- containing_type=None,
|
|
- fields=[
|
|
- _descriptor.FieldDescriptor(
|
|
- name='sessionVersion', full_name='textsecure.SessionStructure.sessionVersion', index=0,
|
|
- number=1, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='localIdentityPublic', full_name='textsecure.SessionStructure.localIdentityPublic', index=1,
|
|
- number=2, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='remoteIdentityPublic', full_name='textsecure.SessionStructure.remoteIdentityPublic', index=2,
|
|
- number=3, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='rootKey', full_name='textsecure.SessionStructure.rootKey', index=3,
|
|
- number=4, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='previousCounter', full_name='textsecure.SessionStructure.previousCounter', index=4,
|
|
- number=5, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='senderChain', full_name='textsecure.SessionStructure.senderChain', index=5,
|
|
- number=6, type=11, cpp_type=10, label=1,
|
|
- has_default_value=False, default_value=None,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='receiverChains', full_name='textsecure.SessionStructure.receiverChains', index=6,
|
|
- number=7, type=11, cpp_type=10, label=3,
|
|
- has_default_value=False, default_value=[],
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='pendingKeyExchange', full_name='textsecure.SessionStructure.pendingKeyExchange', index=7,
|
|
- number=8, type=11, cpp_type=10, label=1,
|
|
- has_default_value=False, default_value=None,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='pendingPreKey', full_name='textsecure.SessionStructure.pendingPreKey', index=8,
|
|
- number=9, type=11, cpp_type=10, label=1,
|
|
- has_default_value=False, default_value=None,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='remoteRegistrationId', full_name='textsecure.SessionStructure.remoteRegistrationId', index=9,
|
|
- number=10, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='localRegistrationId', full_name='textsecure.SessionStructure.localRegistrationId', index=10,
|
|
- number=11, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='needsRefresh', full_name='textsecure.SessionStructure.needsRefresh', index=11,
|
|
- number=12, type=8, cpp_type=7, label=1,
|
|
- has_default_value=False, default_value=False,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='aliceBaseKey', full_name='textsecure.SessionStructure.aliceBaseKey', index=12,
|
|
- number=13, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- ],
|
|
- extensions=[
|
|
- ],
|
|
- nested_types=[_SESSIONSTRUCTURE_CHAIN, _SESSIONSTRUCTURE_PENDINGKEYEXCHANGE, _SESSIONSTRUCTURE_PENDINGPREKEY, ],
|
|
- enum_types=[
|
|
- ],
|
|
- options=None,
|
|
- is_extendable=False,
|
|
- extension_ranges=[],
|
|
- oneofs=[
|
|
- ],
|
|
- serialized_start=43,
|
|
- serialized_end=1150,
|
|
-)
|
|
-
|
|
-
|
|
-_RECORDSTRUCTURE = _descriptor.Descriptor(
|
|
- name='RecordStructure',
|
|
- full_name='textsecure.RecordStructure',
|
|
- filename=None,
|
|
- file=DESCRIPTOR,
|
|
- containing_type=None,
|
|
- fields=[
|
|
- _descriptor.FieldDescriptor(
|
|
- name='currentSession', full_name='textsecure.RecordStructure.currentSession', index=0,
|
|
- number=1, type=11, cpp_type=10, label=1,
|
|
- has_default_value=False, default_value=None,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='previousSessions', full_name='textsecure.RecordStructure.previousSessions', index=1,
|
|
- number=2, type=11, cpp_type=10, label=3,
|
|
- has_default_value=False, default_value=[],
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- ],
|
|
- extensions=[
|
|
- ],
|
|
- nested_types=[],
|
|
- enum_types=[
|
|
- ],
|
|
- options=None,
|
|
- is_extendable=False,
|
|
- extension_ranges=[],
|
|
- oneofs=[
|
|
- ],
|
|
- serialized_start=1152,
|
|
- serialized_end=1279,
|
|
-)
|
|
-
|
|
-
|
|
-_PREKEYRECORDSTRUCTURE = _descriptor.Descriptor(
|
|
- name='PreKeyRecordStructure',
|
|
- full_name='textsecure.PreKeyRecordStructure',
|
|
- filename=None,
|
|
- file=DESCRIPTOR,
|
|
- containing_type=None,
|
|
- fields=[
|
|
- _descriptor.FieldDescriptor(
|
|
- name='id', full_name='textsecure.PreKeyRecordStructure.id', index=0,
|
|
- number=1, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='publicKey', full_name='textsecure.PreKeyRecordStructure.publicKey', index=1,
|
|
- number=2, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='privateKey', full_name='textsecure.PreKeyRecordStructure.privateKey', index=2,
|
|
- number=3, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- ],
|
|
- extensions=[
|
|
- ],
|
|
- nested_types=[],
|
|
- enum_types=[
|
|
- ],
|
|
- options=None,
|
|
- is_extendable=False,
|
|
- extension_ranges=[],
|
|
- oneofs=[
|
|
- ],
|
|
- serialized_start=1281,
|
|
- serialized_end=1355,
|
|
-)
|
|
-
|
|
-
|
|
-_SIGNEDPREKEYRECORDSTRUCTURE = _descriptor.Descriptor(
|
|
- name='SignedPreKeyRecordStructure',
|
|
- full_name='textsecure.SignedPreKeyRecordStructure',
|
|
- filename=None,
|
|
- file=DESCRIPTOR,
|
|
- containing_type=None,
|
|
- fields=[
|
|
- _descriptor.FieldDescriptor(
|
|
- name='id', full_name='textsecure.SignedPreKeyRecordStructure.id', index=0,
|
|
- number=1, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='publicKey', full_name='textsecure.SignedPreKeyRecordStructure.publicKey', index=1,
|
|
- number=2, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='privateKey', full_name='textsecure.SignedPreKeyRecordStructure.privateKey', index=2,
|
|
- number=3, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='signature', full_name='textsecure.SignedPreKeyRecordStructure.signature', index=3,
|
|
- number=4, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='timestamp', full_name='textsecure.SignedPreKeyRecordStructure.timestamp', index=4,
|
|
- number=5, type=6, cpp_type=4, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- ],
|
|
- extensions=[
|
|
- ],
|
|
- nested_types=[],
|
|
- enum_types=[
|
|
- ],
|
|
- options=None,
|
|
- is_extendable=False,
|
|
- extension_ranges=[],
|
|
- oneofs=[
|
|
- ],
|
|
- serialized_start=1357,
|
|
- serialized_end=1475,
|
|
-)
|
|
-
|
|
-
|
|
-_IDENTITYKEYPAIRSTRUCTURE = _descriptor.Descriptor(
|
|
- name='IdentityKeyPairStructure',
|
|
- full_name='textsecure.IdentityKeyPairStructure',
|
|
- filename=None,
|
|
- file=DESCRIPTOR,
|
|
- containing_type=None,
|
|
- fields=[
|
|
- _descriptor.FieldDescriptor(
|
|
- name='publicKey', full_name='textsecure.IdentityKeyPairStructure.publicKey', index=0,
|
|
- number=1, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='privateKey', full_name='textsecure.IdentityKeyPairStructure.privateKey', index=1,
|
|
- number=2, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- ],
|
|
- extensions=[
|
|
- ],
|
|
- nested_types=[],
|
|
- enum_types=[
|
|
- ],
|
|
- options=None,
|
|
- is_extendable=False,
|
|
- extension_ranges=[],
|
|
- oneofs=[
|
|
- ],
|
|
- serialized_start=1477,
|
|
- serialized_end=1542,
|
|
-)
|
|
-
|
|
-
|
|
-_SENDERKEYSTATESTRUCTURE_SENDERCHAINKEY = _descriptor.Descriptor(
|
|
- name='SenderChainKey',
|
|
- full_name='textsecure.SenderKeyStateStructure.SenderChainKey',
|
|
- filename=None,
|
|
- file=DESCRIPTOR,
|
|
- containing_type=None,
|
|
- fields=[
|
|
- _descriptor.FieldDescriptor(
|
|
- name='iteration', full_name='textsecure.SenderKeyStateStructure.SenderChainKey.iteration', index=0,
|
|
- number=1, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='seed', full_name='textsecure.SenderKeyStateStructure.SenderChainKey.seed', index=1,
|
|
- number=2, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- ],
|
|
- extensions=[
|
|
- ],
|
|
- nested_types=[],
|
|
- enum_types=[
|
|
- ],
|
|
- options=None,
|
|
- is_extendable=False,
|
|
- extension_ranges=[],
|
|
- oneofs=[
|
|
- ],
|
|
- serialized_start=1830,
|
|
- serialized_end=1879,
|
|
-)
|
|
-
|
|
-_SENDERKEYSTATESTRUCTURE_SENDERMESSAGEKEY = _descriptor.Descriptor(
|
|
- name='SenderMessageKey',
|
|
- full_name='textsecure.SenderKeyStateStructure.SenderMessageKey',
|
|
- filename=None,
|
|
- file=DESCRIPTOR,
|
|
- containing_type=None,
|
|
- fields=[
|
|
- _descriptor.FieldDescriptor(
|
|
- name='iteration', full_name='textsecure.SenderKeyStateStructure.SenderMessageKey.iteration', index=0,
|
|
- number=1, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='seed', full_name='textsecure.SenderKeyStateStructure.SenderMessageKey.seed', index=1,
|
|
- number=2, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- ],
|
|
- extensions=[
|
|
- ],
|
|
- nested_types=[],
|
|
- enum_types=[
|
|
- ],
|
|
- options=None,
|
|
- is_extendable=False,
|
|
- extension_ranges=[],
|
|
- oneofs=[
|
|
- ],
|
|
- serialized_start=1881,
|
|
- serialized_end=1932,
|
|
-)
|
|
-
|
|
-_SENDERKEYSTATESTRUCTURE_SENDERSIGNINGKEY = _descriptor.Descriptor(
|
|
- name='SenderSigningKey',
|
|
- full_name='textsecure.SenderKeyStateStructure.SenderSigningKey',
|
|
- filename=None,
|
|
- file=DESCRIPTOR,
|
|
- containing_type=None,
|
|
- fields=[
|
|
- _descriptor.FieldDescriptor(
|
|
- name='public', full_name='textsecure.SenderKeyStateStructure.SenderSigningKey.public', index=0,
|
|
- number=1, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='private', full_name='textsecure.SenderKeyStateStructure.SenderSigningKey.private', index=1,
|
|
- number=2, type=12, cpp_type=9, label=1,
|
|
- has_default_value=False, default_value=_b(""),
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- ],
|
|
- extensions=[
|
|
- ],
|
|
- nested_types=[],
|
|
- enum_types=[
|
|
- ],
|
|
- options=None,
|
|
- is_extendable=False,
|
|
- extension_ranges=[],
|
|
- oneofs=[
|
|
- ],
|
|
- serialized_start=1934,
|
|
- serialized_end=1985,
|
|
-)
|
|
-
|
|
-_SENDERKEYSTATESTRUCTURE = _descriptor.Descriptor(
|
|
- name='SenderKeyStateStructure',
|
|
- full_name='textsecure.SenderKeyStateStructure',
|
|
- filename=None,
|
|
- file=DESCRIPTOR,
|
|
- containing_type=None,
|
|
- fields=[
|
|
- _descriptor.FieldDescriptor(
|
|
- name='senderKeyId', full_name='textsecure.SenderKeyStateStructure.senderKeyId', index=0,
|
|
- number=1, type=13, cpp_type=3, label=1,
|
|
- has_default_value=False, default_value=0,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='senderChainKey', full_name='textsecure.SenderKeyStateStructure.senderChainKey', index=1,
|
|
- number=2, type=11, cpp_type=10, label=1,
|
|
- has_default_value=False, default_value=None,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='senderSigningKey', full_name='textsecure.SenderKeyStateStructure.senderSigningKey', index=2,
|
|
- number=3, type=11, cpp_type=10, label=1,
|
|
- has_default_value=False, default_value=None,
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- _descriptor.FieldDescriptor(
|
|
- name='senderMessageKeys', full_name='textsecure.SenderKeyStateStructure.senderMessageKeys', index=3,
|
|
- number=4, type=11, cpp_type=10, label=3,
|
|
- has_default_value=False, default_value=[],
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- ],
|
|
- extensions=[
|
|
- ],
|
|
- nested_types=[_SENDERKEYSTATESTRUCTURE_SENDERCHAINKEY, _SENDERKEYSTATESTRUCTURE_SENDERMESSAGEKEY, _SENDERKEYSTATESTRUCTURE_SENDERSIGNINGKEY, ],
|
|
- enum_types=[
|
|
- ],
|
|
- options=None,
|
|
- is_extendable=False,
|
|
- extension_ranges=[],
|
|
- oneofs=[
|
|
- ],
|
|
- serialized_start=1545,
|
|
- serialized_end=1985,
|
|
-)
|
|
-
|
|
-
|
|
-_SENDERKEYRECORDSTRUCTURE = _descriptor.Descriptor(
|
|
- name='SenderKeyRecordStructure',
|
|
- full_name='textsecure.SenderKeyRecordStructure',
|
|
- filename=None,
|
|
- file=DESCRIPTOR,
|
|
- containing_type=None,
|
|
- fields=[
|
|
- _descriptor.FieldDescriptor(
|
|
- name='senderKeyStates', full_name='textsecure.SenderKeyRecordStructure.senderKeyStates', index=0,
|
|
- number=1, type=11, cpp_type=10, label=3,
|
|
- has_default_value=False, default_value=[],
|
|
- message_type=None, enum_type=None, containing_type=None,
|
|
- is_extension=False, extension_scope=None,
|
|
- options=None),
|
|
- ],
|
|
- extensions=[
|
|
- ],
|
|
- nested_types=[],
|
|
- enum_types=[
|
|
- ],
|
|
- options=None,
|
|
- is_extendable=False,
|
|
- extension_ranges=[],
|
|
- oneofs=[
|
|
- ],
|
|
- serialized_start=1987,
|
|
- serialized_end=2075,
|
|
-)
|
|
-
|
|
-_SESSIONSTRUCTURE_CHAIN_CHAINKEY.containing_type = _SESSIONSTRUCTURE_CHAIN
|
|
-_SESSIONSTRUCTURE_CHAIN_MESSAGEKEY.containing_type = _SESSIONSTRUCTURE_CHAIN
|
|
-_SESSIONSTRUCTURE_CHAIN.fields_by_name['chainKey'].message_type = _SESSIONSTRUCTURE_CHAIN_CHAINKEY
|
|
-_SESSIONSTRUCTURE_CHAIN.fields_by_name['messageKeys'].message_type = _SESSIONSTRUCTURE_CHAIN_MESSAGEKEY
|
|
-_SESSIONSTRUCTURE_CHAIN.containing_type = _SESSIONSTRUCTURE
|
|
-_SESSIONSTRUCTURE_PENDINGKEYEXCHANGE.containing_type = _SESSIONSTRUCTURE
|
|
-_SESSIONSTRUCTURE_PENDINGPREKEY.containing_type = _SESSIONSTRUCTURE
|
|
-_SESSIONSTRUCTURE.fields_by_name['senderChain'].message_type = _SESSIONSTRUCTURE_CHAIN
|
|
-_SESSIONSTRUCTURE.fields_by_name['receiverChains'].message_type = _SESSIONSTRUCTURE_CHAIN
|
|
-_SESSIONSTRUCTURE.fields_by_name['pendingKeyExchange'].message_type = _SESSIONSTRUCTURE_PENDINGKEYEXCHANGE
|
|
-_SESSIONSTRUCTURE.fields_by_name['pendingPreKey'].message_type = _SESSIONSTRUCTURE_PENDINGPREKEY
|
|
-_RECORDSTRUCTURE.fields_by_name['currentSession'].message_type = _SESSIONSTRUCTURE
|
|
-_RECORDSTRUCTURE.fields_by_name['previousSessions'].message_type = _SESSIONSTRUCTURE
|
|
-_SENDERKEYSTATESTRUCTURE_SENDERCHAINKEY.containing_type = _SENDERKEYSTATESTRUCTURE
|
|
-_SENDERKEYSTATESTRUCTURE_SENDERMESSAGEKEY.containing_type = _SENDERKEYSTATESTRUCTURE
|
|
-_SENDERKEYSTATESTRUCTURE_SENDERSIGNINGKEY.containing_type = _SENDERKEYSTATESTRUCTURE
|
|
-_SENDERKEYSTATESTRUCTURE.fields_by_name['senderChainKey'].message_type = _SENDERKEYSTATESTRUCTURE_SENDERCHAINKEY
|
|
-_SENDERKEYSTATESTRUCTURE.fields_by_name['senderSigningKey'].message_type = _SENDERKEYSTATESTRUCTURE_SENDERSIGNINGKEY
|
|
-_SENDERKEYSTATESTRUCTURE.fields_by_name['senderMessageKeys'].message_type = _SENDERKEYSTATESTRUCTURE_SENDERMESSAGEKEY
|
|
-_SENDERKEYRECORDSTRUCTURE.fields_by_name['senderKeyStates'].message_type = _SENDERKEYSTATESTRUCTURE
|
|
-DESCRIPTOR.message_types_by_name['SessionStructure'] = _SESSIONSTRUCTURE
|
|
-DESCRIPTOR.message_types_by_name['RecordStructure'] = _RECORDSTRUCTURE
|
|
-DESCRIPTOR.message_types_by_name['PreKeyRecordStructure'] = _PREKEYRECORDSTRUCTURE
|
|
-DESCRIPTOR.message_types_by_name['SignedPreKeyRecordStructure'] = _SIGNEDPREKEYRECORDSTRUCTURE
|
|
-DESCRIPTOR.message_types_by_name['IdentityKeyPairStructure'] = _IDENTITYKEYPAIRSTRUCTURE
|
|
-DESCRIPTOR.message_types_by_name['SenderKeyStateStructure'] = _SENDERKEYSTATESTRUCTURE
|
|
-DESCRIPTOR.message_types_by_name['SenderKeyRecordStructure'] = _SENDERKEYRECORDSTRUCTURE
|
|
-
|
|
-SessionStructure = _reflection.GeneratedProtocolMessageType('SessionStructure', (_message.Message,), dict(
|
|
-
|
|
- Chain = _reflection.GeneratedProtocolMessageType('Chain', (_message.Message,), dict(
|
|
-
|
|
- ChainKey = _reflection.GeneratedProtocolMessageType('ChainKey', (_message.Message,), dict(
|
|
- DESCRIPTOR = _SESSIONSTRUCTURE_CHAIN_CHAINKEY,
|
|
- __module__ = 'LocalStorageProtocol_pb2'
|
|
- # @@protoc_insertion_point(class_scope:textsecure.SessionStructure.Chain.ChainKey)
|
|
- ))
|
|
- ,
|
|
-
|
|
- MessageKey = _reflection.GeneratedProtocolMessageType('MessageKey', (_message.Message,), dict(
|
|
- DESCRIPTOR = _SESSIONSTRUCTURE_CHAIN_MESSAGEKEY,
|
|
- __module__ = 'LocalStorageProtocol_pb2'
|
|
- # @@protoc_insertion_point(class_scope:textsecure.SessionStructure.Chain.MessageKey)
|
|
- ))
|
|
- ,
|
|
- DESCRIPTOR = _SESSIONSTRUCTURE_CHAIN,
|
|
- __module__ = 'LocalStorageProtocol_pb2'
|
|
- # @@protoc_insertion_point(class_scope:textsecure.SessionStructure.Chain)
|
|
- ))
|
|
- ,
|
|
-
|
|
- PendingKeyExchange = _reflection.GeneratedProtocolMessageType('PendingKeyExchange', (_message.Message,), dict(
|
|
- DESCRIPTOR = _SESSIONSTRUCTURE_PENDINGKEYEXCHANGE,
|
|
- __module__ = 'LocalStorageProtocol_pb2'
|
|
- # @@protoc_insertion_point(class_scope:textsecure.SessionStructure.PendingKeyExchange)
|
|
- ))
|
|
- ,
|
|
-
|
|
- PendingPreKey = _reflection.GeneratedProtocolMessageType('PendingPreKey', (_message.Message,), dict(
|
|
- DESCRIPTOR = _SESSIONSTRUCTURE_PENDINGPREKEY,
|
|
- __module__ = 'LocalStorageProtocol_pb2'
|
|
- # @@protoc_insertion_point(class_scope:textsecure.SessionStructure.PendingPreKey)
|
|
- ))
|
|
- ,
|
|
- DESCRIPTOR = _SESSIONSTRUCTURE,
|
|
- __module__ = 'LocalStorageProtocol_pb2'
|
|
- # @@protoc_insertion_point(class_scope:textsecure.SessionStructure)
|
|
- ))
|
|
-_sym_db.RegisterMessage(SessionStructure)
|
|
-_sym_db.RegisterMessage(SessionStructure.Chain)
|
|
-_sym_db.RegisterMessage(SessionStructure.Chain.ChainKey)
|
|
-_sym_db.RegisterMessage(SessionStructure.Chain.MessageKey)
|
|
-_sym_db.RegisterMessage(SessionStructure.PendingKeyExchange)
|
|
-_sym_db.RegisterMessage(SessionStructure.PendingPreKey)
|
|
-
|
|
-RecordStructure = _reflection.GeneratedProtocolMessageType('RecordStructure', (_message.Message,), dict(
|
|
- DESCRIPTOR = _RECORDSTRUCTURE,
|
|
- __module__ = 'LocalStorageProtocol_pb2'
|
|
- # @@protoc_insertion_point(class_scope:textsecure.RecordStructure)
|
|
- ))
|
|
-_sym_db.RegisterMessage(RecordStructure)
|
|
-
|
|
-PreKeyRecordStructure = _reflection.GeneratedProtocolMessageType('PreKeyRecordStructure', (_message.Message,), dict(
|
|
- DESCRIPTOR = _PREKEYRECORDSTRUCTURE,
|
|
- __module__ = 'LocalStorageProtocol_pb2'
|
|
- # @@protoc_insertion_point(class_scope:textsecure.PreKeyRecordStructure)
|
|
- ))
|
|
-_sym_db.RegisterMessage(PreKeyRecordStructure)
|
|
-
|
|
-SignedPreKeyRecordStructure = _reflection.GeneratedProtocolMessageType('SignedPreKeyRecordStructure', (_message.Message,), dict(
|
|
- DESCRIPTOR = _SIGNEDPREKEYRECORDSTRUCTURE,
|
|
- __module__ = 'LocalStorageProtocol_pb2'
|
|
- # @@protoc_insertion_point(class_scope:textsecure.SignedPreKeyRecordStructure)
|
|
- ))
|
|
-_sym_db.RegisterMessage(SignedPreKeyRecordStructure)
|
|
-
|
|
-IdentityKeyPairStructure = _reflection.GeneratedProtocolMessageType('IdentityKeyPairStructure', (_message.Message,), dict(
|
|
- DESCRIPTOR = _IDENTITYKEYPAIRSTRUCTURE,
|
|
- __module__ = 'LocalStorageProtocol_pb2'
|
|
- # @@protoc_insertion_point(class_scope:textsecure.IdentityKeyPairStructure)
|
|
- ))
|
|
-_sym_db.RegisterMessage(IdentityKeyPairStructure)
|
|
-
|
|
-SenderKeyStateStructure = _reflection.GeneratedProtocolMessageType('SenderKeyStateStructure', (_message.Message,), dict(
|
|
-
|
|
- SenderChainKey = _reflection.GeneratedProtocolMessageType('SenderChainKey', (_message.Message,), dict(
|
|
- DESCRIPTOR = _SENDERKEYSTATESTRUCTURE_SENDERCHAINKEY,
|
|
- __module__ = 'LocalStorageProtocol_pb2'
|
|
- # @@protoc_insertion_point(class_scope:textsecure.SenderKeyStateStructure.SenderChainKey)
|
|
- ))
|
|
- ,
|
|
-
|
|
- SenderMessageKey = _reflection.GeneratedProtocolMessageType('SenderMessageKey', (_message.Message,), dict(
|
|
- DESCRIPTOR = _SENDERKEYSTATESTRUCTURE_SENDERMESSAGEKEY,
|
|
- __module__ = 'LocalStorageProtocol_pb2'
|
|
- # @@protoc_insertion_point(class_scope:textsecure.SenderKeyStateStructure.SenderMessageKey)
|
|
- ))
|
|
- ,
|
|
-
|
|
- SenderSigningKey = _reflection.GeneratedProtocolMessageType('SenderSigningKey', (_message.Message,), dict(
|
|
- DESCRIPTOR = _SENDERKEYSTATESTRUCTURE_SENDERSIGNINGKEY,
|
|
- __module__ = 'LocalStorageProtocol_pb2'
|
|
- # @@protoc_insertion_point(class_scope:textsecure.SenderKeyStateStructure.SenderSigningKey)
|
|
- ))
|
|
- ,
|
|
- DESCRIPTOR = _SENDERKEYSTATESTRUCTURE,
|
|
- __module__ = 'LocalStorageProtocol_pb2'
|
|
- # @@protoc_insertion_point(class_scope:textsecure.SenderKeyStateStructure)
|
|
- ))
|
|
-_sym_db.RegisterMessage(SenderKeyStateStructure)
|
|
-_sym_db.RegisterMessage(SenderKeyStateStructure.SenderChainKey)
|
|
-_sym_db.RegisterMessage(SenderKeyStateStructure.SenderMessageKey)
|
|
-_sym_db.RegisterMessage(SenderKeyStateStructure.SenderSigningKey)
|
|
-
|
|
-SenderKeyRecordStructure = _reflection.GeneratedProtocolMessageType('SenderKeyRecordStructure', (_message.Message,), dict(
|
|
- DESCRIPTOR = _SENDERKEYRECORDSTRUCTURE,
|
|
- __module__ = 'LocalStorageProtocol_pb2'
|
|
- # @@protoc_insertion_point(class_scope:textsecure.SenderKeyRecordStructure)
|
|
- ))
|
|
-_sym_db.RegisterMessage(SenderKeyRecordStructure)
|
|
-
|
|
-
|
|
-DESCRIPTOR.has_options = True
|
|
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n#org.whispersystems.libaxolotl.stateB\rStorageProtos'))
|
|
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n+axolotl/protobuf/LocalStorageProtocol.proto\x12\ntextsecure\"\xd3\x08\n\x10SessionStructure\x12\x16\n\x0esessionVersion\x18\x01 \x01(\r\x12\x1b\n\x13localIdentityPublic\x18\x02 \x01(\x0c\x12\x1c\n\x14remoteIdentityPublic\x18\x03 \x01(\x0c\x12\x0f\n\x07rootKey\x18\x04 \x01(\x0c\x12\x17\n\x0fpreviousCounter\x18\x05 \x01(\r\x12\x37\n\x0bsenderChain\x18\x06 \x01(\x0b\x32\".textsecure.SessionStructure.Chain\x12:\n\x0ereceiverChains\x18\x07 \x03(\x0b\x32\".textsecure.SessionStructure.Chain\x12K\n\x12pendingKeyExchange\x18\x08 \x01(\x0b\x32/.textsecure.SessionStructure.PendingKeyExchange\x12\x41\n\rpendingPreKey\x18\t \x01(\x0b\x32*.textsecure.SessionStructure.PendingPreKey\x12\x1c\n\x14remoteRegistrationId\x18\n \x01(\r\x12\x1b\n\x13localRegistrationId\x18\x0b \x01(\r\x12\x14\n\x0cneedsRefresh\x18\x0c \x01(\x08\x12\x14\n\x0c\x61liceBaseKey\x18\r \x01(\x0c\x1a\xb9\x02\n\x05\x43hain\x12\x18\n\x10senderRatchetKey\x18\x01 \x01(\x0c\x12\x1f\n\x17senderRatchetKeyPrivate\x18\x02 \x01(\x0c\x12=\n\x08\x63hainKey\x18\x03 \x01(\x0b\x32+.textsecure.SessionStructure.Chain.ChainKey\x12\x42\n\x0bmessageKeys\x18\x04 \x03(\x0b\x32-.textsecure.SessionStructure.Chain.MessageKey\x1a&\n\x08\x43hainKey\x12\r\n\x05index\x18\x01 \x01(\r\x12\x0b\n\x03key\x18\x02 \x01(\x0c\x1aJ\n\nMessageKey\x12\r\n\x05index\x18\x01 \x01(\r\x12\x11\n\tcipherKey\x18\x02 \x01(\x0c\x12\x0e\n\x06macKey\x18\x03 \x01(\x0c\x12\n\n\x02iv\x18\x04 \x01(\x0c\x1a\xcd\x01\n\x12PendingKeyExchange\x12\x10\n\x08sequence\x18\x01 \x01(\r\x12\x14\n\x0clocalBaseKey\x18\x02 \x01(\x0c\x12\x1b\n\x13localBaseKeyPrivate\x18\x03 \x01(\x0c\x12\x17\n\x0flocalRatchetKey\x18\x04 \x01(\x0c\x12\x1e\n\x16localRatchetKeyPrivate\x18\x05 \x01(\x0c\x12\x18\n\x10localIdentityKey\x18\x07 \x01(\x0c\x12\x1f\n\x17localIdentityKeyPrivate\x18\x08 \x01(\x0c\x1aJ\n\rPendingPreKey\x12\x10\n\x08preKeyId\x18\x01 \x01(\r\x12\x16\n\x0esignedPreKeyId\x18\x03 \x01(\x05\x12\x0f\n\x07\x62\x61seKey\x18\x02 \x01(\x0c\"\x7f\n\x0fRecordStructure\x12\x34\n\x0e\x63urrentSession\x18\x01 \x01(\x0b\x32\x1c.textsecure.SessionStructure\x12\x36\n\x10previousSessions\x18\x02 \x03(\x0b\x32\x1c.textsecure.SessionStructure\"J\n\x15PreKeyRecordStructure\x12\n\n\x02id\x18\x01 \x01(\r\x12\x11\n\tpublicKey\x18\x02 \x01(\x0c\x12\x12\n\nprivateKey\x18\x03 \x01(\x0c\"v\n\x1bSignedPreKeyRecordStructure\x12\n\n\x02id\x18\x01 \x01(\r\x12\x11\n\tpublicKey\x18\x02 \x01(\x0c\x12\x12\n\nprivateKey\x18\x03 \x01(\x0c\x12\x11\n\tsignature\x18\x04 \x01(\x0c\x12\x11\n\ttimestamp\x18\x05 \x01(\x06\"A\n\x18IdentityKeyPairStructure\x12\x11\n\tpublicKey\x18\x01 \x01(\x0c\x12\x12\n\nprivateKey\x18\x02 \x01(\x0c\"\xb8\x03\n\x17SenderKeyStateStructure\x12\x13\n\x0bsenderKeyId\x18\x01 \x01(\r\x12J\n\x0esenderChainKey\x18\x02 \x01(\x0b\x32\x32.textsecure.SenderKeyStateStructure.SenderChainKey\x12N\n\x10senderSigningKey\x18\x03 \x01(\x0b\x32\x34.textsecure.SenderKeyStateStructure.SenderSigningKey\x12O\n\x11senderMessageKeys\x18\x04 \x03(\x0b\x32\x34.textsecure.SenderKeyStateStructure.SenderMessageKey\x1a\x31\n\x0eSenderChainKey\x12\x11\n\titeration\x18\x01 \x01(\r\x12\x0c\n\x04seed\x18\x02 \x01(\x0c\x1a\x33\n\x10SenderMessageKey\x12\x11\n\titeration\x18\x01 \x01(\r\x12\x0c\n\x04seed\x18\x02 \x01(\x0c\x1a\x33\n\x10SenderSigningKey\x12\x0e\n\x06public\x18\x01 \x01(\x0c\x12\x0f\n\x07private\x18\x02 \x01(\x0c\"X\n\x18SenderKeyRecordStructure\x12<\n\x0fsenderKeyStates\x18\x01 \x03(\x0b\x32#.textsecure.SenderKeyStateStructureB4\n#org.whispersystems.libaxolotl.stateB\rStorageProtos')
|
|
+
|
|
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
|
|
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'axolotl.protobuf.LocalStorageProtocol_pb2', globals())
|
|
+if _descriptor._USE_C_DESCRIPTORS == False:
|
|
+
|
|
+ DESCRIPTOR._options = None
|
|
+ DESCRIPTOR._serialized_options = b'\n#org.whispersystems.libaxolotl.stateB\rStorageProtos'
|
|
+ _SESSIONSTRUCTURE._serialized_start=60
|
|
+ _SESSIONSTRUCTURE._serialized_end=1167
|
|
+ _SESSIONSTRUCTURE_CHAIN._serialized_start=570
|
|
+ _SESSIONSTRUCTURE_CHAIN._serialized_end=883
|
|
+ _SESSIONSTRUCTURE_CHAIN_CHAINKEY._serialized_start=769
|
|
+ _SESSIONSTRUCTURE_CHAIN_CHAINKEY._serialized_end=807
|
|
+ _SESSIONSTRUCTURE_CHAIN_MESSAGEKEY._serialized_start=809
|
|
+ _SESSIONSTRUCTURE_CHAIN_MESSAGEKEY._serialized_end=883
|
|
+ _SESSIONSTRUCTURE_PENDINGKEYEXCHANGE._serialized_start=886
|
|
+ _SESSIONSTRUCTURE_PENDINGKEYEXCHANGE._serialized_end=1091
|
|
+ _SESSIONSTRUCTURE_PENDINGPREKEY._serialized_start=1093
|
|
+ _SESSIONSTRUCTURE_PENDINGPREKEY._serialized_end=1167
|
|
+ _RECORDSTRUCTURE._serialized_start=1169
|
|
+ _RECORDSTRUCTURE._serialized_end=1296
|
|
+ _PREKEYRECORDSTRUCTURE._serialized_start=1298
|
|
+ _PREKEYRECORDSTRUCTURE._serialized_end=1372
|
|
+ _SIGNEDPREKEYRECORDSTRUCTURE._serialized_start=1374
|
|
+ _SIGNEDPREKEYRECORDSTRUCTURE._serialized_end=1492
|
|
+ _IDENTITYKEYPAIRSTRUCTURE._serialized_start=1494
|
|
+ _IDENTITYKEYPAIRSTRUCTURE._serialized_end=1559
|
|
+ _SENDERKEYSTATESTRUCTURE._serialized_start=1562
|
|
+ _SENDERKEYSTATESTRUCTURE._serialized_end=2002
|
|
+ _SENDERKEYSTATESTRUCTURE_SENDERCHAINKEY._serialized_start=1847
|
|
+ _SENDERKEYSTATESTRUCTURE_SENDERCHAINKEY._serialized_end=1896
|
|
+ _SENDERKEYSTATESTRUCTURE_SENDERMESSAGEKEY._serialized_start=1898
|
|
+ _SENDERKEYSTATESTRUCTURE_SENDERMESSAGEKEY._serialized_end=1949
|
|
+ _SENDERKEYSTATESTRUCTURE_SENDERSIGNINGKEY._serialized_start=1951
|
|
+ _SENDERKEYSTATESTRUCTURE_SENDERSIGNINGKEY._serialized_end=2002
|
|
+ _SENDERKEYRECORDSTRUCTURE._serialized_start=2004
|
|
+ _SENDERKEYRECORDSTRUCTURE._serialized_end=2092
|
|
# @@protoc_insertion_point(module_scope)
|
|
diff --git a/setup.py b/setup.py
|
|
index 1207794..db186dd 100644
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -5,7 +5,7 @@
|
|
import axolotl
|
|
from setuptools import find_packages, setup
|
|
|
|
-deps = ['cryptography', 'python-axolotl-curve25519>=0.4.1', 'protobuf>=3.0.0.b2']
|
|
+deps = ['cryptography', 'python-axolotl-curve25519>=0.4.1', 'protobuf>=3.20.0']
|
|
|
|
setup(
|
|
name='python-axolotl',
|
|
diff --git a/tox.ini b/tox.ini
|
|
index 789aa20..21ca5d7 100644
|
|
--- a/tox.ini
|
|
+++ b/tox.ini
|
|
@@ -11,6 +11,6 @@ envlist = py26, py27, py32, py33, py35, py36, py37
|
|
commands = nosetests axolotl.tests
|
|
deps =
|
|
nose
|
|
- protobuf==3.0.0b2
|
|
+ protobuf>=3.20.0
|
|
cryptography
|
|
python-axolotl-curve25519
|