Remove KISS rng configuration leftovers.

Signed-off-by: Miod Vallat <miod.vallat@powerdns.com>

diff --git a/m4/pdns_enable_kiss.m4 b/m4/pdns_enable_kiss.m4
deleted file mode 100644 (file)
index 1f882d9..0000000
--- a/m4/pdns_enable_kiss.m4
+++ /dev/null
@@ -1,7 +0,0 @@
-AC_DEFUN([PDNS_ENABLE_KISS], [
-  AC_ARG_ENABLE([unsafe-rng-kiss],
-    AS_HELP_STRING([--enable-unsafe-rng-kiss],
-      [Enable unsafe rng KISS]), [
-        AC_DEFINE([HAVE_KISS_RNG], [1], [Define to 1 to enable unsafe rng KISS])
-  ])
-])

diff --git a/meson.build b/meson.build
index 88cc40e6528faba58c6505c98510f1f5538bb66e..55c9dc5f88777ebae803461b217d09a5cf09fd4a 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -39,7 +39,6 @@ subdir('meson' / 'strerror')                # Strerror_r
 subdir('meson' / 'lua')                     # Lua
 subdir('meson' / 'lua-records')             # Lua-based Records
 subdir('meson' / 'hardening')               # Hardening
-subdir('meson' / 'kiss-rng')                # Unsafe KISS RNG
 subdir('meson' / 'net-libs')                # Network Libraries
 subdir('meson' / 'tm-gmtoff')               # Check for tm_gmtoff field in struct tm
 subdir('meson' / 'mmap')                    # Check for mmap

diff --git a/meson/kiss-rng/meson.build b/meson/kiss-rng/meson.build
deleted file mode 100644 (file)
index d11cdad..0000000
--- a/meson/kiss-rng/meson.build
+++ /dev/null
@@ -1,3 +0,0 @@
-opt_kiss_rng = get_option('rng-kiss')
-conf.set('HAVE_KISS_RNG', opt_kiss_rng, description: 'Use the unsafe KISS RNG')
-summary('Unsafe KISS RNG', opt_kiss_rng, bool_yn: true, section: 'Configuration')

diff --git a/meson_options.txt b/meson_options.txt
index 994c8fccd561967317289344ee996d7637ca3db7..33262d46305149c2b28175db491d3b1bce6c4b06 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,7 +3,6 @@ option('hardening', type: 'feature', value: 'auto', description: 'Compiler secur
 option('hardening-experimental-cf', type: 'combo', choices: ['disabled', 'full', 'branch', 'return', 'check'], value: 'disabled', description: 'Control Flow hardening')
 option('hardening-experimental-scp', type: 'feature', value: 'disabled', description: 'Stack Clash Protection')
 option('hardening-fortify-source', type: 'combo', choices: ['auto', 'disabled', '1', '2', '3'], value: '2', description: 'Source fortification level')
-option('rng-kiss', type: 'boolean', value: false, description: 'Use the unsafe KISS RNG')
 option('signers-libsodium', type: 'feature', value: 'auto', description: 'Enable libsodium-based signers')
 option('signers-libcrypto', type: 'feature', value: 'auto', description: 'Enable OpenSSL libcrypto-based signers)')
 option('signers-libcrypto-path', type: 'string', value: '', description: 'Custom path to find OpenSSL libcrypto')