diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-27 22:14:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-27 22:14:28 -0400 |
| commit | 0130e7c9d2842ad58e1b84829aeab16a2efba3bb (patch) | |
| tree | c85e068a47b3668c714d24d80b839ddf7bad6a97 /src/common/crypto.c | |
| parent | 7f85509a59b88173ac6060cd5925e28415f016b4 (diff) | |
| parent | 43ffd023e9267927539dc9c12bee86199cd1c800 (diff) | |
| download | tor-0130e7c9d2842ad58e1b84829aeab16a2efba3bb.tar.gz tor-0130e7c9d2842ad58e1b84829aeab16a2efba3bb.zip | |
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
Conflicts:
src/common/torint.h
Diffstat (limited to 'src/common/crypto.c')
| -rw-r--r-- | src/common/crypto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c index 2ef40c29c7..8d17a3daee 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -523,7 +523,7 @@ crypto_pk_read_private_key_from_string(crypto_pk_env_t *env, tor_assert(env); tor_assert(s); - tor_assert(len < INT_MAX && len < SIZE_T_CEILING); + tor_assert(len < INT_MAX && len < SSIZE_T_CEILING); /* Create a read-only memory BIO, backed by the string 's' */ b = BIO_new_mem_buf((char*)s, (int)len); |