Merge branch 'security-basecamp' into master

Conflicts:
	resource/csdk/connectivity/api/cainterface.h
	resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp

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

diff --cc resource/csdk/connectivity/api/cainterface.h
index 7449b28,a483556..9499cf4
--- 1/resource/csdk/connectivity/api/cainterface.h
--- 2/resource/csdk/connectivity/api/cainterface.h
+++ b/resource/csdk/connectivity/api/cainterface.h
@@@ -252,26 -259,26 +252,26 @@@ CAResult_t CASetRAInfo(const CARAInfo_
  #ifdef __WITH_DTLS__
  
  /**
 - * Select the cipher suite for dtls handshake
 + * Select the cipher suite for dtls handshake.
   *
-  * @param[in] cipher  cipher suite (Note : Make sure endianness).
-  *                    0xC018 : TLS_ECDH_anon_WITH_AES_128_CBC_SHA
-  *                    0xC0A8 : TLS_PSK_WITH_AES_128_CCM_8
-  *                    0xC0AE : TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8
+  * @param[IN] cipher  cipher suite (Note : Make sure endianness)
 - *                               0xC018 : TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256
++ *                               0xC018 : TLS_ECDH_anon_WITH_AES_128_CBC_SHA
+  *                               0xC0A8 : TLS_PSK_WITH_AES_128_CCM_8
+  *                               0xC0AE : TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8
   *
 - * @retval  CA_STATUS_OK    Successful
 - * @retval  CA_STATUS_INVALID_PARAM  Invalid input argumets
 - * @retval  CA_STATUS_FAILED Operation failed
 + * @retval  ::CA_STATUS_OK    Successful.
 + * @retval  ::CA_STATUS_INVALID_PARAM  Invalid input arguments.
 + * @retval  ::CA_STATUS_FAILED Operation failed.
   */
  CAResult_t CASelectCipherSuite(const uint16_t cipher);
  
  /**
-  * Enable TLS_ECDH_anon_WITH_AES_128_CBC_SHA cipher suite in dtls.
 - * Enable TLS_ECDH_anon_WITH_AES_128_CBC_SHA_256 cipher suite in dtls
++ * Enable TLS_ECDH_anon_WITH_AES_128_CBC_SHA cipher suite in dtls
   *
 - * @param[IN] enable  TRUE/FALSE enables/disables anonymous cipher suite
 + * @param[in] enable  TRUE/FALSE enables/disables anonymous cipher suite.
   *
 - * @retval  CA_STATUS_OK    Successful
 - * @retval  CA_STATUS_FAILED Operation failed
 + * @retval  ::CA_STATUS_OK    Successful.
 + * @retval  ::CA_STATUS_FAILED Operation failed.
   *
   * @note anonymous cipher suite should only be enabled for 'JustWorks' provisioning.
   */

diff --cc resource/csdk/connectivity/inc/caadapternetdtls.h
Simple merge

diff --cc resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c
Simple merge

diff --cc resource/csdk/security/src/secureresourcemanager.c
Simple merge