diff options
author | Nick Mathewson <nickm@torproject.org> | 2009-09-01 15:59:40 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2009-09-01 15:59:40 -0400 |
commit | 1cda6f3e756c2e76d50d398726c5b1851556756f (patch) | |
tree | 6532b12c8f7cc40b7daecb810e49596c6f509647 /src/tools/tor-gencert.c | |
parent | d76fd59a7ee49b36591708070d1e50d8a50c67d0 (diff) | |
parent | bddda9bbdb047e52652f7c6f9c2047df15a4e08e (diff) | |
download | tor-1cda6f3e756c2e76d50d398726c5b1851556756f.tar.gz tor-1cda6f3e756c2e76d50d398726c5b1851556756f.zip |
Merge commit 'origin/maint-0.2.1'
Diffstat (limited to 'src/tools/tor-gencert.c')
-rw-r--r-- | src/tools/tor-gencert.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index d2ea4eb109..2ae4cc22ec 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -70,7 +70,7 @@ show_help(void) static void crypto_log_errors(int severity, const char *doing) { - unsigned int err; + unsigned long err; const char *msg, *lib, *func; while ((err = ERR_get_error()) != 0) { msg = (const char*)ERR_reason_error_string(err); @@ -94,7 +94,7 @@ load_passphrase(void) { char *cp; char buf[1024]; /* "Ought to be enough for anybody." */ - int n = read_all(passphrase_fd, buf, sizeof(buf), 0); + ssize_t n = read_all(passphrase_fd, buf, sizeof(buf), 0); if (n < 0) { log_err(LD_GENERAL, "Couldn't read from passphrase fd: %s", strerror(errno)); |