Commit a47bb55dd22efb2d7cdba77638133089e2fe491e

Authored by Igor Kulikov
1 parent 78e00265

Improve PEM certificates processing. Fix lwm2m transport test properties.

1   -transport.lwm2m.security.key_store=lwm2m/credentials/serverKeyStore.jks
2   -transport.lwm2m.security.key_store_password=server
  1 +transport.lwm2m.server.security.credentials.enabled=true
  2 +transport.lwm2m.server.security.credentials.type=KEYSTORE
  3 +transport.lwm2m.server.security.credentials.keystore.store_file=lwm2m/credentials/serverKeyStore.jks
  4 +transport.lwm2m.server.security.credentials.keystore.store_password=server
  5 +transport.lwm2m.server.security.credentials.keystore.key_alias=server
  6 +transport.lwm2m.server.security.credentials.keystore.key_password=server
  7 +transport.lwm2m.bootstrap.security.credentials.enabled=true
  8 +transport.lwm2m.bootstrap.security.credentials.type=KEYSTORE
  9 +transport.lwm2m.bootstrap.security.credentials.keystore.store_file=lwm2m/credentials/serverKeyStore.jks
  10 +transport.lwm2m.bootstrap.security.credentials.keystore.store_password=server
  11 +transport.lwm2m.bootstrap.security.credentials.keystore.key_alias=server
  12 +transport.lwm2m.bootstrap.security.credentials.keystore.key_password=server
  13 +transport.lwm2m.security.trust-credentials.enabled=true
  14 +transport.lwm2m.security.trust-credentials.type=KEYSTORE
  15 +transport.lwm2m.security.trust-credentials.keystore.store_file=lwm2m/credentials/serverKeyStore.jks
  16 +transport.lwm2m.security.trust-credentials.keystore.store_password=server
  17 +
3 18 edges.enabled=true
4 19 edges.storage.no_read_records_sleep=500
5 20 edges.storage.sleep_between_batches=500
6   -transport.lwm2m.server.security.key_alias=server
7   -transport.lwm2m.server.security.key_password=server
8   -transport.lwm2m.bootstrap.security.key_alias=server
9   -transport.lwm2m.bootstrap.security.key_password=server
10   -actors.rpc.sequential=true
\ No newline at end of file
  21 +actors.rpc.sequential=true
... ...
... ... @@ -114,9 +114,11 @@ public class PemSslCredentials extends AbstractSslCredentials {
114 114 }
115 115 KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
116 116 keyStore.load(null);
117   - List<Certificate> unique = certificates.stream().distinct().collect(Collectors.toList());
118   - for (int i = 0; i < unique.size(); i++) {
119   - keyStore.setCertificateEntry("root-" + i, unique.get(i));
  117 + if (trustsOnly) {
  118 + List<Certificate> unique = certificates.stream().distinct().collect(Collectors.toList());
  119 + for (int i = 0; i < unique.size(); i++) {
  120 + keyStore.setCertificateEntry("root-" + i, unique.get(i));
  121 + }
120 122 }
121 123 if (privateKey != null) {
122 124 CertificateFactory factory = CertificateFactory.getInstance("X.509");
... ...