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/or/rendservice.c | |
| 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/or/rendservice.c')
| -rw-r--r-- | src/or/rendservice.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 9f775ef842..9f364b0a85 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -929,7 +929,8 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request, /* Next N bytes is encrypted with service key */ note_crypto_pk_op(REND_SERVER); r = crypto_pk_private_hybrid_decrypt( - intro_key,buf,(char*)(request+DIGEST_LEN),request_len-DIGEST_LEN, + intro_key,buf,sizeof(buf), + (char*)(request+DIGEST_LEN),request_len-DIGEST_LEN, PK_PKCS1_OAEP_PADDING,1); if (r<0) { log_warn(LD_PROTOCOL, "Couldn't decrypt INTRODUCE2 cell."); @@ -1366,7 +1367,8 @@ rend_service_intro_has_opened(origin_circuit_t *circuit) goto err; len += 20; note_crypto_pk_op(REND_SERVER); - r = crypto_pk_private_sign_digest(intro_key, buf+len, buf, len); + r = crypto_pk_private_sign_digest(intro_key, buf+len, sizeof(buf)-len, + buf, len); if (r<0) { log_warn(LD_BUG, "Internal error: couldn't sign introduction request."); reason = END_CIRC_REASON_INTERNAL; |