[tor-commits] [torspec/master] Fix an ambiguity in the grammar for Document.

[nickm at torproject.org]

commit 3e533e974b15d0ad71dca9466efef81f977e6859
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 19 09:06:19 2018 -0400

    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".
---
 dir-spec.txt | 2 ++
 1 file changed, 2 insertions(+)

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