From 253c175d7b89ed17aa63aeaafb94855bf1963762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 3 Dec 2018 09:29:33 +0100 Subject: [PATCH] Fix typos and missing ALTERNATIVE_ALGORITHM in conf.sh.win32 --- bin/tests/system/conf.sh.win32 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/tests/system/conf.sh.win32 b/bin/tests/system/conf.sh.win32 index 4844e6fb4c..ba78bfa819 100644 --- a/bin/tests/system/conf.sh.win32 +++ b/bin/tests/system/conf.sh.win32 @@ -31,6 +31,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/Build/$VSCONF/arpaname@EXEEXT@ CHECKCONF=$TOP/Build/$VSCONF/named-checkconf@EXEEXT@ CHECKDS="$PYTHON `cygpath -w $TOP/bin/python/dnssec-checkds.py`" @@ -367,10 +372,10 @@ copy_setports() { -e "s/${atsign}EXTRAPORT7${atsign}/${EXTRAPORT7}/g" \ -e "s/${atsign}EXTRAPORT8${atsign}/${EXTRAPORT8}/g" \ -e "s/${atsign}CONTROLPORT${atsign}/${CONTROLPORT}/g" \ - -e "s/${atsign}DEFAULT_ALGORITM${atsign}/${DEFAULT_ALGORITHM}/g" \ + -e "s/${atsign}DEFAULT_ALGORITHM${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${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