From 6aac6c6beef52e1a655fe64aaf5fc7ab756e76e1 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 2 Jan 2017 12:31:15 -0500
Subject: Make ed25519_fmt() log 0-valued keys more nicely.

Because <unset> makes more sense than AAAAAAAAAAAAAAAAAAA...

(I have indeed verified that ed25519_fmt() is only used for
logging. This patch also clarifies the intention that ed25519_fmt()
is only for logging.

Closes ticket 21037.
---
 src/common/crypto_format.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/common/crypto_format.c b/src/common/crypto_format.c
index 483013ee68..aa2a9d1fb0 100644
--- a/src/common/crypto_format.c
+++ b/src/common/crypto_format.c
@@ -161,16 +161,21 @@ curve25519_public_from_base64(curve25519_public_key_t *pkey,
   }
 }
 
-/** For convenience: Convert <b>pkey</b> to a statically allocated base64
- * string and return it. Not threadsafe. Subsequent calls invalidate
+/** For logging convenience: Convert <b>pkey</b> to a statically allocated
+ * base64 string and return it. Not threadsafe. Format not meant to be
+ * computer-readable; it may change in the future. Subsequent calls invalidate
  * previous returns. */
 const char *
 ed25519_fmt(const ed25519_public_key_t *pkey)
 {
   static char formatted[ED25519_BASE64_LEN+1];
   if (pkey) {
-    int r = ed25519_public_to_base64(formatted, pkey);
-    tor_assert(!r);
+    if (ed25519_public_key_is_zero(pkey)) {
+      strlcpy(formatted, "<unset>", sizeof(formatted));
+    } else {
+      int r = ed25519_public_to_base64(formatted, pkey);
+      tor_assert(!r);
+    }
   } else {
     strlcpy(formatted, "<null>", sizeof(formatted));
   }
-- 
cgit v1.2.3-54-g00ecf