Correct property EBNF for unquoted strings

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/20023)

diff --git a/crypto/property/properties.ebnf b/crypto/property/properties.ebnf
deleted file mode 100644 (file)
index a55198b..0000000
--- a/crypto/property/properties.ebnf
+++ /dev/null
@@ -1,18 +0,0 @@
-(* https://bottlecaps.de/rr/ui *)
-
-Definition
-      ::= PropertyName ( '=' Value )? ( ',' PropertyName ( '=' Value )? )*
-Query ::= PropertyQuery ( ',' PropertyQuery )*
-PropertyQuery ::= '-' PropertyName
-        | '?'? ( PropertyName (( '=' | '!=' ) Value)?)
-Value    ::= NumberLiteral
-        | StringLiteral
-StringLiteral ::= QuotedString | UnquotedString
-QuotedString     ::= '"' [^"]* '"'
-        | "'" [^']* "'"
-UnquotedString ::= [^{space},]+
-NumberLiteral
-     ::= '0' ( [0-7]* | 'x' [0-9A-Fa-f]+ )
-        | '-'? [1-9] [0-9]+
-PropertyName
-         ::= [A-Z] [A-Z0-9_]* ( '.' [A-Z] [A-Z0-9_]* )*

diff --git a/doc/man7/property.pod b/doc/man7/property.pod
index 109336ba47258c5acdcb08b1ac364eac13f1d560..3d6f269d7ff4715dab1c3298c43546f4272cff8b 100644 (file)
--- a/doc/man7/property.pod
+++ b/doc/man7/property.pod
@@ -154,9 +154,9 @@ The lexical syntax in EBNF is given by:
  Value          ::= NumberLiteral | StringLiteral
  StringLiteral  ::= QuotedString | UnquotedString
  QuotedString   ::= '"' [^"]* '"' | "'" [^']* "'"
- UnquotedString ::= [^{space},]+
+ UnquotedString ::= [A-Za-z] [^{space},]+
  NumberLiteral  ::= '0' ( [0-7]* | 'x' [0-9A-Fa-f]+ ) | '-'? [1-9] [0-9]+
- PropertyName   ::= [A-Z] [A-Z0-9_]* ( '.' [A-Z] [A-Z0-9_]* )*
+ PropertyName   ::= [A-Za-z] [A-Za-z0-9_]* ( '.' [A-Za-z] [A-Za-z0-9_]* )*
 
 =head1 HISTORY