Security-59306.61.1.tar.gz

[apple/security.git] / OSX / libsecurity_codesigning / lib / RequirementLexer.cpp

diff --git a/OSX/libsecurity_codesigning/lib/RequirementLexer.cpp b/OSX/libsecurity_codesigning/lib/RequirementLexer.cpp
index 5ed5abea682b8e518bff5719d9e8f22187900ad0..d7f147c3c33c6443e12521e214e96673199bdb3d 100644 (file)
--- a/OSX/libsecurity_codesigning/lib/RequirementLexer.cpp
+++ b/OSX/libsecurity_codesigning/lib/RequirementLexer.cpp
@@ -12,12 +12,26 @@
 #include "requirement.h"
 #include "reqmaker.h"
 #include "csutilities.h"
 #include "requirement.h"
 #include "reqmaker.h"
 #include "csutilities.h"

+#include <libDER/libDER.h>
+#include <libDER/asn1Types.h>

 #include <security_utilities/cfutilities.h>
 #include <security_utilities/hashing.h>
 #include <security_cdsa_utilities/cssmdata.h>  // OID coding
 #include <security_utilities/cfutilities.h>
 #include <security_utilities/hashing.h>
 #include <security_cdsa_utilities/cssmdata.h>  // OID coding

+#include <Security/SecCertificate.h>

 using namespace CodeSigning;
 typedef Requirement::Maker Maker;
 
 using namespace CodeSigning;
 typedef Requirement::Maker Maker;
 

+extern "C" {
+
+/* Decode a choice of UTCTime or GeneralizedTime to a CFAbsoluteTime. Return
+an absoluteTime if the date was valid and properly decoded.  Return
+NULL_TIME otherwise. */
+CFAbsoluteTime SecAbsoluteTimeFromDateContent(DERTag tag, const uint8_t *bytes,
+       size_t length);
+
+}
+
+

 ANTLR_BEGIN_NAMESPACE(Security_CodeSigning)
 RequirementLexer::RequirementLexer(std::istream& in)
        : antlr::CharScanner(new antlr::CharBuffer(in),true)
 ANTLR_BEGIN_NAMESPACE(Security_CodeSigning)
 RequirementLexer::RequirementLexer(std::istream& in)
        : antlr::CharScanner(new antlr::CharBuffer(in),true)


@@ -39,31 +53,35 @@ RequirementLexer::RequirementLexer(const antlr::LexerSharedInputState& state)
 
 void RequirementLexer::initLiterals()
 {
 
 void RequirementLexer::initLiterals()
 {

-       literals["certificate"] = 25;
+       literals["certificate"] = 27;

        literals["always"] = 15;
        literals["host"] = 6;
        literals["guest"] = 5;
        literals["cdhash"] = 20;
        literals["always"] = 15;
        literals["host"] = 6;
        literals["guest"] = 5;
        literals["cdhash"] = 20;

-       literals["entitlement"] = 29;
+       literals["entitlement"] = 31;

        literals["library"] = 8;
        literals["library"] = 8;

+       literals["timestamp"] = 53;
+       literals["legacy"] = 23;

        literals["never"] = 17;
        literals["never"] = 17;

-       literals["cert"] = 26;
+       literals["cert"] = 28;

        literals["plugin"] = 9;
        literals["plugin"] = 9;

+       literals["absent"] = 33;

        literals["or"] = 10;
        literals["or"] = 10;

-       literals["leaf"] = 42;
-       literals["info"] = 28;
+       literals["leaf"] = 45;
+       literals["info"] = 30;

        literals["designated"] = 7;
        literals["designated"] = 7;

-       literals["apple"] = 23;
-       literals["trusted"] = 27;
+       literals["apple"] = 25;
+       literals["trusted"] = 29;

        literals["true"] = 16;
        literals["true"] = 16;

+       literals["notarized"] = 22;

        literals["and"] = 11;
        literals["and"] = 11;

-       literals["root"] = 43;
+       literals["root"] = 46;

        literals["platform"] = 21;
        literals["platform"] = 21;

-       literals["anchor"] = 22;
+       literals["anchor"] = 24;

        literals["false"] = 18;
        literals["false"] = 18;

-       literals["generic"] = 24;
+       literals["generic"] = 26;

        literals["identifier"] = 19;
        literals["identifier"] = 19;

-       literals["exists"] = 30;
+       literals["exists"] = 32;

 }
 
 antlr::RefToken RequirementLexer::nextToken()
 }
 
 antlr::RefToken RequirementLexer::nextToken()


@@ -393,11 +411,11 @@ void RequirementLexer::mIDENT(bool _createToken) {
                }
                default:
                {
                }
                default:
                {

-                       goto _loop47;
+                       goto _loop49;

                }
                }
        }
                }
                }
        }

-       _loop47:;
+       _loop49:;

        } // ( ... )*
        _ttype = testLiteralsTable(text.substr(_begin, text.length()-_begin),_ttype);
        if ( _createToken && _token==antlr::nullToken && _ttype!=antlr::Token::SKIP ) {
        } // ( ... )*
        _ttype = testLiteralsTable(text.substr(_begin, text.length()-_begin),_ttype);
        if ( _createToken && _token==antlr::nullToken && _ttype!=antlr::Token::SKIP ) {


@@ -498,11 +516,11 @@ void RequirementLexer::mDOTKEY(bool _createToken) {
                        }
                }
                else {
                        }
                }
                else {

-                       goto _loop51;
+                       goto _loop53;

                }
                
        }
                }
                
        }

-       _loop51:;
+       _loop53:;

        } // ( ... )*
        _ttype = testLiteralsTable(_ttype);
        if ( _createToken && _token==antlr::nullToken && _ttype!=antlr::Token::SKIP ) {
        } // ( ... )*
        _ttype = testLiteralsTable(_ttype);
        if ( _createToken && _token==antlr::nullToken && _ttype!=antlr::Token::SKIP ) {


@@ -519,18 +537,18 @@ void RequirementLexer::mINTEGER(bool _createToken) {
        std::string::size_type _saveIndex;
        
        { // ( ... )+
        std::string::size_type _saveIndex;
        
        { // ( ... )+

-       int _cnt69=0;
+       int _cnt71=0;

        for (;;) {
                if (((LA(1) >= 0x30 /* '0' */  && LA(1) <= 0x39 /* '9' */ ))) {
                        matchRange('0','9');
                }
                else {
        for (;;) {
                if (((LA(1) >= 0x30 /* '0' */  && LA(1) <= 0x39 /* '9' */ ))) {
                        matchRange('0','9');
                }
                else {

-                       if ( _cnt69>=1 ) { goto _loop69; } else {throw antlr::NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+                       if ( _cnt71>=1 ) { goto _loop71; } else {throw antlr::NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}

                }
                
                }
                

-               _cnt69++;
+               _cnt71++;

        }
        }

-       _loop69:;
+       _loop71:;

        }  // ( ... )+
        if ( _createToken && _token==antlr::nullToken && _ttype!=antlr::Token::SKIP ) {
           _token = makeToken(_ttype);
        }  // ( ... )+
        if ( _createToken && _token==antlr::nullToken && _ttype!=antlr::Token::SKIP ) {
           _token = makeToken(_ttype);


@@ -548,19 +566,19 @@ void RequirementLexer::mPATHNAME(bool _createToken) {
        match("/");
        mIDENT(false);
        { // ( ... )+
        match("/");
        mIDENT(false);
        { // ( ... )+

-       int _cnt54=0;
+       int _cnt56=0;

        for (;;) {
                if ((LA(1) == 0x2f /* '/' */ )) {
                        match("/");
                        mIDENT(false);
                }
                else {
        for (;;) {
                if ((LA(1) == 0x2f /* '/' */ )) {
                        match("/");
                        mIDENT(false);
                }
                else {

-                       if ( _cnt54>=1 ) { goto _loop54; } else {throw antlr::NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+                       if ( _cnt56>=1 ) { goto _loop56; } else {throw antlr::NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}

                }
                
                }
                

-               _cnt54++;
+               _cnt56++;

        }
        }

-       _loop54:;
+       _loop56:;

        }  // ( ... )+
        if ( _createToken && _token==antlr::nullToken && _ttype!=antlr::Token::SKIP ) {
           _token = makeToken(_ttype);
        }  // ( ... )+
        if ( _createToken && _token==antlr::nullToken && _ttype!=antlr::Token::SKIP ) {
           _token = makeToken(_ttype);


@@ -582,18 +600,18 @@ void RequirementLexer::mHASHCONSTANT(bool _createToken) {
        match('\"' /* charlit */ );
        text.erase(_saveIndex);
        { // ( ... )+
        match('\"' /* charlit */ );
        text.erase(_saveIndex);
        { // ( ... )+

-       int _cnt57=0;
+       int _cnt59=0;

        for (;;) {
                if ((_tokenSet_1.member(LA(1)))) {
                        mHEX(false);
                }
                else {
        for (;;) {
                if ((_tokenSet_1.member(LA(1)))) {
                        mHEX(false);
                }
                else {

-                       if ( _cnt57>=1 ) { goto _loop57; } else {throw antlr::NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+                       if ( _cnt59>=1 ) { goto _loop59; } else {throw antlr::NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}

                }
                
                }
                

-               _cnt57++;
+               _cnt59++;

        }
        }

-       _loop57:;
+       _loop59:;

        }  // ( ... )+
        _saveIndex = text.length();
        match('\"' /* charlit */ );
        }  // ( ... )+
        _saveIndex = text.length();
        match('\"' /* charlit */ );


@@ -671,18 +689,18 @@ void RequirementLexer::mHEXCONSTANT(bool _createToken) {
        match('x' /* charlit */ );
        text.erase(_saveIndex);
        { // ( ... )+
        match('x' /* charlit */ );
        text.erase(_saveIndex);
        { // ( ... )+

-       int _cnt60=0;
+       int _cnt62=0;

        for (;;) {
                if ((_tokenSet_1.member(LA(1)))) {
                        mHEX(false);
                }
                else {
        for (;;) {
                if ((_tokenSet_1.member(LA(1)))) {
                        mHEX(false);
                }
                else {

-                       if ( _cnt60>=1 ) { goto _loop60; } else {throw antlr::NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+                       if ( _cnt62>=1 ) { goto _loop62; } else {throw antlr::NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}

                }
                
                }
                

-               _cnt60++;
+               _cnt62++;

        }
        }

-       _loop60:;
+       _loop62:;

        }  // ( ... )+
        if ( _createToken && _token==antlr::nullToken && _ttype!=antlr::Token::SKIP ) {
           _token = makeToken(_ttype);
        }  // ( ... )+
        if ( _createToken && _token==antlr::nullToken && _ttype!=antlr::Token::SKIP ) {
           _token = makeToken(_ttype);


@@ -702,158 +720,27 @@ void RequirementLexer::mSTRING(bool _createToken) {
        text.erase(_saveIndex);
        { // ( ... )*
        for (;;) {
        text.erase(_saveIndex);
        { // ( ... )*
        for (;;) {

-               switch ( LA(1)) {
-               case 0x5c /* '\\' */ :
-               {
+               if ((LA(1) == 0x5c /* '\\' */ )) {

                        {
                        _saveIndex = text.length();
                        match('\\' /* charlit */ );
                        text.erase(_saveIndex);
                        match('\"' /* charlit */ );
                        }
                        {
                        _saveIndex = text.length();
                        match('\\' /* charlit */ );
                        text.erase(_saveIndex);
                        match('\"' /* charlit */ );
                        }

-                       break;

                }
                }

-               case 0x0 /* '\0' */ :
-               case 0x1 /* '\1' */ :
-               case 0x2 /* '\2' */ :
-               case 0x3 /* '\3' */ :
-               case 0x4 /* '\4' */ :
-               case 0x5 /* '\5' */ :
-               case 0x6 /* '\6' */ :
-               case 0x7 /* '\7' */ :
-               case 0x8 /* '\10' */ :
-               case 0x9 /* '\t' */ :
-               case 0xa /* '\n' */ :
-               case 0xb /* '\13' */ :
-               case 0xc /* '\14' */ :
-               case 0xd /* '\r' */ :
-               case 0xe /* '\16' */ :
-               case 0xf /* '\17' */ :
-               case 0x10 /* '\20' */ :
-               case 0x11 /* '\21' */ :
-               case 0x12 /* '\22' */ :
-               case 0x13 /* '\23' */ :
-               case 0x14 /* '\24' */ :
-               case 0x15 /* '\25' */ :
-               case 0x16 /* '\26' */ :
-               case 0x17 /* '\27' */ :
-               case 0x18 /* '\30' */ :
-               case 0x19 /* '\31' */ :
-               case 0x1a /* '\32' */ :
-               case 0x1b /* '\33' */ :
-               case 0x1c /* '\34' */ :
-               case 0x1d /* '\35' */ :
-               case 0x1e /* '\36' */ :
-               case 0x1f /* '\37' */ :
-               case 0x20 /* ' ' */ :
-               case 0x21 /* '!' */ :
-               case 0x23 /* '#' */ :
-               case 0x24 /* '$' */ :
-               case 0x25 /* '%' */ :
-               case 0x26 /* '&' */ :
-               case 0x27 /* '\'' */ :
-               case 0x28 /* '(' */ :
-               case 0x29 /* ')' */ :
-               case 0x2a /* '*' */ :
-               case 0x2b /* '+' */ :
-               case 0x2c /* ',' */ :
-               case 0x2d /* '-' */ :
-               case 0x2e /* '.' */ :
-               case 0x2f /* '/' */ :
-               case 0x30 /* '0' */ :
-               case 0x31 /* '1' */ :
-               case 0x32 /* '2' */ :
-               case 0x33 /* '3' */ :
-               case 0x34 /* '4' */ :
-               case 0x35 /* '5' */ :
-               case 0x36 /* '6' */ :
-               case 0x37 /* '7' */ :
-               case 0x38 /* '8' */ :
-               case 0x39 /* '9' */ :
-               case 0x3a /* ':' */ :
-               case 0x3b /* ';' */ :
-               case 0x3c /* '<' */ :
-               case 0x3d /* '=' */ :
-               case 0x3e /* '>' */ :
-               case 0x3f /* '?' */ :
-               case 0x40 /* '@' */ :
-               case 0x41 /* 'A' */ :
-               case 0x42 /* 'B' */ :
-               case 0x43 /* 'C' */ :
-               case 0x44 /* 'D' */ :
-               case 0x45 /* 'E' */ :
-               case 0x46 /* 'F' */ :
-               case 0x47 /* 'G' */ :
-               case 0x48 /* 'H' */ :
-               case 0x49 /* 'I' */ :
-               case 0x4a /* 'J' */ :
-               case 0x4b /* 'K' */ :
-               case 0x4c /* 'L' */ :
-               case 0x4d /* 'M' */ :
-               case 0x4e /* 'N' */ :
-               case 0x4f /* 'O' */ :
-               case 0x50 /* 'P' */ :
-               case 0x51 /* 'Q' */ :
-               case 0x52 /* 'R' */ :
-               case 0x53 /* 'S' */ :
-               case 0x54 /* 'T' */ :
-               case 0x55 /* 'U' */ :
-               case 0x56 /* 'V' */ :
-               case 0x57 /* 'W' */ :
-               case 0x58 /* 'X' */ :
-               case 0x59 /* 'Y' */ :
-               case 0x5a /* 'Z' */ :
-               case 0x5b /* '[' */ :
-               case 0x5d /* ']' */ :
-               case 0x5e /* '^' */ :
-               case 0x5f /* '_' */ :
-               case 0x60 /* '`' */ :
-               case 0x61 /* 'a' */ :
-               case 0x62 /* 'b' */ :
-               case 0x63 /* 'c' */ :
-               case 0x64 /* 'd' */ :
-               case 0x65 /* 'e' */ :
-               case 0x66 /* 'f' */ :
-               case 0x67 /* 'g' */ :
-               case 0x68 /* 'h' */ :
-               case 0x69 /* 'i' */ :
-               case 0x6a /* 'j' */ :
-               case 0x6b /* 'k' */ :
-               case 0x6c /* 'l' */ :
-               case 0x6d /* 'm' */ :
-               case 0x6e /* 'n' */ :
-               case 0x6f /* 'o' */ :
-               case 0x70 /* 'p' */ :
-               case 0x71 /* 'q' */ :
-               case 0x72 /* 'r' */ :
-               case 0x73 /* 's' */ :
-               case 0x74 /* 't' */ :
-               case 0x75 /* 'u' */ :
-               case 0x76 /* 'v' */ :
-               case 0x77 /* 'w' */ :
-               case 0x78 /* 'x' */ :
-               case 0x79 /* 'y' */ :
-               case 0x7a /* 'z' */ :
-               case 0x7b /* '{' */ :
-               case 0x7c /* '|' */ :
-               case 0x7d /* '}' */ :
-               case 0x7e /* '~' */ :
-               case 0x7f:
-               {
+               else if ((_tokenSet_2.member(LA(1)))) {

                        {
                        {
                        match(_tokenSet_2);
                        }
                        }
                        {
                        {
                        match(_tokenSet_2);
                        }
                        }

-                       break;
-               }
-               default:
-               {
-                       goto _loop66;

                }
                }

+               else {
+                       goto _loop68;

                }
                }

+               

        }
        }

-       _loop66:;
+       _loop68:;

        } // ( ... )*
        _saveIndex = text.length();
        match('\"' /* charlit */ );
        } // ( ... )*
        _saveIndex = text.length();
        match('\"' /* charlit */ );


@@ -1110,7 +997,7 @@ void RequirementLexer::mWS(bool _createToken) {
        std::string::size_type _saveIndex;
        
        { // ( ... )+
        std::string::size_type _saveIndex;
        
        { // ( ... )+

-       int _cnt90=0;
+       int _cnt92=0;

        for (;;) {
                switch ( LA(1)) {
                case 0x20 /* ' ' */ :
        for (;;) {
                switch ( LA(1)) {
                case 0x20 /* ' ' */ :


@@ -1131,12 +1018,12 @@ void RequirementLexer::mWS(bool _createToken) {
                }
                default:
                {
                }
                default:
                {

-                       if ( _cnt90>=1 ) { goto _loop90; } else {throw antlr::NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}
+                       if ( _cnt92>=1 ) { goto _loop92; } else {throw antlr::NoViableAltForCharException(LA(1), getFilename(), getLine(), getColumn());}

                }
                }
                }
                }

-               _cnt90++;
+               _cnt92++;

        }
        }

-       _loop90:;
+       _loop92:;

        }  // ( ... )+
        _ttype = antlr::Token::SKIP;
        if ( _createToken && _token==antlr::nullToken && _ttype!=antlr::Token::SKIP ) {
        }  // ( ... )+
        _ttype = antlr::Token::SKIP;
        if ( _createToken && _token==antlr::nullToken && _ttype!=antlr::Token::SKIP ) {


@@ -1159,11 +1046,11 @@ void RequirementLexer::mSHELLCOMMENT(bool _createToken) {
                        matchNot('\n' /* charlit */ );
                }
                else {
                        matchNot('\n' /* charlit */ );
                }
                else {

-                       goto _loop93;
+                       goto _loop95;

                }
                
        }
                }
                
        }

-       _loop93:;
+       _loop95:;

        } // ( ... )*
        _ttype = antlr::Token::SKIP;
        if ( _createToken && _token==antlr::nullToken && _ttype!=antlr::Token::SKIP ) {
        } // ( ... )*
        _ttype = antlr::Token::SKIP;
        if ( _createToken && _token==antlr::nullToken && _ttype!=antlr::Token::SKIP ) {


@@ -1196,11 +1083,11 @@ void RequirementLexer::mC_COMMENT(bool _createToken) {
                        }
                }
                else {
                        }
                }
                else {

-                       goto _loop99;
+                       goto _loop101;

                }
                
        }
                }
                
        }

-       _loop99:;
+       _loop101:;

        } // ( ... )*
        match("*/");
        _ttype = antlr::Token::SKIP;
        } // ( ... )*
        match("*/");
        _ttype = antlr::Token::SKIP;


@@ -1224,11 +1111,11 @@ void RequirementLexer::mCPP_COMMENT(bool _createToken) {
                        matchNot('\n' /* charlit */ );
                }
                else {
                        matchNot('\n' /* charlit */ );
                }
                else {

-                       goto _loop102;
+                       goto _loop104;

                }
                
        }
                }
                
        }

-       _loop102:;
+       _loop104:;

        } // ( ... )*
        _ttype = antlr::Token::SKIP;
        if ( _createToken && _token==antlr::nullToken && _ttype!=antlr::Token::SKIP ) {
        } // ( ... )*
        _ttype = antlr::Token::SKIP;
        if ( _createToken && _token==antlr::nullToken && _ttype!=antlr::Token::SKIP ) {


@@ -1240,30 +1127,30 @@ void RequirementLexer::mCPP_COMMENT(bool _createToken) {
 }
 
 
 }
 
 

-const unsigned long RequirementLexer::_tokenSet_0_data_[] = { 0UL, 0UL, 134217726UL, 134217726UL, 0UL, 0UL, 0UL, 0UL };
-const antlr::BitSet RequirementLexer::_tokenSet_0(_tokenSet_0_data_,8);
-const unsigned long RequirementLexer::_tokenSet_1_data_[] = { 0UL, 67043328UL, 126UL, 126UL, 0UL, 0UL, 0UL, 0UL };
+const unsigned long RequirementLexer::_tokenSet_0_data_[] = { 0UL, 0UL, 134217726UL, 134217726UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };
+const antlr::BitSet RequirementLexer::_tokenSet_0(_tokenSet_0_data_,10);
+const unsigned long RequirementLexer::_tokenSet_1_data_[] = { 0UL, 67043328UL, 126UL, 126UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };

 // 0 1 2 3 4 5 6 7 8 9 
 // 0 1 2 3 4 5 6 7 8 9 

-const antlr::BitSet RequirementLexer::_tokenSet_1(_tokenSet_1_data_,8);
-const unsigned long RequirementLexer::_tokenSet_2_data_[] = { 4294967295UL, 4294967291UL, 4026531839UL, 4294967295UL, 0UL, 0UL, 0UL, 0UL };
+const antlr::BitSet RequirementLexer::_tokenSet_1(_tokenSet_1_data_,10);
+const unsigned long RequirementLexer::_tokenSet_2_data_[] = { 4294967295UL, 4294967291UL, 4026531839UL, 4294967295UL, 4294967295UL, 4294967295UL, 4294967292UL, 2097151UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };

 // 0x0 0x1 0x2 0x3 0x4 0x5 0x6 0x7 0x8 0x9 0xa 0xb 0xc 0xd 0xe 0xf 0x10 
 // 0x11 0x12 0x13 0x14 0x15 0x16 0x17 0x18 0x19 0x1a 0x1b 0x1c 0x1d 0x1e 
 // 0x0 0x1 0x2 0x3 0x4 0x5 0x6 0x7 0x8 0x9 0xa 0xb 0xc 0xd 0xe 0xf 0x10 
 // 0x11 0x12 0x13 0x14 0x15 0x16 0x17 0x18 0x19 0x1a 0x1b 0x1c 0x1d 0x1e 

-// 0x1f   ! # $ % & \' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 
-const antlr::BitSet RequirementLexer::_tokenSet_2(_tokenSet_2_data_,8);
-const unsigned long RequirementLexer::_tokenSet_3_data_[] = { 4294966271UL, 4294967295UL, 4294967295UL, 4294967295UL, 0UL, 0UL, 0UL, 0UL };
+// 0x1f   ! # $ % & \' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = 
+const antlr::BitSet RequirementLexer::_tokenSet_2(_tokenSet_2_data_,16);
+const unsigned long RequirementLexer::_tokenSet_3_data_[] = { 4294966271UL, 4294967295UL, 4294967295UL, 4294967295UL, 4294967295UL, 4294967295UL, 4294967292UL, 2097151UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };

 // 0x0 0x1 0x2 0x3 0x4 0x5 0x6 0x7 0x8 0x9 0xb 0xc 0xd 0xe 0xf 0x10 0x11 
 // 0x12 0x13 0x14 0x15 0x16 0x17 0x18 0x19 0x1a 0x1b 0x1c 0x1d 0x1e 0x1f 
 // 0x0 0x1 0x2 0x3 0x4 0x5 0x6 0x7 0x8 0x9 0xb 0xc 0xd 0xe 0xf 0x10 0x11 
 // 0x12 0x13 0x14 0x15 0x16 0x17 0x18 0x19 0x1a 0x1b 0x1c 0x1d 0x1e 0x1f 

-//   ! \" # $ % & \' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 
-const antlr::BitSet RequirementLexer::_tokenSet_3(_tokenSet_3_data_,8);
-const unsigned long RequirementLexer::_tokenSet_4_data_[] = { 4294967295UL, 4294934527UL, 4294967295UL, 4294967295UL, 0UL, 0UL, 0UL, 0UL };
+//   ! \" # $ % & \' ( ) * + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = 
+const antlr::BitSet RequirementLexer::_tokenSet_3(_tokenSet_3_data_,16);
+const unsigned long RequirementLexer::_tokenSet_4_data_[] = { 4294967295UL, 4294934527UL, 4294967295UL, 4294967295UL, 4294967295UL, 4294967295UL, 4294967292UL, 2097151UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };

 // 0x0 0x1 0x2 0x3 0x4 0x5 0x6 0x7 0x8 0x9 0xa 0xb 0xc 0xd 0xe 0xf 0x10 
 // 0x11 0x12 0x13 0x14 0x15 0x16 0x17 0x18 0x19 0x1a 0x1b 0x1c 0x1d 0x1e 
 // 0x0 0x1 0x2 0x3 0x4 0x5 0x6 0x7 0x8 0x9 0xa 0xb 0xc 0xd 0xe 0xf 0x10 
 // 0x11 0x12 0x13 0x14 0x15 0x16 0x17 0x18 0x19 0x1a 0x1b 0x1c 0x1d 0x1e 

-// 0x1f   ! \" # $ % & \' ( ) * + , - . 0 1 2 3 4 5 6 7 8 9 
-const antlr::BitSet RequirementLexer::_tokenSet_4(_tokenSet_4_data_,8);
-const unsigned long RequirementLexer::_tokenSet_5_data_[] = { 4294967295UL, 4294966271UL, 4294967295UL, 4294967295UL, 0UL, 0UL, 0UL, 0UL };
+// 0x1f   ! \" # $ % & \' ( ) * + , - . 0 1 2 3 4 5 6 7 8 9 : ; < = 
+const antlr::BitSet RequirementLexer::_tokenSet_4(_tokenSet_4_data_,16);
+const unsigned long RequirementLexer::_tokenSet_5_data_[] = { 4294967295UL, 4294966271UL, 4294967295UL, 4294967295UL, 4294967295UL, 4294967295UL, 4294967292UL, 2097151UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL };

 // 0x0 0x1 0x2 0x3 0x4 0x5 0x6 0x7 0x8 0x9 0xa 0xb 0xc 0xd 0xe 0xf 0x10 
 // 0x11 0x12 0x13 0x14 0x15 0x16 0x17 0x18 0x19 0x1a 0x1b 0x1c 0x1d 0x1e 
 // 0x0 0x1 0x2 0x3 0x4 0x5 0x6 0x7 0x8 0x9 0xa 0xb 0xc 0xd 0xe 0xf 0x10 
 // 0x11 0x12 0x13 0x14 0x15 0x16 0x17 0x18 0x19 0x1a 0x1b 0x1c 0x1d 0x1e 

-// 0x1f   ! \" # $ % & \' ( ) + , - . / 0 1 2 3 4 5 6 7 8 9 
-const antlr::BitSet RequirementLexer::_tokenSet_5(_tokenSet_5_data_,8);
+// 0x1f   ! \" # $ % & \' ( ) + , - . / 0 1 2 3 4 5 6 7 8 9 : ; < = 
+const antlr::BitSet RequirementLexer::_tokenSet_5(_tokenSet_5_data_,16);

 
 ANTLR_END_NAMESPACE
 
 ANTLR_END_NAMESPACE