Merge branch 'origin/master' into fargo

Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>

.gitattributes

@@ -12,10 +12,12 @@
 *.vcxproj text eol=crlf
 *.vcxproj.filters text eol=crlf
 *.vcxproj.user text eol=crlf
+*.cmd text eol=crlf
+*.bat text eol=crlf
 
 # Declare files that will always have LF line endings on checkout.
 *.pem text eol=lf
 
 # Denote all files that are truly binary and should not be modified.
 *.png binary
-*.jpg binary
\ No newline at end of file
+*.jpg binary

README.rst

@@ -307,7 +307,7 @@ discover each other and run without difficulty.
 Send Feedback
 -------------------------------------------------
 Questions
-`IoTivity-Lite Developer Mailing List <https://iotivity-dev@lists.iotivity.org>`_
+`IoTivity-Lite Developer Mailing List <https://iotivity.groups.io/g/iotivity-dev>`_
 
 Bugs
-`Jira bug reporting website <https://jira.iotivity.org/projects/LITE>`_
+`Gitlab issues <https://gitlab.iotivity.org/iotivity/iotivity-lite/issues>`_

api/oc_main.c

@@ -233,12 +233,18 @@ oc_main_init(const oc_handler_t *handler)
   size_t device;
   for (device = 0; device < oc_core_get_num_devices(); device++) {
     oc_sec_load_unique_ids(device);
+    OC_DBG("oc_main_init(): loading pstat");
     oc_sec_load_pstat(device);
+    OC_DBG("oc_main_init(): loading doxm");
     oc_sec_load_doxm(device);
+    OC_DBG("oc_main_init(): loading cred");
     oc_sec_load_cred(device);
+    OC_DBG("oc_main_init(): loading acl");
     oc_sec_load_acl(device);
+    OC_DBG("oc_main_init(): loading sp");
     oc_sec_load_sp(device);
 #ifdef OC_PKI
+    OC_DBG("oc_main_init(): loading ECDSA keypair");
     oc_sec_load_ecdsa_keypair(device);
 #endif /* OC_PKI */
   }

apps/pki_certs/ee.pem

 -----BEGIN CERTIFICATE-----
-MIIEHDCCA8GgAwIBAgIJAI0K+3tTsk0lMAoGCCqGSM49BAMCMFsxDDAKBgNVBAoM
+MIIEGzCCA8KgAwIBAgIJAI0K+3tTsk13MAoGCCqGSM49BAMCMFsxDDAKBgNVBAoM
 A09DRjEiMCAGA1UECwwZS3lyaW8gVGVzdCBJbmZyYXN0cnVjdHVyZTEnMCUGA1UE
-AwweS3lyaW8gVEVTVCBJbnRlcm1lZGlhdGUgQ0EwMDAyMB4XDTE5MTExMzIzMTUx
-NFoXDTE5MTIxMzIzMTUxNFowYTEMMAoGA1UECgwDT0NGMSIwIAYDVQQLDBlLeXJp
-byBUZXN0IEluZnJhc3RydWN0dXJlMS0wKwYDVQQDDCQxM2UxNmI1NS02YTAyLTRi
-YjgtYTdiMC0wMjJkODdkMDdmYWYwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATs
-aQuW1f9appD2JJP5FpBeftRMJ+5HtI6S396E7MOfrSwUEFImNdmMGtpcp5mzVb0V
-dqveeTm0C4o4JoAMC4xBo4ICZjCCAmIwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMC
+AwweS3lyaW8gVEVTVCBJbnRlcm1lZGlhdGUgQ0EwMDAyMB4XDTIwMDEyMjE4MDU1
+NFoXDTIwMDIyMTE4MDU1NFowYTEMMAoGA1UECgwDT0NGMSIwIAYDVQQLDBlLeXJp
+byBUZXN0IEluZnJhc3RydWN0dXJlMS0wKwYDVQQDDCQxMzkyNTVmMC01NmIwLTQx
+YWMtYTM2YS1lMWU2ZWNlZWUxOGYwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASS
+WU61vywYFtJPLT7MIp8KxjeCrY0H4TQbPLlXEoV9arjVaEqIuQzZA1H3WvY8sDiM
+5AGsnaOsL16u+ySTPGaCo4ICZzCCAmMwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMC
 A4gwKQYDVR0lBCIwIAYIKwYBBQUHAwIGCCsGAQUFBwMBBgorBgEEAYLefAEGMB0G
-A1UdDgQWBBQoJ2Jef34S2UNq8wM/YmbnwrVLEDAfBgNVHSMEGDAWgBQZc2oEGgsH
+A1UdDgQWBBSd5Da4Qns+TbSeXRWl99r75h9xnzAfBgNVHSMEGDAWgBQZc2oEGgsH
 cE9TeVM2h/wMunyuCzCBlgYIKwYBBQUHAQEEgYkwgYYwXQYIKwYBBQUHMAKGUWh0
 dHA6Ly90ZXN0cGtpLmt5cmlvLmNvbS9vY2YvY2FjZXJ0cy9CQkU2NEY5QTdFRTM3
 RDI5QTA1RTRCQjc3NTk1RjMwOEJFNDFFQjA3LmNydDAlBggrBgEFBQcwAYYZaHR0
 cDovL3Rlc3RvY3NwLmt5cmlvLmNvbTBfBgNVHR8EWDBWMFSgUqBQhk5odHRwOi8v
 dGVzdHBraS5reXJpby5jb20vb2NmL2NybHMvQkJFNjRGOUE3RUUzN0QyOUEwNUU0
 QkI3NzU5NUYzMDhCRTQxRUIwNy5jcmwwGAYDVR0gBBEwDzANBgsrBgEEAYORVgAB
-AjBoBgorBgEEAYORVgEABFowWDAJAgECAgEAAgEAMDYMGTEuMy42LjEuNC4xLjUx
-NDE0LjAuMC4xLjAMGTEuMy42LjEuNC4xLjUxNDE0LjAuMC4yLjAMBExpdGUMDUlv
-dGl2aXR5X2xpdGUwKgYKKwYBBAGDkVYBAQQcMBoGCysGAQQBg5FWAQEABgsrBgEE
-AYORVgEBATAwBgorBgEEAYORVgECBCIwIAwOMS4zLjYuMS40LjEuNzEMCURpc2Nv
-dmVyeQwDMS4wMAoGCCqGSM49BAMCA0kAMEYCIQCpw0YBJMoTelnH93YAdc/B7A+c
-zgXw1ui2aEief9Jx+wIhAJEFw3cGJpPXQxyYZWZs9zVvNkgDCvP8q1DzSQesSIb4
+AjBpBgorBgEEAYORVgEABFswWTAJAgECAgEAAgEAMDYMGTEuMy42LjEuNC4xLjUx
+NDE0LjAuMC4xLjAMGTEuMy42LjEuNC4xLjUxNDE0LjAuMC4yLjAMDUlvVGl2aXR5
+LUxpdGUMBUludGVsMCoGCisGAQQBg5FWAQEEHDAaBgsrBgEEAYORVgEBAAYLKwYB
+BAGDkVYBAQEwMAYKKwYBBAGDkVYBAgQiMCAMDjEuMy42LjEuNC4xLjcxDAlEaXNj
+b3ZlcnkMAzEuMDAKBggqhkjOPQQDAgNHADBEAiAGrNc1XWq+PtJjXjhuGplzFjrS
+ngGyRletSbgsNnxuhgIgJ5vROhQqPJQA9xKAO3SAc20646dUF34l0wiRSRfUnzE=
 -----END CERTIFICATE-----

apps/pki_certs/key.pem

@@ -2,7 +2,7 @@
 BggqhkjOPQMBBw==
 -----END EC PARAMETERS-----
 -----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILFesaeLBYcK6duitU94n3yMr7oiGOTiTcyXAbJVcvnloAoGCCqGSM49
-AwEHoUQDQgAE7GkLltX/WqaQ9iST+RaQXn7UTCfuR7SOkt/ehOzDn60sFBBSJjXZ
-jBraXKeZs1W9FXar3nk5tAuKOCaADAuMQQ==
+MHcCAQEEIAeACxwKCL4K8fWzGYYe1ZKm3glUcKo+0vdB4HGR8IcyoAoGCCqGSM49
+AwEHoUQDQgAEkllOtb8sGBbSTy0+zCKfCsY3gq2NB+E0Gzy5VxKFfWq41WhKiLkM
+2QNR91r2PLA4jOQBrJ2jrC9ervskkzxmgg==
 -----END EC PRIVATE KEY-----

port/linux/ipadapter.c

@@ -645,7 +645,9 @@ process_interface_change_event(void)
   }
 
   if (if_state_changed) {
+#ifdef OC_SECURITY
     oc_close_all_tls_sessions();
+#endif /* OC_SECURITY */
     for (i = 0; i < num_devices; i++) {
       ip_context_t *dev = get_ip_context_for_device(i);
       oc_network_event_handler_mutex_lock();

security/oc_cred.c

@@ -84,9 +84,9 @@ oc_sec_get_cred_by_credid(int credid, size_t device)
   return NULL;
 }
 
-static bool
-unique_credid(int credid, bool roles_resource, oc_tls_peer_t *client,
-              size_t device)
+static oc_sec_cred_t *
+is_existing_cred(int credid, bool roles_resource, oc_tls_peer_t *client,
+                 size_t device)
 {
   oc_sec_cred_t *cred = NULL;
   (void)client;
@@ -100,11 +100,12 @@ unique_credid(int credid, bool roles_resource, oc_tls_peer_t *client,
   }
 #endif /* OC_PKI */
   while (cred != NULL) {
-    if (cred->credid == credid)
-      return false;
+    if (cred->credid == credid) {
+      break;
+    }
     cred = cred->next;
   }
-  return true;
+  return cred;
 }
 
 #if defined(OC_CLIENT) && defined(OC_PKI)
@@ -144,7 +145,7 @@ get_new_credid(bool roles_resource, oc_tls_peer_t *client, size_t device)
   int credid;
   do {
     credid = oc_random_value() >> 1;
-  } while (!unique_credid(credid, roles_resource, client, device));
+  } while (is_existing_cred(credid, roles_resource, client, device));
   return credid;
 }
 
@@ -421,10 +422,27 @@ oc_sec_add_new_cred(size_t device, bool roles_resource, oc_tls_peer_t *client,
   }
 #endif /* OC_PKI */
 
-  if (!unique_credid(credid, roles_resource, client, device)) {
+  oc_sec_cred_t *existing =
+    is_existing_cred(credid, roles_resource, client, device);
+  if (existing) {
     if (!roles_resource) {
       /* remove duplicate cred, if one exists.  */
-      oc_sec_remove_cred_by_credid(credid, device);
+      if ((existing->credtype == credtype) &&
+          memcmp(&existing->subjectuuid, &subject, sizeof(oc_uuid_t)) == 0 &&
+          ((oc_string_len(existing->privatedata.data) == privatedata_size) &&
+           (memcmp(oc_string(existing->privatedata.data), privatedata,
+                   privatedata_size) == 0))
+#ifdef OC_PKI
+          && (existing->credusage == credusage) &&
+          ((oc_string_len(existing->publicdata.data) == publicdata_size) &&
+           (memcmp(oc_string(existing->publicdata.data), publicdata,
+                   publicdata_size) == 0))
+#endif /* OC_PKI */
+      ) {
+        return credid;
+      } else {
+        oc_sec_remove_cred_by_credid(credid, device);
+      }
     }
 #ifdef OC_PKI
     else {

security/oc_obt.c

@@ -2656,9 +2656,11 @@ oc_obt_init(void)
         private_key_size);
       if (root_cert_credid > 0) {
         oc_obt_dump_state();
+        OC_DBG("oc_obt: successfully returning from obt_init()");
         return 0;
       }
     }
+    OC_DBG("oc_obt: returning from oc_obt() with errors");
     return -1;
 #endif /* OC_PKI */
   } else {
@@ -2666,6 +2668,7 @@ oc_obt_init(void)
     oc_obt_load_state();
 #endif /* OC_PKI */
   }
+  OC_DBG("oc_obt: successfully returning from obt_init()");
   return 0;
 }
 

swig/apps/oc/java_oc_simple_server/run-simple-server-lite.cmd

-java -Djava.library.path=..\..\..\iotivity-lite-java\libs -cp simple-server-lite.jar;..\..\..\iotivity-lite-java\libs\iotivity-lite.jar java_oc_simple_server.Server
+java -Djava.library.path=..\..\..\iotivity-lite-java\libs -cp simple-server-lite.jar;..\..\..\iotivity-lite-java\libs\iotivity-lite.jar java_oc_simple_server.Server