diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-15 12:03:44 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-15 12:03:44 -0500 |
| commit | 1b8f2ef5505a3ee4d824abf70141e1ad8b48e66c (patch) | |
| tree | 84ca91d89a48f063b905771834cf9b6f5c3f94bd /src/common/crypto.h | |
| parent | b7b01d963af19497df2d23fd558ff408a12a669b (diff) | |
| parent | ed87738ede789fb9eccfd2e5a34bd8c484dfe44e (diff) | |
| download | tor-1b8f2ef5505a3ee4d824abf70141e1ad8b48e66c.tar.gz tor-1b8f2ef5505a3ee4d824abf70141e1ad8b48e66c.zip | |
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/common/crypto.h')
| -rw-r--r-- | src/common/crypto.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/common/crypto.h b/src/common/crypto.h index 8fcc58c3ca..b44efcc916 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -123,23 +123,25 @@ crypto_pk_env_t *crypto_pk_dup_key(crypto_pk_env_t *orig); crypto_pk_env_t *crypto_pk_copy_full(crypto_pk_env_t *orig); int crypto_pk_key_is_private(const crypto_pk_env_t *key); -int crypto_pk_public_encrypt(crypto_pk_env_t *env, char *to, +int crypto_pk_public_encrypt(crypto_pk_env_t *env, char *to, size_t tolen, const char *from, size_t fromlen, int padding); -int crypto_pk_private_decrypt(crypto_pk_env_t *env, char *to, +int crypto_pk_private_decrypt(crypto_pk_env_t *env, char *to, size_t tolen, const char *from, size_t fromlen, int padding, int warnOnFailure); -int crypto_pk_public_checksig(crypto_pk_env_t *env, char *to, +int crypto_pk_public_checksig(crypto_pk_env_t *env, char *to, size_t tolen, const char *from, size_t fromlen); int crypto_pk_public_checksig_digest(crypto_pk_env_t *env, const char *data, size_t datalen, const char *sig, size_t siglen); -int crypto_pk_private_sign(crypto_pk_env_t *env, char *to, +int crypto_pk_private_sign(crypto_pk_env_t *env, char *to, size_t tolen, const char *from, size_t fromlen); -int crypto_pk_private_sign_digest(crypto_pk_env_t *env, char *to, +int crypto_pk_private_sign_digest(crypto_pk_env_t *env, char *to, size_t tolen, const char *from, size_t fromlen); int crypto_pk_public_hybrid_encrypt(crypto_pk_env_t *env, char *to, + size_t tolen, const char *from, size_t fromlen, int padding, int force); int crypto_pk_private_hybrid_decrypt(crypto_pk_env_t *env, char *to, + size_t tolen, const char *from, size_t fromlen, int padding, int warnOnFailure); |