aboutsummaryrefslogtreecommitdiff
path: root/src/or/rendservice.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-04-06 09:25:37 -0400
committerNick Mathewson <nickm@torproject.org>2015-04-06 09:25:37 -0400
commitfe69a7e1d7658d3202af0c2c7308d342faaa1559 (patch)
tree9a713f7649647586825075823f456d3d710a4a60 /src/or/rendservice.c
parent3781955f079f25f8d6aa47cb746e339497076050 (diff)
parent7451b4cafededa95da0099ea2444224d941eef52 (diff)
downloadtor-fe69a7e1d7658d3202af0c2c7308d342faaa1559.tar.gz
tor-fe69a7e1d7658d3202af0c2c7308d342faaa1559.zip
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
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 a7c1e32f15..4a8d6c5d7d 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1819,6 +1819,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;