Browse Source

OCF Test certs was appled.

Trishia 4 years ago
parent
commit
9de928e941

OnBoardingTool/app/src/main/assets/pki_certs/ee.pem → OnBoardingTool/app/src/main/assets/pki_certs/kyrio/ee.pem


OnBoardingTool/app/src/main/assets/pki_certs/key.pem → OnBoardingTool/app/src/main/assets/pki_certs/kyrio/key.pem


OnBoardingTool/app/src/main/assets/pki_certs/subca1.pem → OnBoardingTool/app/src/main/assets/pki_certs/kyrio/subca1.pem


+ 14 - 0
OnBoardingTool/app/src/main/assets/pki_certs/ocf/ee.pem

@@ -0,0 +1,14 @@
+-----BEGIN CERTIFICATE-----
+MIICGDCCAb6gAwIBAgIII37ixAo/lAowCgYIKoZIzj0EAwIwIjEMMAoGA1UEChMD
+T0NGMRIwEAYDVQQDEwlUZXN0U3ViQ0EwHhcNMjAwOTE2MDU0MTQ3WhcNMjAxMDE2
+MDU0MTQ3WjBCMQwwCgYDVQQKEwNPQ0YxMjAwBgNVBAMTKXV1aWQ9YmY4MGQyODIt
+Yjc5Zi00MDIzLWJhZGMtOGFlMGQzYjJlY2IwMFkwEwYHKoZIzj0CAQYIKoZIzj0D
+AQcDQgAE1jCO1r84tykKP0Ysyt/euoAoWK6lPOjo1kIr5wyTK69fVTGoHyeSzKKO
+94V/cnNrmU7pT3Log7AlsjDpcUYnbaOBvTCBujAOBgNVHQ8BAf8EBAMCA4gwGAYD
+VR0gBBEwDzANBgsrBgEEAYORVgABAjBjBgorBgEEAYORVgEABFUwUzAJAgECAgEC
+AgEAMDYMGTEuMy42LjEuNC4xLjUxNDE0LjAuMC4xLjAMGTEuMy42LjEuNC4xLjUx
+NDE0LjAuMC4yLjAMA09CVAwJSU1Tb2Z0TGFiMCkGA1UdJQQiMCAGCCsGAQUFBwMC
+BggrBgEFBQcDAQYKKwYBBAGC3nwBBjAKBggqhkjOPQQDAgNIADBFAiB3UoekvS0I
+9wBWm/iBsolI2OhdIU6ieZkn35SPSKVYZQIhAKvvaLZvXvoxPF1dkDuQZS2Vnh/v
+UvrCHDrlH4WiFex2
+-----END CERTIFICATE-----

+ 4 - 0
OnBoardingTool/app/src/main/assets/pki_certs/ocf/key.pem

@@ -0,0 +1,4 @@
+-----BEGIN PRIVATE KEY-----
+MEECAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQcEJzAlAgEBBCCq2v2yDKjeJqhk9Wy+
+LXkmRjEmOrj1AFNqvvhWWNUQPw==
+-----END PRIVATE KEY-----

+ 10 - 0
OnBoardingTool/app/src/main/assets/pki_certs/ocf/subca3.pem

@@ -0,0 +1,10 @@
+-----BEGIN CERTIFICATE-----
+MIIBZDCCAQmgAwIBAgIIfp2/qwPO8sYwCgYIKoZIzj0EAwIwIzEMMAoGA1UEChMD
+T0NGMRMwEQYDVQQDEwpUZXN0Um9vdENBMCAXDTE5MDIwMzAwMjU0OFoYDzIwNjkw
+MTI2MDMzMTQwWjAiMQwwCgYDVQQKEwNPQ0YxEjAQBgNVBAMTCVRlc3RTdWJDQTBZ
+MBMGByqGSM49AgEGCCqGSM49AwEHA0IABNswvt7mRgP/24Pz28/vDvGZxlG1qMu0
+iDrYTqJPGhH+Ku1zfZDbT5LE+mgFgGSqMVOpqb8T3M9Qa6czeBKZv/WjJjAkMA4G
+A1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMAoGCCqGSM49BAMCA0kA
+MEYCIQCmuI4C0Gq/SQ2Jqz/B9htyyNVdusm4or7xv7jzsPooWAIhAIJ6nUDAbtig
+TsVL4WvbWGJLw/S/1cC8lP93PonGjQq0
+-----END CERTIFICATE-----

+ 5 - 5
OnBoardingTool/app/src/main/java/org/iotivity/onboardingtool/FactoryPresetsHandler.java

@@ -38,14 +38,14 @@ public class FactoryPresetsHandler implements OCFactoryPresetsHandler {
     private void setPKISecurityMfgCert(long deviceIndex) {
     private void setPKISecurityMfgCert(long deviceIndex) {
 
 
         // load End Endtity cert
         // load End Endtity cert
-        byte[] cert = getFileBytes("pki_certs/ee.pem");
+        byte[] cert = getFileBytes("pki_certs/ocf/ee.pem");
         if (cert == null) {
         if (cert == null) {
             Log.e(TAG, "Failed to read certificates");
             Log.e(TAG, "Failed to read certificates");
             return;
             return;
         }
         }
 
 
         // load End Endtity private key
         // load End Endtity private key
-        byte[] key = getFileBytes("pki_certs/key.pem");
+        byte[] key = getFileBytes("pki_certs/ocf/key.pem");
         if (key == null) {
         if (key == null) {
             Log.e(TAG, "Failed to read private key");
             Log.e(TAG, "Failed to read private key");
             return;
             return;
@@ -60,7 +60,7 @@ public class FactoryPresetsHandler implements OCFactoryPresetsHandler {
         }
         }
 
 
         // load Sub CA
         // load Sub CA
-        byte[] subCa = getFileBytes("pki_certs/subca1.pem");
+        byte[] subCa = getFileBytes("pki_certs/ocf/subca3.pem");
         if (subCa == null) {
         if (subCa == null) {
             Log.e(TAG, "Failed to read sub ca cetificate");
             Log.e(TAG, "Failed to read sub ca cetificate");
             return;
             return;
@@ -88,7 +88,7 @@ public class FactoryPresetsHandler implements OCFactoryPresetsHandler {
             return;
             return;
         }
         }
 
 
-        // load Root CA 2
+        /*// load Root CA 2
         byte[] rootCa2 = getFileBytes("pki_certs/rootca2.pem");
         byte[] rootCa2 = getFileBytes("pki_certs/rootca2.pem");
         if (rootCa2 == null) {
         if (rootCa2 == null) {
             Log.e(TAG, "Failed to read root ca2 certificate");
             Log.e(TAG, "Failed to read root ca2 certificate");
@@ -102,7 +102,7 @@ public class FactoryPresetsHandler implements OCFactoryPresetsHandler {
             Log.e(TAG, "Error installing root ca2 certificate");
             Log.e(TAG, "Error installing root ca2 certificate");
             return;
             return;
         }
         }
-
+        */
         // load Root CA 3
         // load Root CA 3
         byte[] rootCa3 = getFileBytes("pki_certs/rootca3.pem");
         byte[] rootCa3 = getFileBytes("pki_certs/rootca3.pem");
         if (rootCa3 == null) {
         if (rootCa3 == null) {