aboutsummaryrefslogtreecommitdiff
path: root/src/or/rendservice.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-04-06 09:26:16 -0400
committerNick Mathewson <nickm@torproject.org>2015-04-06 09:26:16 -0400
commit047555214056da24d682d47562a88e53563e49ff (patch)
treefcdf1b7cec6e6916a24ab3a7c47db5cf2faae8b0 /src/or/rendservice.c
parent929a8f199bc236c39794f675a7bb8ad00b155257 (diff)
parentfe69a7e1d7658d3202af0c2c7308d342faaa1559 (diff)
downloadtor-047555214056da24d682d47562a88e53563e49ff.tar.gz
tor-047555214056da24d682d47562a88e53563e49ff.zip
Merge remote-tracking branch 'origin/maint-0.2.5' into 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 4ae06dfb90..fbbb2aba17 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;