encrypted initial values: schema enhancements plus SW device key schema.

Change-Id: Ib0f47fc5c95a785a9d2263a2d0b16da2c1ea7460

diff --git a/doc/example.xml b/doc/example.xml
index c5d2874..7b07961 100644 (file)
--- a/doc/example.xml
+++ b/doc/example.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<InitialValues version="1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="initial_values.xsd ">
+<InitialValues version="1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="initial_values.xsd">
   <Key name="key1" type="RSA_PUB" password="123">
     <PEM>
       -----BEGIN PUBLIC KEY-----

diff --git a/doc/example_device_key.xml b/doc/example_device_key.xml
new file mode 100644 (file)
index 0000000..e191221
--- /dev/null
+++ b/doc/example_device_key.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DeviceKey version="1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="sw_key.xsd ">
+  <RSAPrivateKey>
+    <DER>
+      MIIEpAIBAAKCAQEAyJjUHY2pJJUBRBCrlerrgcS7aBiWlY3594dufu3m4qy48b9hsw1R/AHSNUPU
+      11vzQ+kUcXkEZOby5SHRHBAXIJ1dLbTPtRwsVwgf1nmc/ZGGV/XOrOaKi7nSKgYHaglPgc9dLPuu
+      osRHs/EdIWh3o59MdY6rA6y+QTJrQm3axRKdT7unX3kFS3SsId02GWBkLtrw+yQVtvhCYlY/n2/T
+      uZBJpZN7vT2it0rJS4fQkfjcjAi8f/isZLrfUgDqxIDSWVbVyjlQOphIO+K3ABjev3ZbJMWl+w10
+      pV0nbmF8lviEYft9mhERS9kUdQwzy3KIgyjyt+ewQG6hjyMJ/5y5KwIDAQABAoIBAQC3S06nIoZn
+      su/RLhpbhqljjkxgNfeC+JRsJghFW0UZ4xGrdGDlp0o+p7tYiH63uoFykEvp09a8DHvt+xSEO/+m
+      AaTe2tTgfLnXXMkaxU06Nfs37JfJTW9TdZwgYhnsPk20I7LUI7XTbN7IAY3ItRh9HlZTJOYHGZVP
+      Ja70qES6xUOTaVOvKIbB2W9XeiMX6cNoHTLM9rl1I8bA13Er0M0acKRtF4Rfw4z43nJKzORCYKm3
+      mA3zqtQja7z+zdQBib34RHZiKgvuJDqg89p7FTLT9z+lbXONH+K/3MldaYG1O8mtgt4zv6onH199
+      QBOrww158Z6keH3tBz+xsrClfIpBAoGBAPkar4ugZYLRgyuythby3uHrlMBNajmJf2gFwngvfUgO
+      JS45fLN2AIDrA5VYUiT8cFjVFfzEiu1xa33Juy8rfHlQuY8yOIVDnbdGJvOBYsrvlyYWY+9jEydd
+      cLctQKquACLb3jNYbrC9m8cBBcSZelRAVSF4O1k8HdlcdV7IIVyjAoGBAM4mY5PNLr3I/pyyNizw
+      7cUmHdblU+sScwFdC/KDwfG5WOI3WorTLutD4EiEA3yQIDStuVJLiray4Pu+bqhUPAJumpRrpQJ4
+      PCPxr/M98FhXvMmDWzGu/xK/6hLP5g1Ngp6qvVygnYNBkyqMzfM0rUAxQLS3qmocWk2xBKDEnjHZ
+      AoGBAJkWgVO52yiuQYKVbbpkv/zvnpcf/GwnyBjRkVXzOXcS2l6yDaTsnBqeU7FweespCJJPQhf5
+      YbfSwFCprVOr0e9sYN1T69BaYY7EmiOEHIbC/4z0ra3soVTL4/1u3hMGpCbIIKJFcqFDpXyDcFwG
+      RluIvci37yFEBMQUQj1hmL8pAoGAJBHtfG/7TLO9cRdxiT2CrOs1b2Ni4o+w1b09GOra5XujxLkg
+      u4el/v46YRXQMlxZdj4rXe3f0IXN/d5dKFDMyzQlEfEfxyXYiAWC3tGomxyG6M92BmRzNwmjYDVG
+      MG+ueiqvxWRJCy1PHbPTWUmPQtsbUkOMqtJZLpzZjXO5pkkCgYA9uyQ8os9yfjALc1VDZ4HtGxaC
+      Uq8zy0jJEJxchRn1JUNHop/skaRA65x613lWDygfNCuakozjP5x+GA5WEIuxIE8V7JPac1zpEZW4
+      5nwmxoR1l3HUDT8kRYkLzMIo55PpLG9arNLwH9mSRh/taG8020aGg3nFSNCJNDs12x/9RA==
+    </DER>
+  </RSAPrivateKey>
+</DeviceKey>

diff --git a/doc/initial_values.xsd b/doc/initial_values.xsd
index 69068df..c28c33c 100644 (file)
--- a/doc/initial_values.xsd
+++ b/doc/initial_values.xsd
@@ -52,6 +52,9 @@
                                                <xsd:element name="Base64"
                                                        type="EncodingRawType" maxOccurs="1" minOccurs="1">
                                                </xsd:element>
+                                               <xsd:element name="EncryptedBase64"
+                                                       type="EncodingRawType" maxOccurs="1" minOccurs="1">
+                                               </xsd:element>
                                        </xsd:choice>
                                        <xsd:element name="Permission" type="PermissionType" maxOccurs="unbounded" minOccurs="0"></xsd:element>
                                </xsd:sequence>
@@ -125,4 +128,4 @@
                <xsd:attribute name="accessor" type="xsd:string"></xsd:attribute>
        </xsd:complexType>
 
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>

diff --git a/doc/sw_key.xsd b/doc/sw_key.xsd
new file mode 100644 (file)
index 0000000..d4434b4
--- /dev/null
+++ b/doc/sw_key.xsd
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+       <xsd:element name="DeviceKey" type="DeviceKeyType"></xsd:element>
+
+       <xsd:complexType name="DeviceKeyType">
+               <xsd:sequence maxOccurs="1" minOccurs="1">
+                       <xsd:choice maxOccurs="1" minOccurs="1">
+                               <xsd:element name="RSAPrivateKey" type="RSAPrivateKeyType"
+                                       maxOccurs="1" minOccurs="1">
+                               </xsd:element>
+                       </xsd:choice>
+               </xsd:sequence>
+               <xsd:attribute name="version" type="xsd:int" use="required"></xsd:attribute>
+       </xsd:complexType>
+
+       <xsd:complexType name="RSAPrivateKeyType">
+               <xsd:sequence maxOccurs="1" minOccurs="1">
+                       <xsd:choice maxOccurs="1" minOccurs="1">
+                               <xsd:element name="PEM"
+                                       type="EncodingPemType" maxOccurs="1" minOccurs="1">
+                               </xsd:element>
+                               <xsd:element name="DER"
+                                       type="EncodingDerType" maxOccurs="1" minOccurs="1">
+                               </xsd:element>
+                               <xsd:element name="Base64"
+                                       type="EncodingRawType" maxOccurs="1" minOccurs="1">
+                               </xsd:element>
+                       </xsd:choice>
+               </xsd:sequence>
+       </xsd:complexType>
+
+       <xsd:simpleType name="EncodingDerType">
+               <xsd:restriction base="xsd:string"></xsd:restriction>
+       </xsd:simpleType>
+       <xsd:simpleType name="EncodingPemType">
+               <xsd:restriction base="xsd:string"></xsd:restriction>
+       </xsd:simpleType>
+       <xsd:simpleType name="EncodingRawType">
+               <xsd:restriction base="xsd:string"></xsd:restriction>
+       </xsd:simpleType>
+</xsd:schema>