mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

3208. [bug] 'dig -y' handle unknown tsig alorithm better.

Browse Source 
[RT #25522]
This commit is contained in:
Mark Andrews
2011-11-06 23:18:07 +00:00
parent e443425acf
commit 19ae9cbb28
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
3208. [bug] 'dig -y' handle unknown tsig alorithm better.
[RT #25522]
3207. [contrib] Fixed build error in Berkeley DB DLZ module. [RT #26444] 3207. [contrib] Fixed build error in Berkeley DB DLZ module. [RT #26444]
3206. [cleanup] Add ISC information to log at start time. [RT #25484] 3206. [cleanup] Add ISC information to log at start time. [RT #25484]

8
bin/dig/dighost.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dighost.c,v 1.341 2011/10/29 22:26:21 marka Exp $ */ /* $Id: dighost.c,v 1.342 2011/11/06 23:18:07 marka Exp $ */
/*! \file /*! \file
* \note * \note
@@ -66,6 +66,7 @@
#include <dns/tsig.h> #include <dns/tsig.h>
#include <dst/dst.h> #include <dst/dst.h>
#include <dst/result.h>
#include <isc/app.h> #include <isc/app.h>
#include <isc/base64.h> #include <isc/base64.h>
@@ -925,6 +926,11 @@ setup_text_key(void) {
secretsize = isc_buffer_usedlength(&secretbuf); secretsize = isc_buffer_usedlength(&secretbuf);
if (hmacname == NULL) {
result = DST_R_UNSUPPORTEDALG;
goto failure;
}
result = dns_name_fromtext(&keyname, namebuf, dns_rootname, 0, namebuf); result = dns_name_fromtext(&keyname, namebuf, dns_rootname, 0, namebuf);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
goto failure; goto failure;

11
bin/tests/system/tsig/tests.sh
View File

@@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.5 2007/06/19 23:47:06 tbox Exp $ # $Id: tests.sh,v 1.6 2011/11/06 23:18:07 marka Exp $
SYSTEMTESTTOP=.. SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh . $SYSTEMTESTTOP/conf.sh
@@ -213,6 +213,15 @@ if [ $ret -eq 1 ] ; then
echo "I: failed"; status=1 echo "I: failed"; status=1
fi fi
echo "I:attempting fetch with bad tsig algorithm"
ret=0
$DIG +tcp +nosea +nostat +noquest +nocomm +nocmd example.nil.\
-y "badalgo:invalid:$sha512" @10.53.0.1 soa -p 5300 > dig.out.badalgo 2>&1 || ret=1
grep -i "Couldn't create key invalid: algorithm is unsupported" dig.out.badalgo > /dev/null || ret=1
if [ $ret -eq 1 ] ; then
echo "I: failed"; status=1
fi
exit $status exit $status