1 --- libu2f-server-1.1.0/u2f-server/core.c.orig 2017-12-18 12:52:12.000000000 +0100
2 +++ libu2f-server-1.1.0/u2f-server/core.c 2020-05-01 21:22:03.319276115 +0200
4 #define u2fs_json_object_object_get(obj, key, value) json_object_object_get_ex(obj, key, &value)
7 -#define u2fs_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? (json_bool)FALSE : (json_bool)TRUE
8 +#define u2fs_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? (json_bool)0 : (json_bool)1
11 static u2fs_rc encode_b64u(const char *data, size_t data_len, char *output)
14 return U2FS_JSON_ERROR;
16 - if (u2fs_json_object_object_get(jo, "challenge", k) == FALSE)
17 + if (u2fs_json_object_object_get(jo, "challenge", k) == 0)
18 return U2FS_JSON_ERROR;
20 p = json_object_get_string(k);
22 if (*challenge == NULL)
23 return U2FS_MEMORY_ERROR;
25 - if (u2fs_json_object_object_get(jo, "origin", k) == FALSE)
26 + if (u2fs_json_object_object_get(jo, "origin", k) == 0)
27 return U2FS_JSON_ERROR;
29 p = json_object_get_string(k);
32 return U2FS_JSON_ERROR;
34 - if (u2fs_json_object_object_get(jo, "registrationData", k) == FALSE)
35 + if (u2fs_json_object_object_get(jo, "registrationData", k) == 0)
36 return U2FS_JSON_ERROR;
37 p = json_object_get_string(k);
40 if (*registrationData == NULL)
41 return U2FS_MEMORY_ERROR;
43 - if (u2fs_json_object_object_get(jo, "clientData", k) == FALSE)
44 + if (u2fs_json_object_object_get(jo, "clientData", k) == 0)
45 return U2FS_JSON_ERROR;
46 p = json_object_get_string(k);
50 return U2FS_JSON_ERROR;
52 - if (u2fs_json_object_object_get(jo, "signatureData", k) == FALSE)
53 + if (u2fs_json_object_object_get(jo, "signatureData", k) == 0)
54 return U2FS_JSON_ERROR;
55 p = json_object_get_string(k);
58 if (*signatureData == NULL)
59 return U2FS_MEMORY_ERROR;
61 - if (u2fs_json_object_object_get(jo, "clientData", k) == FALSE)
62 + if (u2fs_json_object_object_get(jo, "clientData", k) == 0)
63 return U2FS_JSON_ERROR;
64 p = json_object_get_string(k);
67 if (*clientData == NULL)
68 return U2FS_MEMORY_ERROR;
70 - if (u2fs_json_object_object_get(jo, "keyHandle", k) == FALSE)
71 + if (u2fs_json_object_object_get(jo, "keyHandle", k) == 0)
72 return U2FS_JSON_ERROR;
73 p = json_object_get_string(k);