aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-12-05 12:09:57 -0500
committerNick Mathewson <nickm@torproject.org>2017-12-05 12:09:57 -0500
commit779e4b9dcf850770a7c30104f714f4a59c2955a8 (patch)
treedd78d910b70c9f0559cabfdf92fb1150fb801b93
parent313360e6e6aa6bc56e1bc3661b68df5279b6b4bc (diff)
downloadtor-779e4b9dcf850770a7c30104f714f4a59c2955a8.tar.gz
tor-779e4b9dcf850770a7c30104f714f4a59c2955a8.zip
Tweaks to strings in 24500
-rw-r--r--changes/ticket245004
-rw-r--r--src/common/crypto.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/changes/ticket24500 b/changes/ticket24500
index 0f1778d46d..b49b7a5551 100644
--- a/changes/ticket24500
+++ b/changes/ticket24500
@@ -1,3 +1,3 @@
- o Code simplification and refactoring:
- - Making more useful log messages for errno errors on getrandom() call.
+ o Minor features (logging):
+ - Provide better warnings when the getrandom() syscall fails.
Closes ticket 24500.
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 7f034ee949..380f038f42 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -2877,12 +2877,12 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t out_len)
/* Useful log message for errno. */
if (errno == ENOSYS) {
- log_warn(LD_CRYPTO, "This warning is caused by ENOSYS error."
+ log_warn(LD_CRYPTO, "Can't get entropy from getrandom(). "
" You are running a version of Tor built to support"
- " getrandom(), but the kernel is too old and doesn't"
- " implement this function.");
+ " getrandom(), but the kernel doesn't implement this"
+ " implement this function--probably because it is too old?");
} else {
- log_warn(LD_CRYPTO, "Can't get entropy from getrandom(). %s error.",
+ log_warn(LD_CRYPTO, "Can't get entropy from getrandom(): %s.",
strerror(errno));
}