added new cpe23 definition for use with new cpeApplicability block which supports only CPE 2.3 format. renamed old cpeId definition to cpe22and23 which is referenced by cpes array and supports both CPE 2.2 and 2.3.

Author: ccoffin

schema/CVE_Record_Format.json

@@ -53,13 +53,20 @@
             "type": "string",
             "pattern": "^CVE-[0-9]{4}-[0-9]{4,19}$"
         },
-        "cpeId": {
+        "cpe22and23": {
             "type": "string",
             "description":"Common Platform Enumeration (CPE) Name in either 2.2 or 2.3 format",
             "pattern": "([c][pP][eE]:/[AHOaho]?(:[A-Za-z0-9._\\-~%]*){0,6})|(cpe:2\\.3:[aho*\\-](:(((\\?*|\\*?)([a-zA-Z0-9\\-._]|(\\\\[\\\\*?!\"#$%&'()+,/:;<=>@\\[\\]\\^`{|}~]))+(\\?*|\\*?))|[*\\-])){5}(:(([a-zA-Z]{2,3}(-([a-zA-Z]{2}|[0-9]{3}))?)|[*\\-]))(:(((\\?*|\\*?)([a-zA-Z0-9\\-._]|(\\\\[\\\\*?!\"#$%&'()+,/:;<=>@\\[\\]\\^`{|}~]))+(\\?*|\\*?))|[*\\-])){4})",
             "minLength": 1,
             "maxLength": 2048
         },
+        "cpe23": {
+            "type": "string",
+            "description":"Common Platform Enumeration (CPE) Name in 2.3 format",
+            "pattern": "(cpe:2\\.3:[aho*\\-](:(((\\?*|\\*?)([a-zA-Z0-9\\-._]|(\\\\[\\\\*?!\"#$%&'()+,/:;<=>@\\[\\]\\^`{|}~]))+(\\?*|\\*?))|[*\\-])){5}(:(([a-zA-Z]{2,3}(-([a-zA-Z]{2}|[0-9]{3}))?)|[*\\-]))(:(((\\?*|\\*?)([a-zA-Z0-9\\-._]|(\\\\[\\\\*?!\"#$%&'()+,/:;<=>@\\[\\]\\^`{|}~]))+(\\?*|\\*?))|[*\\-])){4})",
+            "minLength": 1,
+            "maxLength": 2048
+        },
         "orgId": {
             "description": "A UUID for an organization participating in the CVE program. This UUID can be used to lookup the organization record in the user registry service.",
             "$ref": "#/definitions/uuidType"
@@ -208,7 +215,7 @@
                     "items": {
                         "title": "CPE Name",
                         "description":"Common Platform Enumeration (CPE) Name in either 2.2 or 2.3 format",
-                        "$ref": "#/definitions/cpeId"
+                        "$ref": "#/definitions/cpe22and23"
                     }
                 },
                 "modules": {
@@ -547,7 +554,7 @@
                     "type": "boolean"
                 },
                 "criteria": {
-                    "$ref": "#/definitions/cpeId"
+                    "$ref": "#/definitions/cpe23"
                 },
                 "matchCriteriaId": {
                     "$ref": "#/definitions/uuidType"