diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-15 13:25:13 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-15 13:25:13 -0500 |
| commit | 1393985768d760e11e45faabb537d28248306e8b (patch) | |
| tree | 61b35b3b734f8a920a08cc9a9ecb70e408cd4a58 /src/common/crypto.h | |
| parent | 9d133464c874191414dd51f546d09364419040cf (diff) | |
| parent | b97b0efec81c5564999c2545dd7f0ca230b239cc (diff) | |
| download | tor-1393985768d760e11e45faabb537d28248306e8b.tar.gz tor-1393985768d760e11e45faabb537d28248306e8b.zip | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Conflicts:
src/or/routerparse.c
src/or/test.c
Diffstat (limited to 'src/common/crypto.h')
| -rw-r--r-- | src/common/crypto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/crypto.h b/src/common/crypto.h index 29ba36cdf6..c306bec276 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); |