pi-hole/FTL
1
0
Fork 0
mirror of https://github.com/pi-hole/FTL.git synced 2024-10-26 16:52:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1467 from pi-hole/update/ftl-build

Browse Source 
Update included crypto library (nettle)
This commit is contained in:
DL6ER
2022-11-06 15:04:01 +01:00
committed by GitHub
parent 17ce7ec0ce d318a8d020
commit 94be8de5b6
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
+1 -1
View File
@@ -53,7 +53,7 @@ jobs:
needs: smoke-tests
container: ghcr.io/pi-hole/ftl-build:v1.19-${{ matrix.arch }}
container: ghcr.io/pi-hole/ftl-build:v1.22-${{ matrix.arch }}
strategy:
fail-fast: false
src/args.c
+10
View File
@@ -13,6 +13,12 @@
#include "dnsmasq/dnsmasq.h"
#undef __USE_XOPEN
#include <nettle/bignum.h>
#if !defined(NETTLE_VERSION_MAJOR)
# define NETTLE_VERSION_MAJOR 2
# define NETTLE_VERSION_MINOR 0
#endif
#include "FTL.h"
#include "args.h"
#include "version.h"
@@ -258,6 +264,10 @@ void parse_args(int argc, char* argv[])
printf("\n");
printf("******************************** LUA ********************************\n");
printf(LUA_COPYRIGHT"\n");
printf("\n");
printf("***************************** LIBNETTLE *****************************\n");
printf("Version: %d.%d\n", NETTLE_VERSION_MAJOR, NETTLE_VERSION_MINOR);
printf("GMP: %s\n", NETTLE_USE_MINI_GMP ? "Mini" : "Full");
exit(EXIT_SUCCESS);
}
test/pihole-FTL.conf
+1
View File
@@ -2,6 +2,7 @@ DEBUG_ALL=true
RESOLVE_IPV4=no
RESOLVE_IPV6=no
CHECK_LOAD=false
CHECK_DISK=0
LOCAL_IPV4=10.100.0.10
LOCAL_IPV6=fe80::10
BLOCK_IPV4=10.100.0.11