Commit 7940fada authored by js126.lee's avatar js126.lee Committed by Randeep

Change name of encoding type

There is no name of encoding type as "oic.sec.encoding.bytestream" in the spec.
But we need a type to handling priv/pub data as byte array because our db is binary.
So we define new name of encoding type as "oic.sec.encoding.none" that means no need to encoding.
And we have asked to add this type into RAML spec.

-Patch 1 : Init
-Patch 2 : Modify encoding type from encodign.none to encoding.raw.

Change-Id: I7ad3d8facd302f97426cd42f139fbc11a7682638
Signed-off-by: default avatarJongsung Lee <js126.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/6329Reviewed-by: default avatardongik Lee <dongik.lee@samsung.com>
Reviewed-by: default avatarChul Lee <chuls.lee@samsung.com>
Reviewed-by: default avatarYonggoo Kang <ygace.kang@samsung.com>
Tested-by: default avatarjenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep's avatarRandeep Singh <randeep.s@samsung.com>
parent d0e8c5ea
This diff was suppressed by a .gitattributes entry.
......@@ -93,7 +93,7 @@
"credtype": 1,
"privatedata": {
"data": "AAAAAAAAAAAAAAAA",
"encoding": "oic.sec.encoding.bytestream"
"encoding": "oic.sec.encoding.raw"
}
}
],
......
This diff was suppressed by a .gitattributes entry.
......@@ -117,7 +117,7 @@
"credtype": 1,
"privatedata": {
"data": "AAAAAAAAAAAAAAAA",
"encoding": "oic.sec.encoding.bytestream"
"encoding": "oic.sec.encoding.raw"
}
}
],
......
......@@ -155,7 +155,7 @@ extern const char * OXM_RANDOM_DEVICE_PIN;
extern const char * OXM_MANUFACTURER_CERTIFICATE;
extern const char * OIC_SEC_ENCODING_BASE64;
extern const char * OIC_SEC_ENCODING_BYTESTREAM;
extern const char * OIC_SEC_ENCODING_RAW;
extern const char * OIC_SEC_TRUE;
extern const char * OIC_SEC_FALSE;
......
......@@ -236,8 +236,8 @@ OCStackResult CredToCBORPayload(const OicSecCred_t *credS, uint8_t **cborPayload
cborEncoderResult = cbor_encode_text_string(&publicMap, OIC_JSON_ENCODING_NAME,
strlen(OIC_JSON_ENCODING_NAME));
VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Public Encoding Tag.");
cborEncoderResult = cbor_encode_text_string(&publicMap, OIC_SEC_ENCODING_BYTESTREAM,
strlen(OIC_SEC_ENCODING_BYTESTREAM));
cborEncoderResult = cbor_encode_text_string(&publicMap, OIC_SEC_ENCODING_RAW,
strlen(OIC_SEC_ENCODING_RAW));
VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Public Encoding Value.");
cborEncoderResult = cbor_encoder_close_container(&credMap, &publicMap);
......@@ -268,8 +268,8 @@ OCStackResult CredToCBORPayload(const OicSecCred_t *credS, uint8_t **cborPayload
cborEncoderResult = cbor_encode_text_string(&privateMap, OIC_JSON_ENCODING_NAME,
strlen(OIC_JSON_ENCODING_NAME));
VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Private Encoding Tag.");
cborEncoderResult = cbor_encode_text_string(&privateMap, OIC_SEC_ENCODING_BYTESTREAM,
strlen(OIC_SEC_ENCODING_BYTESTREAM));
cborEncoderResult = cbor_encode_text_string(&privateMap, OIC_SEC_ENCODING_RAW,
strlen(OIC_SEC_ENCODING_RAW));
VERIFY_CBOR_SUCCESS(TAG, cborEncoderResult, "Failed Adding Private Encoding Value.");
cborEncoderResult = cbor_encoder_close_container(&credMap, &privateMap);
......
......@@ -154,7 +154,7 @@ const char * OXM_MANUFACTURER_CERTIFICATE = "oic.sec.doxm.mfgcert";
//Credential data encoding methods
const char * OIC_SEC_ENCODING_BASE64 = "oic.sec.encoding.base64";
const char * OIC_SEC_ENCODING_BYTESTREAM = "oic.sec.encoding.bytestream";
const char * OIC_SEC_ENCODING_RAW = "oic.sec.encoding.raw";
const char * OIC_SEC_TRUE = "true";
const char * OIC_SEC_FALSE = "false";
......
This diff was suppressed by a .gitattributes entry.
......@@ -99,7 +99,7 @@
"credtype": 1,
"privatedata": {
"data": "BBBBBBBBBBBBBBBB",
"encoding": "oic.sec.encoding.bytestream"
"encoding": "oic.sec.encoding.raw"
}
}
],
......
......@@ -99,7 +99,7 @@
"credtype": 1,
"privatedata": {
"data": "AAAAAAAAAAAAAAAA",
"encoding": "oic.sec.encoding.bytestream"
"encoding": "oic.sec.encoding.raw"
}
}
],
......
......@@ -88,7 +88,7 @@
"rel": "",
"rt": "",
"if": ""
}
}
],
"permission": 6,
"period" : ["20150630T060000/20150630T220000", "20150630T060000/20150630T200000"],
......@@ -102,7 +102,7 @@
"rel": "",
"rt": "",
"if": ""
}
}
],
"permission": 6,
"period" : ["20150630T060000/20150630T220000"],
......@@ -140,7 +140,7 @@
"period": "20150630T060000/20990920T220000",
"privatedata": {
"data": "AAAAAAAAAAAAAAAA",
"encoding": "oic.sec.encoding.bytestream"
"encoding": "oic.sec.encoding.raw"
}
},
{
......@@ -150,7 +150,7 @@
"period": "20150630T060000/20990920T220000",
"privatedata": {
"data": "BBBBBBBBBBBBBBBB",
"encoding": "oic.sec.encoding.bytestream"
"encoding": "oic.sec.encoding.raw"
}
}
],
......
This diff was suppressed by a .gitattributes entry.
......@@ -93,7 +93,7 @@
"credtype": 1,
"privatedata": {
"data": "AAAAAAAAAAAAAAAA",
"encoding": "oic.sec.encoding.bytestream"
"encoding": "oic.sec.encoding.raw"
}
}
],
......
This diff was suppressed by a .gitattributes entry.
......@@ -105,7 +105,7 @@
"credtype": 1,
"privatedata": {
"data": "AAAAAAAAAAAAAAAA",
"encoding": "oic.sec.encoding.bytestream"
"encoding": "oic.sec.encoding.raw"
}
}
],
......
......@@ -93,7 +93,7 @@
"credtype": 1,
"privatedata": {
"data": "AAAAAAAAAAAAAAAA",
"encoding": "oic.sec.encoding.bytestream"
"encoding": "oic.sec.encoding.raw"
}
}
],
......
......@@ -117,7 +117,7 @@
"credtype": 1,
"privatedata": {
"data": "AAAAAAAAAAAAAAAA",
"encoding": "oic.sec.encoding.bytestream"
"encoding": "oic.sec.encoding.raw"
}
}
],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment