From daebb4884176e58da58fb397d0a7ddef83d31ed8 Mon Sep 17 00:00:00 2001
From: Monica Moniot <mamoniot@proton.me>
Date: Wed, 28 Feb 2024 13:50:19 -0500
Subject: [PATCH] improved prefixes

---
 src/p384/address.rs       | 4 ++--
 src/p384/identity.rs      | 2 +-
 src/p384/mod.rs           | 6 +++---
 src/p384/short_address.rs | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/p384/address.rs b/src/p384/address.rs
index e8846fe..875b40d 100644
--- a/src/p384/address.rs
+++ b/src/p384/address.rs
@@ -29,9 +29,9 @@ impl Address {
     pub const REQUIRED_PREFIX: u8 = 0xfc;
 
     pub const SIZE: usize = 48;
-    /// Length of a full address in string format.
-    pub const STRING_SIZE: usize = 81;
     pub const STRING_SIZE_NO_PREFIX: usize = 76;
+    /// Length of a full address in string format.
+    pub const STRING_SIZE: usize = Self::STRING_SIZE_NO_PREFIX + PREFIX_ADDRESS.len();
 
     /// Get this address as a raw byte array.
     #[inline(always)]
diff --git a/src/p384/identity.rs b/src/p384/identity.rs
index 111f38e..9dd1a10 100644
--- a/src/p384/identity.rs
+++ b/src/p384/identity.rs
@@ -30,8 +30,8 @@ pub struct Identity {
 impl Identity {
     pub const SIZE: usize = P384_IDENTITY_SIZE;
 
-    pub const STRING_SIZE: usize = 548;
     pub const STRING_SIZE_NO_PREFIX: usize = 543;
+    pub const STRING_SIZE: usize = Self::STRING_SIZE_NO_PREFIX + PREFIX_IDENTITY.len();
 
     pub fn prefix(&self) -> &ShortAddress {
         self.address.prefix()
diff --git a/src/p384/mod.rs b/src/p384/mod.rs
index 1b07fdc..468694a 100644
--- a/src/p384/mod.rs
+++ b/src/p384/mod.rs
@@ -40,9 +40,9 @@ const IDENTITY_VARIANT_P384: u8 = 1;
 const DOMAIN_MASTER_SIG: &[u8] = b"ZTID1_MASTERSIG";
 const DOMAIN_SUBKEY_SIG: &[u8] = b"ZTID1_SUBKEYSIG";
 
-const PREFIX_IDENTITY: &str = "zt:i:";
-const PREFIX_ADDRESS: &str = "zt:a:";
-const PREFIX_SHORT: &str = "zt:s:";
+const PREFIX_IDENTITY: &str = "zt:id:";
+const PREFIX_ADDRESS: &str = "zt:addr:";
+const PREFIX_SHORT: &str = "zt:addr:";
 
 fn first_128_to_string(b: &[u8], s: &mut String) {
     base24::encode_4to7(&b[0..4], s);
diff --git a/src/p384/short_address.rs b/src/p384/short_address.rs
index 6bca8fe..cd2842d 100644
--- a/src/p384/short_address.rs
+++ b/src/p384/short_address.rs
@@ -18,8 +18,8 @@ pub struct ShortAddress(pub(crate) [u64; 2]); // treated as [u8; 16]
 
 impl ShortAddress {
     pub const SIZE: usize = 16;
-    pub const STRING_SIZE: usize = 36;
     pub const STRING_SIZE_NO_PREFIX: usize = 31;
+    pub const STRING_SIZE: usize = Self::STRING_SIZE_NO_PREFIX + PREFIX_SHORT.len();
 
     #[inline(always)]
     pub fn as_bytes(&self) -> &[u8; Self::SIZE] {