From 192a16daa087ad08cd7ad6ffe07c032f4cf7ff66 Mon Sep 17 00:00:00 2001 From: "David A. Solin" Date: Mon, 16 Jul 2012 15:10:43 -0500 Subject: [PATCH] Renamed experimental NETCONF and JunOS schemas, added implementation notes, and added documentation to the new license test. --- resources/x-junos-schema/notes.txt | 4 + resources/x-netconf-schema/notes.txt | 6 + ...hema.xsd => x-junos-definitions-schema.xsd | 0 ... x-junos-system-characteristics-schema.xsd | 0 ...ma.xsd => x-netconf-definitions-schema.xsd | 0 ...sd => x-netconf-system-characteristics.xsd | 0 x-win-license.xsd | 204 +++++++++++------- 7 files changed, 131 insertions(+), 83 deletions(-) create mode 100755 resources/x-junos-schema/notes.txt create mode 100755 resources/x-netconf-schema/notes.txt rename junos-definitions-schema.xsd => x-junos-definitions-schema.xsd (100%) rename junos-system-characteristics-schema.xsd => x-junos-system-characteristics-schema.xsd (100%) rename netconf-definitions-schema.xsd => x-netconf-definitions-schema.xsd (100%) rename netconf-system-characteristics-schema.xsd => x-netconf-system-characteristics.xsd (100%) diff --git a/resources/x-junos-schema/notes.txt b/resources/x-junos-schema/notes.txt new file mode 100755 index 0000000..a1f99a5 --- /dev/null +++ b/resources/x-junos-schema/notes.txt @@ -0,0 +1,4 @@ +Demonstration code can be downloaded from: http://joval.org/download/mitre + +(The URL is only accessible after "logging on" with a verified email address at +http://joval.org/download). diff --git a/resources/x-netconf-schema/notes.txt b/resources/x-netconf-schema/notes.txt new file mode 100755 index 0000000..e62928d --- /dev/null +++ b/resources/x-netconf-schema/notes.txt @@ -0,0 +1,6 @@ +Demonstration code can be downloaded from: http://joval.org/download/mitre + +Works with Cisco IOS and Juniper JunOS NETCONF-enabled hardware. + +(The URL is only accessible after "logging on" with a verified email address at +http://joval.org/download). diff --git a/junos-definitions-schema.xsd b/x-junos-definitions-schema.xsd similarity index 100% rename from junos-definitions-schema.xsd rename to x-junos-definitions-schema.xsd diff --git a/junos-system-characteristics-schema.xsd b/x-junos-system-characteristics-schema.xsd similarity index 100% rename from junos-system-characteristics-schema.xsd rename to x-junos-system-characteristics-schema.xsd diff --git a/netconf-definitions-schema.xsd b/x-netconf-definitions-schema.xsd similarity index 100% rename from netconf-definitions-schema.xsd rename to x-netconf-definitions-schema.xsd diff --git a/netconf-system-characteristics-schema.xsd b/x-netconf-system-characteristics.xsd similarity index 100% rename from netconf-system-characteristics-schema.xsd rename to x-netconf-system-characteristics.xsd diff --git a/x-win-license.xsd b/x-win-license.xsd index d2c07ed..fd81b2e 100644 --- a/x-win-license.xsd +++ b/x-win-license.xsd @@ -1,83 +1,121 @@ - - - - - - - - The following is a proposal for the experimental win-def:license_test and win-sc:license_item that will support checking the license data on a Windows system. - - Experimental Schema for the Windows License Test - 5.11 - 3/4/2012 8:30:00 PM - Copyright (c) 2002-2012, The MITRE Corporation. All rights reserved. The contents of this file are subject to the terms of the OVAL License located at http://oval.mitre.org/oval/about/termsofuse.html. See the OVAL License for the specific language governing permissions and limitations for use of this schema. When distributing copies of the OVAL Schema, this license header must be included. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + The following is a proposal for the experimental win-def:license_test and win-sc:license_item that will support checking the license data on a Windows system. + + Experimental Schema for the Windows License Test + 5.11 + 3/4/2012 8:30:00 PM + Copyright (c) 2002-2012, The MITRE Corporation. All rights reserved. The contents of this file are subject to the terms of the OVAL License located at http://oval.mitre.org/oval/about/termsofuse.html. See the OVAL License for the specific language governing permissions and limitations for use of this schema. When distributing copies of the OVAL Schema, this license header must be included. + + + + + + + + + + + + + + + The license test is used to check the content of a particular entry in the Windows registry HKLM\SYSTEM\CurrentControlSet\Control\ProductOptions key, ProductPolicy value. Access to this data is exposed by the functions NtQueryLicenseValue (and also, in version 6.0 and higher, ZwQueryLicenseValue) in NTDLL.DLL. + + + + + + + + + + + + + + + The license_object element is used by a license test to define the object to be evaluated. Each object extends the standard ObjectType as defined in the oval-definitions-schema and one should refer to the ObjectType description for more information. The common set element allows complex objects to be created using filters and set logic. Again, please refer to the description of the set element in the oval-definitions-schema. + + + + + + + + + + The name entity provides the address of a UNICODE_STRING structure for the name of the value for which data is desired, for example, TabletPCPlatformInput-core-EnableTouchUI. + + + + + + + + + + + + + + The license_state element defines the different information that can be found in the Windows license registry value. Please refer to the individual elements in the schema for more details about what each represents. + + + + + + + The name entity corresponds to the license_object name entity. + + + + + The optional type entity provides the type of data that is expected: REG_SZ (0x01) for a string; REG_BINARY (0x03) for binary data; REG_DWORD (0x04) for a dword. + + + + + The value entity allows a test to be written against the value held within the specified license entry(-ies). If the value being tested is of type REG_BINARY, then the datatype attribute should be set to 'binary' and the data represented by the value entity should follow the xsd:hexBinary form. (each binary octet is encoded as two hex digits) If the value being tested is of type REG_DWORD, then the datatype attribute should be set to 'int' and the value entity should represent the data as an integer. If the specified registry key is of type REG_SZ, then the datatype should be 'string' and the value entity should be a copy of the string. + Note that if the intent is to test a version number held in the license entry (as a reg_sz) then instead of setting the datatype to 'string', the datatype can be set to 'version'. This allows tools performing the evaluation to know how to perform less than and greater than operations correctly. + + + + + + + + + + + + + + + + + + This element describes the name of a license entry. + + + + + Specifies the type of data stored by the license entry. Valid values are REG_BINARY, REG_DWORD and REG_SZ. Please refer to the EntityItemRegistryTypeType for more information about the different possible types. + + + + + The value entity holds the actual value of the specified license entry. The representation of the value as well as the associated datatype attribute depends on type of data stored in the license entry. If the specified license entry is of type REG_BINARY, then the datatype attribute should be set to 'binary' and the data represented by the value entity should follow the xsd:hexBinary form. (each binary octet is encoded as two hex digits) If the registry key is of type REG_DWORD, then the datatype attribute should be set to 'int' and the value entity should represent the data as an integer. If the specified registry key is of type REG_SZ, then the datatype should be 'string' and the value entity should be a copy of the string. + + + + + + + +