mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'public/ticket21037'

Browse source
This commit is contained in:
Nick Mathewson 2017-01-11 09:17:21 -05:00
commit 4f1a5da473
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changes/ticket21037 Normal file
View file

@ -0,0 +1,4 @@
o Minor features (logging):
- In several places, describe unset ed25519 keys as "<unset>", rather
than "AAAAAAAA...AAA". Closes ticket 21037.

13
src/common/crypto_format.c
View file

@ -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));
}