From 8b026890fcc56b005e89e16ac3152549e5aa832a Mon Sep 17 00:00:00 2001 From: "Davide Palma (ElDavo)" Date: Fri, 23 Aug 2024 20:46:35 +0200 Subject: [PATCH] regen proto, update tested version --- README.md | 8 +++++--- proto/backup_expiry.proto | 2 +- src/wa_crypt_tools/proto/C14_cipher_pb2.py | 2 +- src/wa_crypt_tools/proto/C15_IV_pb2.py | 2 +- src/wa_crypt_tools/proto/backup_expiry_pb2.py | 2 +- src/wa_crypt_tools/proto/backup_prefix_pb2.py | 2 +- src/wa_crypt_tools/proto/key_type_pb2.py | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 9f8e191..0844429 100644 --- a/README.md +++ b/README.md @@ -155,7 +155,7 @@ Issues asking for this will be closed as invalid.** Stable: 2.23.16.76 Beta: -2.23.18.12 +2.24.18.10 #### Protobuf automatic fix @@ -167,9 +167,11 @@ First, after cloning the repository, do an editable installation of the package This will also install the optional dependencies of the package. -Next, download the protobuf compiler from its repository [here](https://github.com/protocolbuffers/protobuf/releases). You can move the protoc program to the `wa-crypt-tools/proto` folder where the .proto files are. +Next, download the protobuf compiler from its repository [here](https://github.com/protocolbuffers/protobuf/releases). +You can move the protoc program to the `wa-crypt-tools/proto` folder where the .proto files are. -Replace the protobuf classes as needed and run `protoc` to generate the python classes. From the `wa-crypt-tools/proto` directory of the project, run: +Replace the protobuf classes as needed and run `protoc` to generate the python classes. +From the `wa-crypt-tools/proto` directory of the project, run: `./protoc --python_out=../src/wa_crypt_tools/proto --proto_path=. *.proto` diff --git a/proto/backup_expiry.proto b/proto/backup_expiry.proto index f0fdeb8..bcb55a2 100644 --- a/proto/backup_expiry.proto +++ b/proto/backup_expiry.proto @@ -41,5 +41,5 @@ message BackupExpiry { optional bool f_36 = 36; // alter_message_ephemeral_to_message_ephemeral_remove_column optional bool f_37 = 37; // alter_message_ephemeral_setting_to_message_ephemeral_setting_remove_column // optional int32 backup_export_file_size = 38; // The size of the backup file, unused - optional bool f_39 = 39; // cleaned_db + optional bool f_39 = 39; // cleaned_db, does not show in incremental backups } diff --git a/src/wa_crypt_tools/proto/C14_cipher_pb2.py b/src/wa_crypt_tools/proto/C14_cipher_pb2.py index 83b9208..f263d40 100644 --- a/src/wa_crypt_tools/proto/C14_cipher_pb2.py +++ b/src/wa_crypt_tools/proto/C14_cipher_pb2.py @@ -4,7 +4,7 @@ from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion(_runtime_version.Domain.PUBLIC, 5, 27, 0, '', 'C14_cipher.proto') +_runtime_version.ValidateProtobufRuntimeVersion(_runtime_version.Domain.PUBLIC, 5, 27, 3, '', 'C14_cipher.proto') _sym_db = _symbol_database.Default() DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x10C14_cipher.proto"m\n\nC14_cipher\x12\x16\n\x0ecipher_version\x18\x01 \x01(\x0c\x12\x13\n\x0bkey_version\x18\x02 \x01(\x0c\x12\x13\n\x0bserver_salt\x18\x03 \x01(\x0c\x12\x11\n\tgoogle_id\x18\x04 \x01(\x0c\x12\n\n\x02IV\x18\x05 \x01(\x0cb\x06proto3') _globals = globals() diff --git a/src/wa_crypt_tools/proto/C15_IV_pb2.py b/src/wa_crypt_tools/proto/C15_IV_pb2.py index 1af0f18..dd5200b 100644 --- a/src/wa_crypt_tools/proto/C15_IV_pb2.py +++ b/src/wa_crypt_tools/proto/C15_IV_pb2.py @@ -4,7 +4,7 @@ from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion(_runtime_version.Domain.PUBLIC, 5, 27, 0, '', 'C15_IV.proto') +_runtime_version.ValidateProtobufRuntimeVersion(_runtime_version.Domain.PUBLIC, 5, 27, 3, '', 'C15_IV.proto') _sym_db = _symbol_database.Default() DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cC15_IV.proto"\x14\n\x06C15_IV\x12\n\n\x02IV\x18\x01 \x01(\x0cb\x06proto3') _globals = globals() diff --git a/src/wa_crypt_tools/proto/backup_expiry_pb2.py b/src/wa_crypt_tools/proto/backup_expiry_pb2.py index 7b811e4..6a47ae4 100644 --- a/src/wa_crypt_tools/proto/backup_expiry_pb2.py +++ b/src/wa_crypt_tools/proto/backup_expiry_pb2.py @@ -4,7 +4,7 @@ from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion(_runtime_version.Domain.PUBLIC, 5, 27, 0, '', 'backup_expiry.proto') +_runtime_version.ValidateProtobufRuntimeVersion(_runtime_version.Domain.PUBLIC, 5, 27, 3, '', 'backup_expiry.proto') _sym_db = _symbol_database.Default() DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x13backup_expiry.proto"\x94\x08\n\x0cBackupExpiry\x12\x13\n\x0bapp_version\x18\x01 \x01(\t\x12\x11\n\tjidSuffix\x18\x03 \x01(\t\x12\x1b\n\x0ebackup_version\x18\x04 \x01(\x05H\x00\x88\x01\x01\x12\x10\n\x03f_5\x18\x05 \x01(\x08H\x01\x88\x01\x01\x12\x10\n\x03f_6\x18\x06 \x01(\x08H\x02\x88\x01\x01\x12\x10\n\x03f_7\x18\x07 \x01(\x08H\x03\x88\x01\x01\x12\x10\n\x03f_8\x18\x08 \x01(\x08H\x04\x88\x01\x01\x12\x10\n\x03f_9\x18\t \x01(\x08H\x05\x88\x01\x01\x12\x11\n\x04f_10\x18\n \x01(\x08H\x06\x88\x01\x01\x12\x11\n\x04f_11\x18\x0b \x01(\x08H\x07\x88\x01\x01\x12\x11\n\x04f_12\x18\x0c \x01(\x08H\x08\x88\x01\x01\x12\x11\n\x04f_13\x18\r \x01(\x08H\t\x88\x01\x01\x12\x11\n\x04f_14\x18\x0e \x01(\x08H\n\x88\x01\x01\x12\x11\n\x04f_15\x18\x0f \x01(\x08H\x0b\x88\x01\x01\x12\x11\n\x04f_16\x18\x10 \x01(\x08H\x0c\x88\x01\x01\x12\x11\n\x04f_17\x18\x11 \x01(\x08H\r\x88\x01\x01\x12\x11\n\x04f_18\x18\x12 \x01(\x08H\x0e\x88\x01\x01\x12\x11\n\x04f_19\x18\x13 \x01(\x08H\x0f\x88\x01\x01\x12\x11\n\x04f_20\x18\x14 \x01(\x08H\x10\x88\x01\x01\x12\x11\n\x04f_21\x18\x15 \x01(\x08H\x11\x88\x01\x01\x12\x11\n\x04f_22\x18\x16 \x01(\x08H\x12\x88\x01\x01\x12\x11\n\x04f_23\x18\x17 \x01(\x08H\x13\x88\x01\x01\x12\x11\n\x04f_24\x18\x18 \x01(\x08H\x14\x88\x01\x01\x12\x11\n\x04f_25\x18\x19 \x01(\x08H\x15\x88\x01\x01\x12\x11\n\x04f_26\x18\x1a \x01(\x08H\x16\x88\x01\x01\x12\x11\n\x04f_27\x18\x1b \x01(\x08H\x17\x88\x01\x01\x12\x11\n\x04f_28\x18\x1c \x01(\x08H\x18\x88\x01\x01\x12\x11\n\x04f_29\x18\x1d \x01(\x08H\x19\x88\x01\x01\x12\x11\n\x04f_30\x18\x1e \x01(\x08H\x1a\x88\x01\x01\x12\x11\n\x04f_31\x18\x1f \x01(\x08H\x1b\x88\x01\x01\x12\x11\n\x04f_32\x18 \x01(\x08H\x1c\x88\x01\x01\x12\x11\n\x04f_33\x18! \x01(\x08H\x1d\x88\x01\x01\x12\x11\n\x04f_34\x18" \x01(\x08H\x1e\x88\x01\x01\x12\x11\n\x04f_35\x18# \x01(\x08H\x1f\x88\x01\x01\x12\x11\n\x04f_36\x18$ \x01(\x08H \x88\x01\x01\x12\x11\n\x04f_37\x18% \x01(\x08H!\x88\x01\x01\x12\x11\n\x04f_39\x18\' \x01(\x08H"\x88\x01\x01B\x11\n\x0f_backup_versionB\x06\n\x04_f_5B\x06\n\x04_f_6B\x06\n\x04_f_7B\x06\n\x04_f_8B\x06\n\x04_f_9B\x07\n\x05_f_10B\x07\n\x05_f_11B\x07\n\x05_f_12B\x07\n\x05_f_13B\x07\n\x05_f_14B\x07\n\x05_f_15B\x07\n\x05_f_16B\x07\n\x05_f_17B\x07\n\x05_f_18B\x07\n\x05_f_19B\x07\n\x05_f_20B\x07\n\x05_f_21B\x07\n\x05_f_22B\x07\n\x05_f_23B\x07\n\x05_f_24B\x07\n\x05_f_25B\x07\n\x05_f_26B\x07\n\x05_f_27B\x07\n\x05_f_28B\x07\n\x05_f_29B\x07\n\x05_f_30B\x07\n\x05_f_31B\x07\n\x05_f_32B\x07\n\x05_f_33B\x07\n\x05_f_34B\x07\n\x05_f_35B\x07\n\x05_f_36B\x07\n\x05_f_37B\x07\n\x05_f_39b\x06proto3') _globals = globals() diff --git a/src/wa_crypt_tools/proto/backup_prefix_pb2.py b/src/wa_crypt_tools/proto/backup_prefix_pb2.py index 3de6013..dc3d3ac 100644 --- a/src/wa_crypt_tools/proto/backup_prefix_pb2.py +++ b/src/wa_crypt_tools/proto/backup_prefix_pb2.py @@ -4,7 +4,7 @@ from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion(_runtime_version.Domain.PUBLIC, 5, 27, 0, '', 'backup_prefix.proto') +_runtime_version.ValidateProtobufRuntimeVersion(_runtime_version.Domain.PUBLIC, 5, 27, 3, '', 'backup_prefix.proto') _sym_db = _symbol_database.Default() from . import C14_cipher_pb2 as C14__cipher__pb2 from . import C15_IV_pb2 as C15__IV__pb2 diff --git a/src/wa_crypt_tools/proto/key_type_pb2.py b/src/wa_crypt_tools/proto/key_type_pb2.py index 9473d45..0fc6e88 100644 --- a/src/wa_crypt_tools/proto/key_type_pb2.py +++ b/src/wa_crypt_tools/proto/key_type_pb2.py @@ -4,7 +4,7 @@ from google.protobuf import runtime_version as _runtime_version from google.protobuf import symbol_database as _symbol_database from google.protobuf.internal import builder as _builder -_runtime_version.ValidateProtobufRuntimeVersion(_runtime_version.Domain.PUBLIC, 5, 27, 0, '', 'key_type.proto') +_runtime_version.ValidateProtobufRuntimeVersion(_runtime_version.Domain.PUBLIC, 5, 27, 3, '', 'key_type.proto') _sym_db = _symbol_database.Default() DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0ekey_type.proto*/\n\x08Key_Type\x12\x0f\n\x0bWA_PROVIDED\x10\x00\x12\x12\n\x0eHSM_CONTROLLED\x10\x01b\x06proto3') _globals = globals()