libu2f-host: rebuild against json-c 0.14

This commit is contained in:
Randy McCaskill 2020-05-31 16:45:11 -04:00 committed by Helmut Pozimski
parent e86a933a83
commit ce66381b86
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,37 @@
--- u2f-host/u2fmisc.c 2019-05-15 07:54:11.000000000 -0400
+++ u2f-host/u2fmisc.c 2020-05-31 11:19:24.305252337 -0400
@@ -19,6 +19,7 @@
#include "internal.h"
#include <json.h>
+#include <stdbool.h>
#include "sha256.h"
@@ -30,7 +31,7 @@
#define u2fh_json_object_object_get(obj, key, value) json_object_object_get_ex(obj, key, &value)
#else
typedef int json_bool;
-#define u2fh_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? (json_bool)FALSE : (json_bool)TRUE
+#define u2fh_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? (json_bool)false : (json_bool)true
#endif
static void
@@ -114,7 +115,7 @@
if (debug)
fprintf (stderr, "JSON: %s\n", json_object_to_json_string (jo));
- if (u2fh_json_object_object_get (jo, "appId", k) == FALSE)
+ if (u2fh_json_object_object_get (jo, "appId", k) == false)
return U2FH_JSON_ERROR;
app_id = json_object_get_string (k);
@@ -390,7 +391,7 @@
if (debug)
fprintf (stderr, "JSON: %s\n", json_object_to_json_string (jo));
- if (u2fh_json_object_object_get (jo, key, k) == FALSE)
+ if (u2fh_json_object_object_get (jo, key, k) == false)
return U2FH_JSON_ERROR;
urlb64 = json_object_get_string (k);

View File

@ -1,7 +1,7 @@
# Template file for 'libu2f-host' # Template file for 'libu2f-host'
pkgname=libu2f-host pkgname=libu2f-host
version=1.1.10 version=1.1.10
revision=1 revision=2
wrksrc="${pkgname}-${pkgname}-${version}" wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-openssl=yes --with-udevrulesdir=/usr/lib/udev/rules.d" configure_args="--with-openssl=yes --with-udevrulesdir=/usr/lib/udev/rules.d"