Merge branch 'security-summit' into 'master'

* security-summit:
  Added AMS functionality to support on-demand ACL provisioning.
  Added Android support for Provisioning APIs
  Quick fix on getting secure port information

Conflicts:
	android/android_api/base/jni/JniOcStack.cpp
	android/examples/settings.gradle
	resource/csdk/security/include/internal/secureresourcemanager.h
	resource/csdk/security/src/secureresourcemanager.c

Change-Id: I57d1157e4c1e74425fe27757e7dfa8a4ef8d427a
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>

diff --cc android/android_api/base/jni/JniOcStack.cpp
index 61086b5,9884732..affc4dd
--- 1/android/android_api/base/jni/JniOcStack.cpp
--- 2/android/android_api/base/jni/JniOcStack.cpp
+++ b/android/android_api/base/jni/JniOcStack.cpp
@@@ -25,70 -25,87 +25,85 @@@
  #include "OCRepresentation.h"
  #include "JniUtils.h"
  
 -JavaVM* g_jvm = NULL;
 -
 -jclass g_cls_Integer = NULL;
 -jclass g_cls_int1DArray = NULL;
 -jclass g_cls_int2DArray = NULL;
 -jclass g_cls_Double = NULL;
 -jclass g_cls_double1DArray = NULL;
 -jclass g_cls_double2DArray = NULL;
 -jclass g_cls_Boolean = NULL;
 -jclass g_cls_boolean1DArray = NULL;
 -jclass g_cls_boolean2DArray = NULL;
 -jclass g_cls_String = NULL;
 -jclass g_cls_String1DArray = NULL;
 -jclass g_cls_String2DArray = NULL;
 -jclass g_cls_LinkedList = NULL;
 -jclass g_cls_Map = NULL;
 -jclass g_cls_MapEntry = NULL;
 -jclass g_cls_Set = NULL;
 -jclass g_cls_Iterator = NULL;
 -jclass g_cls_HashMap = NULL;
 -jclass g_cls_OcException = NULL;
 -jclass g_cls_OcResource = NULL;
 -jclass g_cls_OcRepresentation = NULL;
 -jclass g_cls_OcRepresentation1DArray = NULL;
 -jclass g_cls_OcRepresentation2DArray = NULL;
 -jclass g_cls_OcResourceRequest = NULL;
 -jclass g_cls_OcResourceResponse = NULL;
 -jclass g_cls_OcResourceHandle = NULL;
 -jclass g_cls_OcPresenceHandle = NULL;
 -jclass g_cls_OcRequestHandle = NULL;
 -jclass g_cls_OcPresenceStatus = NULL;
 -jclass g_cls_OcHeaderOption = NULL;
 -jclass g_cls_ObservationInfo = NULL;
 -jclass g_cls_OcResourceIdentifier = NULL;
 -
 -jclass g_cls_OcProvisionResult = NULL;
 -jclass g_cls_OcSecureResource = NULL;
 -jclass g_cls_OcOicSecAcl = NULL;
 -
 -jmethodID g_mid_Integer_ctor = NULL;
 -jmethodID g_mid_Double_ctor = NULL;
 -jmethodID g_mid_Boolean_ctor = NULL;
 -jmethodID g_mid_LinkedList_ctor = NULL;
 -jmethodID g_mid_LinkedList_add_object = NULL;
 -jmethodID g_mid_Map_entrySet = NULL;
 -jmethodID g_mid_MapEntry_getKey = NULL;
 -jmethodID g_mid_MapEntry_getValue = NULL;
 -jmethodID g_mid_Set_iterator = NULL;
 -jmethodID g_mid_Iterator_hasNext = NULL;
 -jmethodID g_mid_Iterator_next = NULL;
 -jmethodID g_mid_HashMap_ctor = NULL;
 -jmethodID g_mid_HashMap_put = NULL;
 -jmethodID g_mid_OcException_ctor = NULL;
 -jmethodID g_mid_OcException_setNativeExceptionLocation = NULL;
 -jmethodID g_mid_OcResource_ctor = NULL;
 -jmethodID g_mid_OcRepresentation_N_ctor = NULL;
 -jmethodID g_mid_OcRepresentation_N_ctor_bool = NULL;
 -jmethodID g_mid_OcResourceRequest_N_ctor = NULL;
 -jmethodID g_mid_OcResourceResponse_N_ctor = NULL;
 -jmethodID g_mid_OcResourceHandle_N_ctor = NULL;
 -jmethodID g_mid_OcPresenceHandle_N_ctor = NULL;
 -jmethodID g_mid_OcRequestHandle_N_ctor = NULL;
 -jmethodID g_mid_OcHeaderOption_ctor = NULL;
 -jmethodID g_mid_OcHeaderOption_get_id = NULL;
 -jmethodID g_mid_OcHeaderOption_get_data = NULL;
 -jmethodID g_mid_ObservationInfo_N_ctor = NULL;
 -jmethodID g_mid_OcPresenceStatus_get = NULL;
 -jmethodID g_mid_OcResourceIdentifier_N_ctor = NULL;
 -
 -jmethodID g_mid_OcProvisionResult_ctor = NULL;
 -jmethodID g_mid_OcSecureResource_ctor = NULL;
 -
 -jmethodID g_mid_OcOicSecAcl_get_subject = NULL;
 -jmethodID g_mid_OcOicSecAcl_get_resources_cnt = NULL;
 -jmethodID g_mid_OcOicSecAcl_get_resources = NULL;
 -jmethodID g_mid_OcOicSecAcl_get_permission = NULL;
 -jmethodID g_mid_OcOicSecAcl_get_periods_cnt = NULL;
 -jmethodID g_mid_OcOicSecAcl_get_periods = NULL;
 -jmethodID g_mid_OcOicSecAcl_get_recurrences = NULL;
 -jmethodID g_mid_OcOicSecAcl_get_owners_cnt = NULL;
 -jmethodID g_mid_OcOicSecAcl_get_owners = NULL;
 +JavaVM* g_jvm = nullptr;
 +
 +jclass g_cls_Integer = nullptr;
 +jclass g_cls_int1DArray = nullptr;
 +jclass g_cls_int2DArray = nullptr;
 +jclass g_cls_Double = nullptr;
 +jclass g_cls_double1DArray = nullptr;
 +jclass g_cls_double2DArray = nullptr;
 +jclass g_cls_Boolean = nullptr;
 +jclass g_cls_boolean1DArray = nullptr;
 +jclass g_cls_boolean2DArray = nullptr;
 +jclass g_cls_String = nullptr;
 +jclass g_cls_String1DArray = nullptr;
 +jclass g_cls_String2DArray = nullptr;
 +jclass g_cls_LinkedList = nullptr;
 +jclass g_cls_Map = nullptr;
 +jclass g_cls_MapEntry = nullptr;
 +jclass g_cls_Set = nullptr;
 +jclass g_cls_Iterator = nullptr;
 +jclass g_cls_HashMap = nullptr;
 +jclass g_cls_OcException = nullptr;
 +jclass g_cls_OcResource = nullptr;
 +jclass g_cls_OcRepresentation = nullptr;
 +jclass g_cls_OcRepresentation1DArray = nullptr;
 +jclass g_cls_OcRepresentation2DArray = nullptr;
 +jclass g_cls_OcResourceRequest = nullptr;
 +jclass g_cls_OcResourceResponse = nullptr;
 +jclass g_cls_OcResourceHandle = nullptr;
 +jclass g_cls_OcPresenceHandle = nullptr;
 +jclass g_cls_OcRequestHandle = nullptr;
 +jclass g_cls_OcPresenceStatus = nullptr;
 +jclass g_cls_OcHeaderOption = nullptr;
 +jclass g_cls_ObservationInfo = nullptr;
 +jclass g_cls_OcResourceIdentifier = nullptr;
++jclass g_cls_OcProvisionResult = nullptr;
++jclass g_cls_OcSecureResource = nullptr;
++jclass g_cls_OcOicSecAcl = nullptr;
 +
 +jmethodID g_mid_Integer_ctor = nullptr;
 +jmethodID g_mid_Double_ctor = nullptr;
 +jmethodID g_mid_Boolean_ctor = nullptr;
 +jmethodID g_mid_LinkedList_ctor = nullptr;
 +jmethodID g_mid_LinkedList_add_object = nullptr;
 +jmethodID g_mid_Map_entrySet = nullptr;
 +jmethodID g_mid_MapEntry_getKey = nullptr;
 +jmethodID g_mid_MapEntry_getValue = nullptr;
 +jmethodID g_mid_Set_iterator = nullptr;
 +jmethodID g_mid_Iterator_hasNext = nullptr;
 +jmethodID g_mid_Iterator_next = nullptr;
 +jmethodID g_mid_HashMap_ctor = nullptr;
 +jmethodID g_mid_HashMap_put = nullptr;
 +jmethodID g_mid_OcException_ctor = nullptr;
 +jmethodID g_mid_OcException_setNativeExceptionLocation = nullptr;
 +jmethodID g_mid_OcResource_ctor = nullptr;
 +jmethodID g_mid_OcRepresentation_N_ctor = nullptr;
 +jmethodID g_mid_OcRepresentation_N_ctor_bool = nullptr;
 +jmethodID g_mid_OcResourceRequest_N_ctor = nullptr;
 +jmethodID g_mid_OcResourceResponse_N_ctor = nullptr;
 +jmethodID g_mid_OcResourceHandle_N_ctor = nullptr;
 +jmethodID g_mid_OcPresenceHandle_N_ctor = nullptr;
 +jmethodID g_mid_OcRequestHandle_N_ctor = nullptr;
 +jmethodID g_mid_OcHeaderOption_ctor = nullptr;
 +jmethodID g_mid_OcHeaderOption_get_id = nullptr;
 +jmethodID g_mid_OcHeaderOption_get_data = nullptr;
 +jmethodID g_mid_ObservationInfo_N_ctor = nullptr;
 +jmethodID g_mid_OcPresenceStatus_get = nullptr;
 +jmethodID g_mid_OcResourceIdentifier_N_ctor = nullptr;
++jmethodID g_mid_OcProvisionResult_ctor = nullptr;
++jmethodID g_mid_OcSecureResource_ctor = nullptr;
++
++jmethodID g_mid_OcOicSecAcl_get_subject = nullptr;
++jmethodID g_mid_OcOicSecAcl_get_resources_cnt = nullptr;
++jmethodID g_mid_OcOicSecAcl_get_resources = nullptr;
++jmethodID g_mid_OcOicSecAcl_get_permission = nullptr;
++jmethodID g_mid_OcOicSecAcl_get_periods_cnt = nullptr;
++jmethodID g_mid_OcOicSecAcl_get_periods = nullptr;
++jmethodID g_mid_OcOicSecAcl_get_recurrences = nullptr;
++jmethodID g_mid_OcOicSecAcl_get_owners_cnt = nullptr;
++jmethodID g_mid_OcOicSecAcl_get_owners = nullptr;
  
  jobject getOcException(JNIEnv* env, const char* file, const char* functionName,
      const int line, const int code, const char* message)

diff --cc android/android_api/base/jni/JniOcStack.h
Simple merge

diff --cc android/examples/settings.gradle
index 388afde,fa802b9..e679784
--- 1/android/examples/settings.gradle
--- 2/android/examples/settings.gradle
+++ b/android/examples/settings.gradle
@@@ -1,1 -1,1 +1,1 @@@
- include ':simpleserver', ':simpleclient', ':message', ':fridgeserver', ':fridgeclient', ':guiclient', ':presenceserver', ':presenceclient', ':devicediscoveryclient', ':devicediscoveryserver', ':iotivity-armeabi-base-debug'
 -include ':simpleserver', ':simpleclient', ':message', ':fridgeserver', ':fridgeclient', ':guiclient', ':secureprovisionclient'
++include ':simpleserver', ':simpleclient', ':message', ':fridgeserver', ':fridgeclient', ':guiclient', ':secureprovisionclient', ':presenceserver', ':presenceclient', ':devicediscoveryclient', ':devicediscoveryserver', ':iotivity-armeabi-base-debug'

diff --cc resource/csdk/security/SConscript
Simple merge

diff --cc resource/csdk/security/include/internal/secureresourcemanager.h
index 750da2d,6505acc..eb2643b
--- 1/resource/csdk/security/include/internal/secureresourcemanager.h
--- 2/resource/csdk/security/include/internal/secureresourcemanager.h
+++ b/resource/csdk/security/include/internal/secureresourcemanager.h
@@@ -94,13 -96,15 +96,21 @@@ typedef bool (*SPResponseCallback) (con
   */
  void SRMRegisterProvisioningResponseHandler(SPResponseCallback respHandler);
  
 +/**
 + * @brief   Check the security resource URI.
 + * @param   uri [IN] Pointers to security resource URI.
 + * @return  true if the URI is one of security resources, otherwise false.
 + */
 +bool SRMIsSecurityResourceURI(const char* uri);
  
 -
+ /**
+  * @brief   Sends Response
+  * @param   resposeVal       SRMAccessResponse_t value
+  * @return  NONE
+  */
+ void SRMSendResponse(SRMAccessResponse_t responseVal);
+ 
++
  #ifdef __cplusplus
  }
  #endif

diff --cc resource/csdk/security/include/securevirtualresourcetypes.h
Simple merge

diff --cc resource/csdk/security/src/secureresourcemanager.c
index 434d4d6,25602c3..13ff964
--- 1/resource/csdk/security/src/secureresourcemanager.c
--- 2/resource/csdk/security/src/secureresourcemanager.c
+++ b/resource/csdk/security/src/secureresourcemanager.c
@@@ -25,9 -24,13 +25,13 @@@
  #include "resourcemanager.h"
  #include "credresource.h"
  #include "policyengine.h"
+ #include "srmutility.h"
+ #include "amsmgr.h"
  #include "oic_string.h"
 -#include <string.h>
+ #include "oic_malloc.h"
+ #include "securevirtualresourcetypes.h"
+ #include "secureresourcemanager.h"
 +#include "srmresourcestrings.h"
  
  #define TAG  "SRM"
  

diff --cc resource/provisioning/examples/SConscript
Simple merge

diff --cc resource/provisioning/unittests/SConscript
Simple merge