Skip to content

Commit b445963

Browse files
adriaandegrootvanrein
authored andcommitted
Polishing (#65)
Some reduction of compile warnings and a little extra documentation to help people building from source.
1 parent d0d9db5 commit b445963

File tree

4 files changed

+18
-5
lines changed

4 files changed

+18
-5
lines changed

INSTALL

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ Runtime dependencies are:
1414
* p11-kit >= 0.22.1 for PKCS #11 URI handling
1515
* libdb >= 4.0 for key->value lookup with BerkeleyDB transactions/replication
1616
* libtasn1 for parsing of BER and DER data structures
17-
* NOT-YET: libldns for DNS lookups
17+
* libldns for DNS lookups
18+
* libunbound for more DNS lookups
19+
* Quick-DER >= 1.2.3 for DER manipulation
20+
* libkrb5 for Kerberos support
1821
* NOT-YET: libldap for LDAP lookups
1922
* NOT-YET: libmemcached for caching of intermediate results
2023
* NOT-YET: libradius to do additional authn / authz [/acct]
@@ -27,6 +30,16 @@ these dependencies when only a bit is kwown to be required. That's the
2730
sort of maturity that this project has not reached yet.
2831

2932

33+
Build Packages
34+
--------------
35+
36+
As a **sugestion** only, here are packages you should have installed
37+
before trying to build TLSPOOL.
38+
39+
- Debian
40+
- libdb-dev libldns-dev libunbound-dev libkrb5-dev
41+
- libgnutls-dev (you'll need one with DANE support)
42+
3043
First-time build
3144
----------------
3245

src/validate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ static int valexp_char_bitnum [128];
3737
typedef uint32_t valexpreqs_t;
3838

3939
#define VALEXP_CHARBIT(c) (valexp_char_bitnum [(c)])
40-
#define VALEXP_CHARKNOWN(c) (((c) >= 0) && ((c) < 128) && (VALEXP_CHARBIT((c)) >= 0))
40+
#define VALEXP_CHARKNOWN(c) (((c) >= 0) && ((c) <= 127) && (VALEXP_CHARBIT((c)) >= 0))
4141
#define VALEXP_OPERAND(c) (((c) == '0') || ((c) == '1') || (VALEXP_CHARKNOWN((c))))
4242
#define VALEXP_SETBIT(b,w) ((w) |= (1 << (b)))
4343
#define VALEXP_RESETBIT(b,w) ((w) &= ~ (1 << (b)))

tool/get_disclose.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ int main (int argc, char *argv []) {
174174
k_selector.size = printable_len;
175175
nomore = crs->get (crs, &k_selector, &k_localid, DB_SET);
176176
while (nomore == 0) {
177-
printf (" - %.*s\n", k_localid.size, k_localid.data);
177+
printf (" - %.*s\n", k_localid.size, (const char *)k_localid.data);
178178
nomore = crs->get (crs, &k_selector, &k_localid, DB_NEXT_DUP);
179179
}
180180
crs->close (crs);

tool/set_disclose.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ int main (int argc, char *argv []) {
178178
nomore = crs->get (crs, &k_selector, &e_value, DB_SET);
179179
while (nomore == 0) {
180180
printf ("Removing local identity %.*s\n",
181-
e_value.size, e_value.data);
181+
e_value.size, (const char *)e_value.data);
182182
if (crs->del (crs, 0) != 0) {
183183
fprintf (stderr, "Failed to delete record\n");
184184
crs->close (crs);
@@ -198,7 +198,7 @@ int main (int argc, char *argv []) {
198198
k_localid.data = argv [argi];
199199
k_localid.size = strlen (argv [argi]);
200200
printf ("Adding local identity %.*s\n",
201-
k_localid.size, k_localid.data);
201+
k_localid.size, (const char *)k_localid.data);
202202
if (dbh_disc->put (dbh_disc, txn, &k_selector, &k_localid, 0) != 0) {
203203
fprintf (stderr, "Failed to write record\n");
204204
crs->close (crs);

0 commit comments

Comments
 (0)