summaryrefslogtreecommitdiff
path: root/src/common/crypto.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-01-15 13:26:02 -0500
committerNick Mathewson <nickm@torproject.org>2011-01-15 13:26:02 -0500
commit1758ef51de8b44141184a36bcd36dea349d9e65d (patch)
treea3b514570687b43301644e2070ae5c943c9fdea0 /src/common/crypto.h
parent7ea674e0e0dfa982ae901450d4e16371aad0def8 (diff)
parent1393985768d760e11e45faabb537d28248306e8b (diff)
downloadtor-1758ef51de8b44141184a36bcd36dea349d9e65d.tar.gz
tor-1758ef51de8b44141184a36bcd36dea349d9e65d.zip
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/common/crypto.h')
-rw-r--r--src/common/crypto.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/crypto.h b/src/common/crypto.h
index b44efcc916..ee27831f5f 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -112,7 +112,7 @@ int crypto_pk_write_private_key_to_string(crypto_pk_env_t *env,
int crypto_pk_read_public_key_from_string(crypto_pk_env_t *env,
const char *src, size_t len);
int crypto_pk_read_private_key_from_string(crypto_pk_env_t *env,
- const char *s);
+ const char *s, ssize_t len);
int crypto_pk_write_private_key_to_filename(crypto_pk_env_t *env,
const char *fname);