openharmony/security_deviceauth
1
0
Fork 0
mirror of https://github.com/openharmony/security_deviceauth.git synced 2026-08-27 04:01:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/winnie-hu/security_deviceauth

Browse Source
This commit is contained in:
winnieHu
2021-04-12 18:50:50 +08:00
parent acd7086f47 663a145bdb
commit 6d0460dfcd
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/deviceauth_lite/source/hichain.c
+1 -1
View File
@@ -751,7 +751,7 @@ static void encap_inform_message(int32_t error_code, struct message *send)
#if (defined(_CUT_EXCHANGE_) || defined(_CUT_EXCHANGE_SERVER_))
if (error_code == HC_UNSUPPORT) {
send->msg_code=INVALID_MESSAGE;
send->msg_code = INVALID_MESSAGE;
return;
}
#endif
frameworks/deviceauth_lite/source/key_agreement/sts_server.h
+4
View File
@@ -92,7 +92,11 @@ struct sts_server {
struct sts_end_response_data end_response_data;
};
#else
<<<<<<< HEAD
struct sts_server {
=======
struct sts_server{
>>>>>>> 663a145bdb100a367cf19422faf1438a0625602d
char rsv;
};
#endif