projects / packages / libu2f-server.git / blame
| Commit | Line | Data |
|---|---|---|
| 5804818c JB |
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 | |
| 3 | @@ -41,7 +41,7 @@ | |
| 4 | #define u2fs_json_object_object_get(obj, key, value) json_object_object_get_ex(obj, key, &value) | |
| 5 | #else | |
| 6 | typedef int json_bool; | |
| 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 | |
| 9 | #endif | |
| 10 | ||
| 11 | static u2fs_rc encode_b64u(const char *data, size_t data_len, char *output) | |
| 12 | @@ -477,7 +477,7 @@ | |
| 13 | if (jo == NULL) | |
| 14 | return U2FS_JSON_ERROR; | |
| 15 | ||
| 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; | |
| 19 | ||
| 20 | p = json_object_get_string(k); | |
| 21 | @@ -488,7 +488,7 @@ | |
| 22 | if (*challenge == NULL) | |
| 23 | return U2FS_MEMORY_ERROR; | |
| 24 | ||
| 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; | |
| 28 | ||
| 29 | p = json_object_get_string(k); | |
| 30 | @@ -520,7 +520,7 @@ | |
| 31 | if (jo == NULL) | |
| 32 | return U2FS_JSON_ERROR; | |
| 33 | ||
| 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); | |
| 38 | if (p == NULL) | |
| 39 | @@ -529,7 +529,7 @@ | |
| 40 | if (*registrationData == NULL) | |
| 41 | return U2FS_MEMORY_ERROR; | |
| 42 | ||
| 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); | |
| 47 | if (p == NULL) | |
| 48 | @@ -1125,7 +1125,7 @@ | |
| 49 | if (jo == NULL) | |
| 50 | return U2FS_JSON_ERROR; | |
| 51 | ||
| 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); | |
| 56 | if (p == NULL) | |
| 57 | @@ -1134,7 +1134,7 @@ | |
| 58 | if (*signatureData == NULL) | |
| 59 | return U2FS_MEMORY_ERROR; | |
| 60 | ||
| 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); | |
| 65 | if (p == NULL) | |
| 66 | @@ -1143,7 +1143,7 @@ | |
| 67 | if (*clientData == NULL) | |
| 68 | return U2FS_MEMORY_ERROR; | |
| 69 | ||
| 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); | |
| 74 | if (p == NULL) |