aboutsummaryrefslogtreecommitdiff
path: root/src/common/crypto.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2006-10-19 23:05:02 +0000
committerNick Mathewson <nickm@torproject.org>2006-10-19 23:05:02 +0000
commit7551c44a5375c390b653c7b8f28d904a3156e1ae (patch)
treef68e822086b38828df32583d165135fc148c4768 /src/common/crypto.c
parent126a3f699a8ed6f9c4d2b6c5f4b09f8be159fdd8 (diff)
downloadtor-7551c44a5375c390b653c7b8f28d904a3156e1ae.tar.gz
tor-7551c44a5375c390b653c7b8f28d904a3156e1ae.zip
r9274@Kushana: nickm | 2006-10-19 16:16:58 -0400
Add unit tests for tor_mmap_file(); make tor_mmap_t.size always be the size of the file (not the size of the mapping); add an extra argument to read_file_to_str() so it can return the size of the result string. svn:r8762
Diffstat (limited to 'src/common/crypto.c')
-rw-r--r--src/common/crypto.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 9aea7506ae..c7e5d4587f 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -460,7 +460,7 @@ crypto_pk_read_private_key_from_filename(crypto_pk_env_t *env,
int r;
/* Read the file into a string. */
- contents = read_file_to_str(keyfile, 0);
+ contents = read_file_to_str(keyfile, 0, NULL);
if (!contents) {
log_warn(LD_CRYPTO, "Error reading private key from \"%s\"", keyfile);
return -1;