|
@@ -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) {
|