From: Oleksii Beketov <ol.beketov@samsung.com>
Date: Tue, 20 Nov 2018 16:43:53 +0000 (+0200)
Subject: [CONPRO-1333] Revert DTLS credential CB
X-Git-Tag: accepted/tizen/5.0/unified/20181206.055549~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd6e0cb15324e6df83b8ef436dd19638d9eb8d33;p=platform%2Fupstream%2Fiotivity.git

[CONPRO-1333] Revert DTLS credential CB

Revert DTLS PSK callback in case of OTM error

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/341
(cherry picked from commit 12f722ea759780424b8f6ed184b7b8688a6b1f45)

Change-Id: I6d4aaee03415e831bf0452f917e7e917985d9d93
Signed-off-by: Oleksii Beketov <ol.beketov@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
---

diff --git a/resource/csdk/security/src/srmutility.c b/resource/csdk/security/src/srmutility.c
index 96953c9..e54095d 100644
--- a/resource/csdk/security/src/srmutility.c
+++ b/resource/csdk/security/src/srmutility.c
@@ -27,6 +27,7 @@
 #include "oic_string.h"
 #include "base64.h"
 #include "doxmresource.h"
+#include "credresource.h"
 #include "pstatresource.h"
 #include "cacommon.h"
 #include "casecurityinterface.h"
@@ -338,6 +339,7 @@ void InvokeOtmEventHandler(const char* addr, uint16_t port,
             //Restore Pkix handler to initial state
             CAregisterPkixInfoHandler(GetPkixInfo);
             CAregisterGetCredentialTypesHandler(InitCipherSuiteList);
+            CAregisterPskCredentialsHandler(GetDtlsPskCredentials);
             break;
         default:
             OIC_LOG_V(ERROR, TAG, "Unknow OTM event : %d", event);