wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

libu2f-server: rebuild against json-c 0.14

Browse source
This commit is contained in:
Randy McCaskill 2020-05-31 16:45:59 -04:00 • committed by Helmut Pozimski
parent ce66381b86
commit 57fd8f5b46
2 changed files with 83 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
srcpkgs/libu2f-server/patches/lowercase-boolean.patch Normal file
View file

@ -0,0 +1,82 @@
--- u2f-server/core.c 2018-01-04 09:21:38.000000000 -0500
+++ u2f-server/core.c 2020-05-31 11:24:48.986906605 -0400
@@ -32,6 +32,7 @@
#include <string.h>
#include <unistd.h>
#include <json.h>
+#include <stdbool.h>
#include "crypto.h"
#include "b64/cencode.h"
#include "b64/cdecode.h"
@@ -41,7 +42,7 @@
#define u2fs_json_object_object_get(obj, key, value) json_object_object_get_ex(obj, key, &value)
#else
typedef int json_bool;
-#define u2fs_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? (json_bool)FALSE : (json_bool)TRUE
+#define u2fs_json_object_object_get(obj, key, value) (value = json_object_object_get(obj, key)) == NULL ? (json_bool)false : (json_bool)true
#endif
static u2fs_rc encode_b64u(const char *data, size_t data_len, char *output)
@@ -477,7 +478,7 @@
if (jo == NULL)
return U2FS_JSON_ERROR;
- if (u2fs_json_object_object_get(jo, "challenge", k) == FALSE)
+ if (u2fs_json_object_object_get(jo, "challenge", k) == false)
return U2FS_JSON_ERROR;
p = json_object_get_string(k);
@@ -488,7 +489,7 @@
if (*challenge == NULL)
return U2FS_MEMORY_ERROR;
- if (u2fs_json_object_object_get(jo, "origin", k) == FALSE)
+ if (u2fs_json_object_object_get(jo, "origin", k) == false)
return U2FS_JSON_ERROR;
p = json_object_get_string(k);
@@ -520,7 +521,7 @@
if (jo == NULL)
return U2FS_JSON_ERROR;
- if (u2fs_json_object_object_get(jo, "registrationData", k) == FALSE)
+ if (u2fs_json_object_object_get(jo, "registrationData", k) == false)
return U2FS_JSON_ERROR;
p = json_object_get_string(k);
if (p == NULL)
@@ -529,7 +530,7 @@
if (*registrationData == NULL)
return U2FS_MEMORY_ERROR;
- if (u2fs_json_object_object_get(jo, "clientData", k) == FALSE)
+ if (u2fs_json_object_object_get(jo, "clientData", k) == false)
return U2FS_JSON_ERROR;
p = json_object_get_string(k);
if (p == NULL)
@@ -1125,7 +1126,7 @@
if (jo == NULL)
return U2FS_JSON_ERROR;
- if (u2fs_json_object_object_get(jo, "signatureData", k) == FALSE)
+ if (u2fs_json_object_object_get(jo, "signatureData", k) == false)
return U2FS_JSON_ERROR;
p = json_object_get_string(k);
if (p == NULL)
@@ -1134,7 +1135,7 @@
if (*signatureData == NULL)
return U2FS_MEMORY_ERROR;
- if (u2fs_json_object_object_get(jo, "clientData", k) == FALSE)
+ if (u2fs_json_object_object_get(jo, "clientData", k) == false)
return U2FS_JSON_ERROR;
p = json_object_get_string(k);
if (p == NULL)
@@ -1143,7 +1144,7 @@
if (*clientData == NULL)
return U2FS_MEMORY_ERROR;
- if (u2fs_json_object_object_get(jo, "keyHandle", k) == FALSE)
+ if (u2fs_json_object_object_get(jo, "keyHandle", k) == false)
return U2FS_JSON_ERROR;
p = json_object_get_string(k);
if (p == NULL)

2
srcpkgs/libu2f-server/template
View file

@ -1,7 +1,7 @@
# Template file for 'libu2f-server' # Template file for 'libu2f-server'
pkgname=libu2f-server pkgname=libu2f-server
version=1.1.0 version=1.1.0
revision=6 revision=7
wrksrc="${pkgname}-${pkgname}-${version}" wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-configure build_style=gnu-configure
hostmakedepends="automake libtool pkg-config gengetopt check" hostmakedepends="automake libtool pkg-config gengetopt check"