aboutsummaryrefslogtreecommitdiff
path: root/src/or/rendservice.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-04-06 09:26:28 -0400
committerNick Mathewson <nickm@torproject.org>2015-04-06 09:26:28 -0400
commita201a5396e9aef779386216e2a21bfeb75d3d9c6 (patch)
treeb2543378e963b13857dca542d64739f040413ed9 /src/or/rendservice.c
parent24352d0d70542d43588a5c5a6da3f63a317d049d (diff)
parent047555214056da24d682d47562a88e53563e49ff (diff)
downloadtor-a201a5396e9aef779386216e2a21bfeb75d3d9c6.tar.gz
tor-a201a5396e9aef779386216e2a21bfeb75d3d9c6.zip
Merge remote-tracking branch 'origin/maint-0.2.6'
Diffstat (limited to 'src/or/rendservice.c')
-rw-r--r--src/or/rendservice.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 0cad66da6d..c1c0c46d17 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1940,6 +1940,16 @@ rend_service_parse_intro_for_v2(
goto err;
}
+ if (128 != crypto_pk_keysize(extend_info->onion_key)) {
+ if (err_msg_out) {
+ tor_asprintf(err_msg_out,
+ "invalid onion key size in version %d INTRODUCE%d cell",
+ intro->version,
+ (intro->type));
+ }
+
+ goto err;
+ }
ver_specific_len = 7+DIGEST_LEN+2+klen;