summaryrefslogtreecommitdiff
path: root/src/common/crypto.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-01-15 13:15:06 -0500
committerNick Mathewson <nickm@torproject.org>2011-01-15 13:15:06 -0500
commitb97b0efec81c5564999c2545dd7f0ca230b239cc (patch)
tree7bd479c07bf52595f58713e6c5844a0f8f1520d7 /src/common/crypto.h
parent31b562e10abe51cf9d520e0a3ad2ffc3277d52a4 (diff)
parent1f3b4420233e83ef160ac41398827994ec7ae152 (diff)
downloadtor-b97b0efec81c5564999c2545dd7f0ca230b239cc.tar.gz
tor-b97b0efec81c5564999c2545dd7f0ca230b239cc.zip
Merge branch 'bug2352_obsize' into maint-0.2.1
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 9cfb41444b..d6f5555379 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -82,7 +82,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);