From: Kevin Kane Date: Thu, 30 Mar 2017 22:33:16 +0000 (-0700) Subject: Create PSKs with the correct encoding type X-Git-Tag: 1.3.0~375^2^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa112923b53234a4f013e847b6b00bfcd3be4a4a;p=platform%2Fupstream%2Fiotivity.git Create PSKs with the correct encoding type Encoding/decoding code that currently ignores the value of this field, but this will change when certificates and role features are merged in. Change-Id: Idf8d2b1ffd95d2e517e4da7c76ce767a57ce428d Signed-off-by: Kevin Kane Reviewed-on: https://gerrit.iotivity.org/gerrit/18407 Reviewed-by: Alex Kelley Reviewed-by: Nathan Heldt-Sheller Tested-by: jenkins-iotivity --- diff --git a/resource/csdk/security/provisioning/src/credentialgenerator.c b/resource/csdk/security/provisioning/src/credentialgenerator.c index afc682c..8442ec4 100644 --- a/resource/csdk/security/provisioning/src/credentialgenerator.c +++ b/resource/csdk/security/provisioning/src/credentialgenerator.c @@ -60,7 +60,7 @@ OCStackResult PMGeneratePairWiseCredentials(OicSecCredType_t type, size_t keySiz memset(&privKey, 0, sizeof(privKey)); privKey.data = privData; privKey.len = keySize; - privKey.encoding = OIC_ENCODING_UNKNOW; + privKey.encoding = OIC_ENCODING_RAW; if (!OCGetRandomBytes(privData, privDataKeySize)) { diff --git a/resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c b/resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c index e0aa272..fd8c89d 100644 --- a/resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c +++ b/resource/csdk/security/provisioning/src/multipleownershiptransfermanager.c @@ -678,7 +678,7 @@ static OCStackResult SaveSubOwnerPSK(OCProvisionDev_t *selectedDeviceInfo) memset(&ownerKey, 0, sizeof(ownerKey)); ownerKey.data = ownerPSK; ownerKey.len = OWNER_PSK_LENGTH_128; - ownerKey.encoding = OIC_ENCODING_UNKNOW; + ownerKey.encoding = OIC_ENCODING_RAW; //Generating SubOwnerPSK CAResult_t pskRet = CAGenerateOwnerPSK(&endpoint,