From a07ba04296115c4427ab3c05a8095ae809b266ee Mon Sep 17 00:00:00 2001 From: Matt Ames Date: Fri, 2 Nov 2018 11:06:16 +1100 Subject: [PATCH 1/3] Test commit --- test | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test diff --git a/test b/test new file mode 100644 index 0000000..e69de29 From 7afb19a5b49203967c09032dec004d13d7f18c0b Mon Sep 17 00:00:00 2001 From: Matt Ames Date: Fri, 2 Nov 2018 11:07:02 +1100 Subject: [PATCH 2/3] Clean up test commit --- test | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 test diff --git a/test b/test deleted file mode 100644 index e69de29..0000000 From 652b29b7a2698a04980d4e5196e89104d4c41073 Mon Sep 17 00:00:00 2001 From: Matt Ames Date: Thu, 13 Dec 2018 12:45:13 +1100 Subject: [PATCH 3/3] Clarify some of the algorithms codes and key sizes --- op25/gr-op25/lib/value_string.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/op25/gr-op25/lib/value_string.cc b/op25/gr-op25/lib/value_string.cc index eb26a7b..1b59b3e 100644 --- a/op25/gr-op25/lib/value_string.cc +++ b/op25/gr-op25/lib/value_string.cc @@ -60,7 +60,7 @@ const value_string ALGIDS[] = { { 0x80, "Unencrypted" }, { 0x81, "DES-OFB, 56 bit key" }, { 0x83, "3 key Triple DES, 168 bit key" }, - { 0x84, "AES-256" }, + { 0x84, "AES-256-OFB" }, { 0x85, "AES-128-ECB"}, { 0x88, "AES-CBC"}, /* Motorola proprietary - some of these have been observed over the air, @@ -68,7 +68,7 @@ const value_string ALGIDS[] = { have come from the TIA's FTP website while it was still public, from document "ALGID Guide 2015-04-15.pdf", and others have been have been worked out with a little bit of guesswork */ - { 0x9F, "Motorola DES-XL" }, + { 0x9F, "Motorola DES-XL 56-bit key" }, { 0xA0, "Motorola DVI-XL" }, { 0xA1, "Motorola DVP-XL" }, { 0xA2, "Motorola DVI-SPFL"}, @@ -79,7 +79,7 @@ const value_string ALGIDS[] = { { 0xA7, "Motorola Assigned - Unknown" }, { 0xA8, "Motorola Assigned - Unknown" }, { 0xA9, "Motorola Assigned - Unknown" }, - { 0xAA, "Motorola ADP" }, + { 0xAA, "Motorola ADP 40 bit RC4" }, { 0xAB, "Motorola CFX-256" }, { 0xAC, "Motorola Assigned - Unknown" }, { 0xAD, "Motorola Assigned - Unknown" },