From b2c4c354936aae2cbae1ae6510f807e7c1f3a923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 21 Nov 2018 22:18:12 +0100 Subject: [PATCH] Add ALTERNATIVE_ALGORITHM to conf.sh --- bin/tests/system/conf.sh.in | 8 ++++++++ bin/tests/system/conf.sh.win32 | 3 +++ 2 files changed, 11 insertions(+) diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in index 414eb1ce3f..e3d921d52d 100644 --- a/bin/tests/system/conf.sh.in +++ b/bin/tests/system/conf.sh.in @@ -22,6 +22,11 @@ DEFAULT_ALGORITHM=ECDSAP256SHA256 DEFAULT_ALGORITHM_NUMBER=13 DEFAULT_BITS=256 +# must be different from DEFAULT_ALGORITHM +ALTERNATIVE_ALGORITHM=RSASHA256 +ALTERNATIVE_ALGORITHM_NUMBER=8 +ALTERNATIVE_BITS=1280 + ARPANAME=$TOP/bin/tools/arpaname CDS=$TOP/bin/dnssec/dnssec-cds CHECKCONF=$TOP/bin/check/named-checkconf @@ -397,6 +402,9 @@ copy_setports() { -e "s/@DEFAULT_ALGORITHM@/${DEFAULT_ALGORITHM}/g" \ -e "s/@DEFAULT_ALGORITHM_NUMBER@/${DEFAULT_ALGORITHM_NUMBER}/g" \ -e "s/@DEFAULT_BITS@/${DEFAULT_BITS}/g" \ + -e "s/@ALTERNATIVE_ALGORITHM@/${ALTERNATIVE_ALGORITHM}/g" \ + -e "s/@ALTERNATIVE_ALGORITHM_NUMBER@/${ALTERNATIVE_ALGORITHM_NUMBER}/g" \ + -e "s/@ALTERNATIVE_BITS@/${ALTERNATIVE_BITS}/g" \ $1 > $2 } diff --git a/bin/tests/system/conf.sh.win32 b/bin/tests/system/conf.sh.win32 index c791007110..4844e6fb4c 100644 --- a/bin/tests/system/conf.sh.win32 +++ b/bin/tests/system/conf.sh.win32 @@ -370,6 +370,9 @@ copy_setports() { -e "s/${atsign}DEFAULT_ALGORITM${atsign}/${DEFAULT_ALGORITHM}/g" \ -e "s/${atsign}DEFAULT_ALGORITHM_NUMBER${atsign}/${DEFAULT_ALGORITHM_NUMBER}/g" \ -e "s/${atsign}DEFAULT_BITS${atsign}/${DEFAULT_BITS}/g" \ + -e "s/${atsign}ALTERNATIVE_ALGORITM${atsign}/${ALTERNATIVE_ALGORITHM}/g" \ + -e "s/${atsign}ALTERNATIVE_ALGORITHM_NUMBER${atsign}/${ALTERNATIVE_ALGORITHM_NUMBER}/g" \ + -e "s/${atsign}ALTERNATIVE_BITS${atsign}/${ALTERNATIVE_BITS}/g" \ $1 > $2 }