nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-01 08:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

crypto_format: Remove unused return value from digest_to_base64()

Browse Source 
Part of 29660.
This commit is contained in:
teor 2019-04-05 14:58:20 +10:00
parent 0d136a12bb
commit abaed046a6
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/crypt_ops/crypto_format.c
View File

@ -250,17 +250,21 @@ ed25519_signature_from_base64(ed25519_signature_t *sig,
return 0; return 0;
} }
/** Base64 encode DIGEST_LINE bytes from <b>digest</b>, remove the trailing = /** Base64 encode DIGEST_LEN bytes from <b>digest</b>, remove the trailing =
* characters, and store the nul-terminated result in the first * characters, and store the nul-terminated result in the first
* BASE64_DIGEST_LEN+1 bytes of <b>d64</b>. */ * BASE64_DIGEST_LEN+1 bytes of <b>d64</b>.
int * Can not fail. */
void
digest_to_base64(char *d64, const char *digest) digest_to_base64(char *d64, const char *digest)
{ {
char buf[256]; char buf[256];
base64_encode(buf, sizeof(buf), digest, DIGEST_LEN, 0); int n = base64_encode_nopad(buf, sizeof(buf),
buf[BASE64_DIGEST_LEN] = '\0'; (const uint8_t *)digest, DIGEST_LEN);
/* These asserts should always succeed, unless there is a bug in
* base64_encode_nopad(). */
tor_assert(n == BASE64_DIGEST_LEN);
tor_assert(buf[BASE64_DIGEST_LEN] == '\0');
memcpy(d64, buf, BASE64_DIGEST_LEN+1); memcpy(d64, buf, BASE64_DIGEST_LEN+1);
return 0;
} }
/** Given a base64 encoded, nul-terminated digest in <b>d64</b> (without /** Given a base64 encoded, nul-terminated digest in <b>d64</b> (without

2
src/lib/crypt_ops/crypto_format.h
View File

@ -42,7 +42,7 @@ int ed25519_signature_from_base64(struct ed25519_signature_t *sig,
int ed25519_signature_to_base64(char *output, int ed25519_signature_to_base64(char *output,
const struct ed25519_signature_t *sig); const struct ed25519_signature_t *sig);
int digest_to_base64(char *d64, const char *digest); void digest_to_base64(char *d64, const char *digest);
int digest_from_base64(char *digest, const char *d64); int digest_from_base64(char *digest, const char *d64);
int digest256_to_base64(char *d64, const char *digest); int digest256_to_base64(char *d64, const char *digest);
int digest256_from_base64(char *digest, const char *d64); int digest256_from_base64(char *digest, const char *d64);