Quellcode durchsuchen

OCF Test cert's Root CA was added.

Trishia vor 4 Jahren
Ursprung
Commit
3c367a209c

+ 10 - 0
app/src/main/assets/pki_certs/rootca3.pem

@@ -0,0 +1,10 @@
+-----BEGIN CERTIFICATE-----
+MIIBYDCCAQegAwIBAgIIL0XxghPsq3IwCgYIKoZIzj0EAwIwIzEMMAoGA1UEChMD
+T0NGMRMwEQYDVQQDEwpUZXN0Um9vdENBMCAXDTE5MDEyNjAzMzE0MVoYDzIwNjkw
+MTI2MDMzMTQxWjAjMQwwCgYDVQQKEwNPQ0YxEzARBgNVBAMTClRlc3RSb290Q0Ew
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASTJlur3UWmRc7kvFCFiaFtOqiG8lYG
+p68OjW7rp3ZJg5/Ikit/aLw7uIjk/DiO8m9rGAAz8F8GngMZV3WGTBuxoyMwITAO
+BgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNHADBE
+AiA+EX8rODCjtnpSrRRdDgOBg6T6/7LEbSi0Yr7yjm78iwIgR/Pp2bQTHhbvwcBF
+alBvvEsqG37QCoAuTyg7spcZDoQ=
+-----END CERTIFICATE-----

+ 28 - 13
app/src/main/java/org/iotivity/bridge/homeserver/handler/FactoryPresetsHandler.java

@@ -38,19 +38,6 @@ public class FactoryPresetsHandler implements OCFactoryPresetsHandler {
     }
 
     private void setPKISecurityMfgCert(long deviceIndex) {
-        // load Root CA
-        byte[] rootCa = getFileBytes("pki_certs/rootca1.pem");
-        if (rootCa == null) {
-            Log.e(TAG, "Failed to read root ca cetificate");
-            return;
-        }
-        // add Root CA
-        int rootCaCredId = OCPki.addMfgTrustAnchor(deviceIndex, rootCa);
-        Log.d(TAG, "addMfgTrustAnchor() result = " + rootCaCredId);
-        if (rootCaCredId < 0) {
-            Log.e(TAG, "Error installing root ca certificate");
-            return;
-        }
 
         // load End Endtity cert
         byte[] cert = getFileBytes("pki_certs/ee.pem");
@@ -88,6 +75,34 @@ public class FactoryPresetsHandler implements OCFactoryPresetsHandler {
             return;
         }
 
+        // load Root CA
+        byte[] rootCa = getFileBytes("pki_certs/rootca1.pem");
+        if (rootCa == null) {
+            Log.e(TAG, "Failed to read root ca cetificate");
+            return;
+        }
+        // add Root CA
+        int rootCaCredId = OCPki.addMfgTrustAnchor(deviceIndex, rootCa);
+        Log.d(TAG, "addMfgTrustAnchor() result = " + rootCaCredId);
+        if (rootCaCredId < 0) {
+            Log.e(TAG, "Error installing root ca certificate");
+            return;
+        }
+
+        //load Root CA 3
+        rootCa = getFileBytes("pki_certs/rootca3.pem");
+        if (rootCa == null) {
+            Log.e(TAG, "Failed to read root ca cetificate");
+            return;
+        }
+        // add Root CA 3
+        rootCaCredId = OCPki.addMfgTrustAnchor(deviceIndex, rootCa);
+        Log.d(TAG, "addMfgTrustAnchor() result = " + rootCaCredId);
+        if (rootCaCredId < 0) {
+            Log.e(TAG, "Error installing root ca certificate");
+            return;
+        }
+
         OCPki.setSecurityProfile(deviceIndex, OCSpTypesMask.BLACK, OCSpTypesMask.BLACK, eeCredId);
         Log.d(TAG, "setSecurityProfile()");