[tor-commits] [tor/master] Note some functions that should move or be merged

[nickm at torproject.org]

commit 277c9a3580db20a9814227531431433a37fe55b8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 26 16:09:34 2015 -0400

    Note some functions that should move or be merged
---
 src/common/crypto.c         |    4 ++++
 src/common/crypto_ed25519.h |    4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 05dc432..2ccff80 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -2924,6 +2924,7 @@ base64_decode(char *dest, size_t destlen, const char *src, size_t srclen)
 /** Base64 encode DIGEST_LINE bytes from <b>digest</b>, remove the trailing =
  * and newline characters, and store the nul-terminated result in the first
  * BASE64_DIGEST_LEN+1 bytes of <b>d64</b>.  */
+/* XXXX unify with crypto_format.c code */
 int
 digest_to_base64(char *d64, const char *digest)
 {
@@ -2937,6 +2938,7 @@ digest_to_base64(char *d64, const char *digest)
 /** Given a base64 encoded, nul-terminated digest in <b>d64</b> (without
  * trailing newline or = characters), decode it and store the result in the
  * first DIGEST_LEN bytes at <b>digest</b>. */
+/* XXXX unify with crypto_format.c code */
 int
 digest_from_base64(char *digest, const char *d64)
 {
@@ -2962,6 +2964,7 @@ digest_from_base64(char *digest, const char *d64)
 /** Base64 encode DIGEST256_LINE bytes from <b>digest</b>, remove the
  * trailing = and newline characters, and store the nul-terminated result in
  * the first BASE64_DIGEST256_LEN+1 bytes of <b>d64</b>.  */
+/* XXXX unify with crypto_format.c code */
 int
 digest256_to_base64(char *d64, const char *digest)
 {
@@ -2975,6 +2978,7 @@ digest256_to_base64(char *d64, const char *digest)
 /** Given a base64 encoded, nul-terminated digest in <b>d64</b> (without
  * trailing newline or = characters), decode it and store the result in the
  * first DIGEST256_LEN bytes at <b>digest</b>. */
+/* XXXX unify with crypto_format.c code */
 int
 digest256_from_base64(char *digest, const char *d64)
 {
diff --git a/src/common/crypto_ed25519.h b/src/common/crypto_ed25519.h
index 79b3db8..8ffb9f2 100644
--- a/src/common/crypto_ed25519.h
+++ b/src/common/crypto_ed25519.h
@@ -88,13 +88,15 @@ int ed25519_public_blind(ed25519_public_key_t *out,
                          const ed25519_public_key_t *inp,
                          const uint8_t *param);
 
-#define ED25519_BASE64_LEN 43
 
+/* XXXX move these to crypto_format.h */
+#define ED25519_BASE64_LEN 43
 int ed25519_public_from_base64(ed25519_public_key_t *pkey,
                                const char *input);
 int ed25519_public_to_base64(char *output,
                              const ed25519_public_key_t *pkey);
 
+/* XXXX move these to crypto_format.h */
 #define ED25519_SIG_BASE64_LEN 86
 
 int ed25519_signature_from_base64(ed25519_signature_t *sig,