From b5c361c77b6ae1e8a1d24d7a0925c8bf28380a48 Mon Sep 17 00:00:00 2001 From: Sacha Weatherstone Date: Wed, 19 Oct 2022 17:03:17 +1000 Subject: [PATCH 1/3] Update go package name --- admin.proto | 2 +- apponly.proto | 2 +- cannedmessages.proto | 2 +- channel.proto | 2 +- config.proto | 2 +- device_metadata.proto | 2 +- deviceonly.proto | 2 +- localonly.proto | 2 +- mesh.proto | 2 +- module_config.proto | 2 +- mqtt.proto | 2 +- portnums.proto | 2 +- remote_hardware.proto | 2 +- storeforward.proto | 2 +- telemetry.proto | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/admin.proto b/admin.proto index 2da1832..9bf4dd9 100644 --- a/admin.proto +++ b/admin.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/gomeshproto"; +option go_package = "github.com/meshtastic/go/generated"; import "channel.proto"; import "config.proto"; diff --git a/apponly.proto b/apponly.proto index 20bf565..7d1bb1b 100644 --- a/apponly.proto +++ b/apponly.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/gomeshproto"; +option go_package = "github.com/meshtastic/go/generatedddd"; import "channel.proto"; import "config.proto"; diff --git a/cannedmessages.proto b/cannedmessages.proto index bcbdd48..7f1f366 100644 --- a/cannedmessages.proto +++ b/cannedmessages.proto @@ -3,7 +3,7 @@ syntax = "proto3"; option java_package = "com.geeksville.mesh"; option java_outer_classname = "CannedMessageConfigProtos"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/gomeshproto"; +option go_package = "github.com/meshtastic/go/generated"; /* * Canned message module configuration. diff --git a/channel.proto b/channel.proto index eaa7f15..ea2a23b 100644 --- a/channel.proto +++ b/channel.proto @@ -3,7 +3,7 @@ syntax = "proto3"; option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/gomeshproto"; +option go_package = "github.com/meshtastic/go/generated"; option java_outer_classname = "ChannelProtos"; diff --git a/config.proto b/config.proto index e97695a..dfdd3ad 100644 --- a/config.proto +++ b/config.proto @@ -3,7 +3,7 @@ syntax = "proto3"; option java_package = "com.geeksville.mesh"; option java_outer_classname = "ConfigProtos"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/gomeshproto"; +option go_package = "github.com/meshtastic/go/generated"; message Config { /* diff --git a/device_metadata.proto b/device_metadata.proto index 4ec35a5..3492cd7 100644 --- a/device_metadata.proto +++ b/device_metadata.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/gomeshproto"; +option go_package = "github.com/meshtastic/go/generated"; option java_outer_classname = "DeviceMetadataProtos"; diff --git a/deviceonly.proto b/deviceonly.proto index a43ac0d..d7284e2 100644 --- a/deviceonly.proto +++ b/deviceonly.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/gomeshproto"; +option go_package = "github.com/meshtastic/go/generated"; import "channel.proto"; import "mesh.proto"; diff --git a/localonly.proto b/localonly.proto index 0e4fcbe..f9a4bb7 100644 --- a/localonly.proto +++ b/localonly.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/gomeshproto"; +option go_package = "github.com/meshtastic/go/generated"; import "config.proto"; import "module_config.proto"; diff --git a/mesh.proto b/mesh.proto index 603b6c2..b997cc2 100644 --- a/mesh.proto +++ b/mesh.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/gomeshproto"; +option go_package = "github.com/meshtastic/go/generated"; import "channel.proto"; import "config.proto"; diff --git a/module_config.proto b/module_config.proto index 24b7de3..05cfcba 100644 --- a/module_config.proto +++ b/module_config.proto @@ -3,7 +3,7 @@ syntax = "proto3"; option java_package = "com.geeksville.mesh"; option java_outer_classname = "ModuleConfigProtos"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/gomeshproto"; +option go_package = "github.com/meshtastic/go/generated"; /* * Module Config diff --git a/mqtt.proto b/mqtt.proto index f3a5660..4045b1a 100644 --- a/mqtt.proto +++ b/mqtt.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/gomeshproto"; +option go_package = "github.com/meshtastic/go/generated"; import "mesh.proto"; diff --git a/portnums.proto b/portnums.proto index 1ebd7f8..15747f6 100644 --- a/portnums.proto +++ b/portnums.proto @@ -3,7 +3,7 @@ syntax = "proto3"; option java_package = "com.geeksville.mesh"; option java_outer_classname = "Portnums"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/gomeshproto"; +option go_package = "github.com/meshtastic/go/generated"; /* * For any new 'apps' that run on the device or via sister apps on phones/PCs they should pick and use a diff --git a/remote_hardware.proto b/remote_hardware.proto index 5a5a060..d5cca42 100644 --- a/remote_hardware.proto +++ b/remote_hardware.proto @@ -3,7 +3,7 @@ syntax = "proto3"; option java_package = "com.geeksville.mesh"; option java_outer_classname = "RemoteHardware"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/gomeshproto"; +option go_package = "github.com/meshtastic/go/generated"; /* * An example app to show off the module system. This message is used for diff --git a/storeforward.proto b/storeforward.proto index 226c965..45d163a 100644 --- a/storeforward.proto +++ b/storeforward.proto @@ -3,7 +3,7 @@ syntax = "proto3"; option java_package = "com.geeksville.mesh"; option java_outer_classname = "StoreAndForwardProtos"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/gomeshproto"; +option go_package = "github.com/meshtastic/go/generated"; /* * TODO: REPLACE diff --git a/telemetry.proto b/telemetry.proto index 5492b21..57550e3 100644 --- a/telemetry.proto +++ b/telemetry.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/gomeshproto"; +option go_package = "github.com/meshtastic/go/generated"; option java_outer_classname = "TelemetryProtos"; From cc38810d97dd09bbd81d328c555f171c8d20d34d Mon Sep 17 00:00:00 2001 From: Sacha Weatherstone Date: Wed, 19 Oct 2022 17:27:26 +1000 Subject: [PATCH 2/3] fix typo --- apponly.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apponly.proto b/apponly.proto index 7d1bb1b..4e4262a 100644 --- a/apponly.proto +++ b/apponly.proto @@ -2,7 +2,7 @@ syntax = "proto3"; option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/go/generatedddd"; +option go_package = "github.com/meshtastic/go/generated"; import "channel.proto"; import "config.proto"; From d0559bfa3c31023ed2f2aa3807b6a0a1da9a6feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Wed, 19 Oct 2022 11:28:30 +0200 Subject: [PATCH 3/3] add capability to switch out the public default key for OEMs (#216) --- deviceonly.options | 4 ++-- deviceonly.proto | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/deviceonly.options b/deviceonly.options index 1905649..fe51ce9 100644 --- a/deviceonly.options +++ b/deviceonly.options @@ -10,5 +10,5 @@ *ChannelFile.channels max_count:8 *OEMStore.oem_text max_size:40 - -*OEMStore.oem_icon_bits max_size:2048 \ No newline at end of file +*OEMStore.oem_icon_bits max_size:2048 +*OEMStore.oem_aes_key max_size:32 diff --git a/deviceonly.proto b/deviceonly.proto index d7284e2..b4e0c1d 100644 --- a/deviceonly.proto +++ b/deviceonly.proto @@ -134,4 +134,9 @@ message OEMStore { * Use this font for the OEM text. */ string oem_text = 5; + + /* + * The default device encryption key, 16 or 32 byte + */ + bytes oem_aes_key = 6; }