diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-15 12:02:55 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-15 12:02:55 -0500 |
| commit | ed87738ede789fb9eccfd2e5a34bd8c484dfe44e (patch) | |
| tree | 27eb5efade75d368692a80d258615415deb8a7dc /src/or/onion.c | |
| parent | b27f5cc50d4a66bff31e43a596eb296a1b5a11dc (diff) | |
| parent | 50b06a2b76190170e9f80739f022696755b54b99 (diff) | |
| download | tor-ed87738ede789fb9eccfd2e5a34bd8c484dfe44e.tar tor-ed87738ede789fb9eccfd2e5a34bd8c484dfe44e.tar.gz | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Conflicts:
src/or/config.c
src/or/networkstatus.c
src/or/rendcommon.c
src/or/routerparse.c
src/or/test.c
Diffstat (limited to 'src/or/onion.c')
| -rw-r--r-- | src/or/onion.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/onion.c b/src/or/onion.c index 9db9145c7..323e0003e 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -199,6 +199,7 @@ onion_skin_create(crypto_pk_env_t *dest_router_key, /* set meeting point, meeting cookie, etc here. Leave zero for now. */ if (crypto_pk_public_hybrid_encrypt(dest_router_key, onion_skin_out, + ONIONSKIN_CHALLENGE_LEN, challenge, DH_KEY_LEN, PK_PKCS1_OAEP_PADDING, 1)<0) goto err; @@ -241,6 +242,7 @@ onion_skin_server_handshake(const char *onion_skin, /*ONIONSKIN_CHALLENGE_LEN*/ break; note_crypto_pk_op(DEC_ONIONSKIN); len = crypto_pk_private_hybrid_decrypt(k, challenge, + ONIONSKIN_CHALLENGE_LEN, onion_skin, ONIONSKIN_CHALLENGE_LEN, PK_PKCS1_OAEP_PADDING,0); if (len>0) |