aboutsummaryrefslogtreecommitdiff
path: root/dir-spec.txt
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-03-19 09:06:19 -0400
committerNick Mathewson <nickm@torproject.org>2018-03-19 09:06:19 -0400
commit3e533e974b15d0ad71dca9466efef81f977e6859 (patch)
tree2c50568cab52c4a484c81749debfe9da70f4c7ed /dir-spec.txt
parent9ebb361fd9b4489165215c7679d54dccfb074860 (diff)
downloadtorspec-3e533e974b15d0ad71dca9466efef81f977e6859.tar.gz
torspec-3e533e974b15d0ad71dca9466efef81f977e6859.zip
Fix an ambiguity in the grammar for Document.
Previously, a BEGIN/END block might be interpreted as starting with the keyword "-----BEGIN". This change specifically disallows that, to match the behavior of the existing Tor code. Fixes bug 25188. Bugfix from "witchof0x20".
Diffstat (limited to 'dir-spec.txt')
-rw-r--r--dir-spec.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/dir-spec.txt b/dir-spec.txt
index 186c4a8..bc17913 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -222,6 +222,8 @@
BeginLine ::= "-----BEGIN " Keyword "-----" NL
EndLine ::= "-----END " Keyword "-----" NL
+ A Keyword may not be "-----BEGIN".
+
The BeginLine and EndLine of an Object must use the same keyword.
When interpreting a Document, software MUST ignore any KeywordLine that