[master] fix inline test, add importkey to win32 build

diff --git a/bin/dnssec/win32/importkey.dsp b/bin/dnssec/win32/importkey.dsp
new file mode 100644 (file)
index 0000000..92be73c
--- /dev/null
+++ b/bin/dnssec/win32/importkey.dsp
@@ -0,0 +1,103 @@
+# Microsoft Developer Studio Project File - Name="importkey" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=importkey - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "importkey.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "importkey.mak" CFG="importkey - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "importkey - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "importkey - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "importkey - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 user32.lib advapi32.lib Release/dnssectool.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /machine:I386 /out:"../../../Build/Release/dnssec-importkey.exe"
+
+!ELSEIF  "$(CFG)" == "importkey - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# SUBTRACT CPP /X /YX
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib advapi32.lib Debug/dnssectool.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/dnssec-importkey.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "importkey - Win32 Release"
+# Name "importkey - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\dnssec-importkey.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project

diff --git a/bin/dnssec/win32/importkey.dsw b/bin/dnssec/win32/importkey.dsw
new file mode 100644 (file)
index 0000000..28f2ee6
--- /dev/null
+++ b/bin/dnssec/win32/importkey.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "importkey"=".\importkey.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

diff --git a/bin/dnssec/win32/importkey.mak b/bin/dnssec/win32/importkey.mak
new file mode 100644 (file)
index 0000000..86dcf8c
--- /dev/null
+++ b/bin/dnssec/win32/importkey.mak
@@ -0,0 +1,324 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on importkey.dsp
+!IF "$(CFG)" == ""
+CFG=importkey - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to importkey - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "importkey - Win32 Release" && "$(CFG)" != "importkey - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "importkey.mak" CFG="importkey - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "importkey - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "importkey - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "importkey - Win32 Release"
+_VC_MANIFEST_INC=0
+_VC_MANIFEST_BASENAME=__VC80
+!ELSE
+_VC_MANIFEST_INC=1
+_VC_MANIFEST_BASENAME=__VC80.Debug
+!ENDIF
+
+####################################################
+# Specifying name of temporary resource file used only in incremental builds:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
+!else
+_VC_MANIFEST_AUTO_RES=
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+!endif
+
+####################################################
+# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+#MT_SPECIAL_RETURN=1090650113
+#MT_SPECIAL_SWITCH=-notify_resource_update
+MT_SPECIAL_RETURN=0
+MT_SPECIAL_SWITCH=
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
+if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
+rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
+link $** /out:$@ $(LFLAGS)
+
+!else
+
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+
+!endif
+####################################################
+# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
+
+!if "$(_VC_MANIFEST_INC)" == "1"
+
+_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
+    $(_VC_MANIFEST_BASENAME).auto.rc \
+    $(_VC_MANIFEST_BASENAME).auto.manifest
+
+!else
+
+_VC_MANIFEST_CLEAN=
+
+!endif
+
+!IF  "$(CFG)" == "importkey - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+
+ALL : "..\..\..\Build\Release\dnssec-importkey.exe"
+
+
+CLEAN :
+       -@erase "$(INTDIR)\dnssec-importkey.obj"
+       -@erase "$(INTDIR)\dnssectool.obj"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "..\..\..\Build\Release\dnssec-importkey.exe"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "NDEBUG" /D "__STDC__" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\importkey.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\importkey.bsc" 
+BSC32_SBRS= \
+       
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib ../../../lib/dns/win32/Release/libdns.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\dnssec-importkey.pdb" /machine:I386 /out:"../../../Build/Release/dnssec-importkey.exe" 
+LINK32_OBJS= \
+       "$(INTDIR)\dnssec-importkey.obj" \
+       "$(INTDIR)\dnssectool.obj"
+
+"..\..\..\Build\Release\dnssec-importkey.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ELSEIF  "$(CFG)" == "importkey - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "..\..\..\Build\Debug\dnssec-importkey.exe" "$(OUTDIR)\importkey.bsc"
+
+
+CLEAN :
+       -@erase "$(INTDIR)\dnssec-importkey.obj"
+       -@erase "$(INTDIR)\dnssec-importkey.sbr"
+       -@erase "$(INTDIR)\dnssectool.obj"
+       -@erase "$(INTDIR)\dnssectool.sbr"
+       -@erase "$(INTDIR)\vc60.idb"
+       -@erase "$(INTDIR)\vc60.pdb"
+       -@erase "$(OUTDIR)\dnssec-importkey.pdb"
+       -@erase "$(OUTDIR)\importkey.bsc"
+       -@erase "..\..\..\Build\Debug\dnssec-importkey.exe"
+       -@erase "..\..\..\Build\Debug\dnssec-importkey.ilk"
+       -@$(_VC_MANIFEST_CLEAN)
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../../libxml2-2.7.3/include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/isc/noatomic/include" /I "../../../lib/dns/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\importkey.bsc" 
+BSC32_SBRS= \
+       "$(INTDIR)\dnssec-importkey.sbr" \
+       "$(INTDIR)\dnssectool.sbr"
+
+"$(OUTDIR)\importkey.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
+    $(BSC32) @<<
+  $(BSC32_FLAGS) $(BSC32_SBRS)
+<<
+
+LINK32=link.exe
+LINK32_FLAGS=user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib ../../../lib/dns/win32/Debug/libdns.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\dnssec-importkey.pdb" /debug /machine:I386 /out:"../../../Build/Debug/dnssec-importkey.exe" /pdbtype:sept 
+LINK32_OBJS= \
+       "$(INTDIR)\dnssec-importkey.obj" \
+       "$(INTDIR)\dnssectool.obj"
+
+"..\..\..\Build\Debug\dnssec-importkey.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+    $(_VC_MANIFEST_EMBED_EXE)
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("importkey.dep")
+!INCLUDE "importkey.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "importkey.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "importkey - Win32 Release" || "$(CFG)" == "importkey - Win32 Debug"
+SOURCE="..\dnssec-importkey.c"
+
+!IF  "$(CFG)" == "importkey - Win32 Release"
+
+
+"$(INTDIR)\dnssec-importkey.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "importkey - Win32 Debug"
+
+
+"$(INTDIR)\dnssec-importkey.obj"       "$(INTDIR)\dnssec-importkey.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+SOURCE=..\dnssectool.c
+
+!IF  "$(CFG)" == "importkey - Win32 Release"
+
+
+"$(INTDIR)\dnssectool.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "importkey - Win32 Debug"
+
+
+"$(INTDIR)\dnssectool.obj"     "$(INTDIR)\dnssectool.sbr" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF 
+
+
+!ENDIF 
+
+####################################################
+# Commands to generate initial empty manifest file and the RC file
+# that references it, and for generating the .res file:
+
+$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
+
+$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
+    type <<$@
+#include <winuser.h>
+1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
+<< KEEP
+
+$(_VC_MANIFEST_BASENAME).auto.manifest :
+    type <<$@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+</assembly>
+<< KEEP

diff --git a/bin/tests/system/inline/ns3/sign.sh b/bin/tests/system/inline/ns3/sign.sh
index 3e02263bca42a41bfbf6172325954d4124a0f36c..96a4ed431f0ea2476ab3b65bb1181884b27f0aed 100644 (file)
--- a/bin/tests/system/inline/ns3/sign.sh
+++ b/bin/tests/system/inline/ns3/sign.sh
@@ -106,7 +106,7 @@ then
 fi
 if test $alg = ECDSAP256SHA256
 then
-       sh ../../ecsda/prereq.sh 2> /dev/null || continue
+       sh ../../ecdsa/prereq.sh 2> /dev/null || continue
 fi
 
 k1=`$KEYGEN -q -r $RANDFILE -a $alg -b 1024 -n zone -f KSK $zone`
@@ -121,7 +121,7 @@ rm -f ${k3}.* ${k4}.*
 #
 # Convert k1 and k2 in to External Keys.
 rm -f $k1.private 
-$IMPORTKEY -P now -D now+3600 -f $k1.key $zone
+$IMPORTKEY -P now -D now+3600 -f $k1.key $zone > /dev/null 2>&1
 rm -f $k2.private 
-$IMPORTKEY -f $k2.key $zone
+$IMPORTKEY -f $k2.key $zone > /dev/null 2>&1
 done

diff --git a/bin/tests/system/inline/tests.sh b/bin/tests/system/inline/tests.sh
index dceac3d3de961f75de6441fa389c669b8f9c8513..dde216950f60994058ab20474f63c2c5f2ad083c 100644 (file)
--- a/bin/tests/system/inline/tests.sh
+++ b/bin/tests/system/inline/tests.sh
@@ -815,19 +815,19 @@ ret=0
 $DIG $DIGOPTS @10.53.0.3 -p 5300 dnskey externalkey > dig.out.ns3.test$n
 for alg in 3 7 12 13
 do
-if test $alg = 12 
-then
+   if test $alg = 12 
+   then
        sh ../gost/prereq.sh 2>/dev/null || continue;
-fi
-if test $alg = 13 
-then
+   fi
+   if test $alg = 13 
+   then
        sh ../ecdsa/prereq.sh 2>/dev/null || continue;
-fi
+   fi
 
-dnskeys=`grep "IN.DNSKEY.25[67] [0-9]* $alg " dig.out.ns3.test$n | wc -l`
-rrsigs=`grep "RRSIG.DNSKEY $alg " dig.out.ns3.test$n | wc -l`
-test ${dnskeys:-0} -eq 3 || { echo "I: failed $alg (dnskeys ${dnskeys:-0})"; ret=1; }
-test ${rrsigs:-0} -eq 2 || { echo "I: failed $alg (rrsigs ${rrsigs:-0})"; ret=1; }
+   dnskeys=`grep "IN.DNSKEY.25[67] [0-9]* $alg " dig.out.ns3.test$n | wc -l`
+   rrsigs=`grep "RRSIG.DNSKEY $alg " dig.out.ns3.test$n | wc -l`
+   test ${dnskeys:-0} -eq 3 || { echo "I: failed $alg (dnskeys ${dnskeys:-0})"; ret=1; }
+   test ${rrsigs:-0} -eq 2 || { echo "I: failed $alg (rrsigs ${rrsigs:-0})"; ret=1; }
 done
 status=`expr $status + $ret`
 

diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index 5d4f8cc3e565c63cb32240eb34ea5b9f8b98cddb..5707edac2e3b4760a4b8e91c86fe3c28d98a8c7f 100644 (file)
--- a/bin/win32/BINDInstall/BINDInstallDlg.cpp
+++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp
@@ -152,6 +152,7 @@ const FileData installFiles[] =
        {"dnssec-keygen.exe", FileData::BinDir, FileData::Normal, FALSE, FALSE},
        {"dnssec-signzone.exe", FileData::BinDir, FileData::Normal, FALSE, FALSE},
        {"dnssec-dsfromkey.exe", FileData::BinDir, FileData::Normal, FALSE, FALSE},
+       {"dnssec-importkey.exe", FileData::BinDir, FileData::Normal, FALSE, FALSE},
        {"dnssec-keyfromlabel.exe", FileData::BinDir, FileData::Normal, FALSE, FALSE},
        {"dnssec-revoke.exe", FileData::BinDir, FileData::Normal, FALSE, FALSE},
        {"dnssec-settime.exe", FileData::BinDir, FileData::Normal, FALSE, FALSE},

diff --git a/win32utils/BINDBuild.dsw b/win32utils/BINDBuild.dsw
index 93eb6c2510350e6380d23f0eefa2cf712e1a03ae..ebacdaa37207b6227f9bd7b26fe47daec92eb4ad 100644 (file)
--- a/win32utils/BINDBuild.dsw
+++ b/win32utils/BINDBuild.dsw
@@ -147,6 +147,27 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "importkey"="..\bin\dnssec\win32\importkey.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+    Begin Project Dependency\r
+    Project_Dep_Name libdns\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name libisc\r
+    End Project Dependency\r
+    Begin Project Dependency\r
+    Project_Dep_Name dnssectool\r
+    End Project Dependency\r
+}}}\r
+\r
+###############################################################################\r
+\r
 Project: "settime"="..\bin\dnssec\win32\settime.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r

diff --git a/win32utils/BuildAll.bat b/win32utils/BuildAll.bat
index a6d61bc815ef6af436b8aaac04917dd9198bf263..be5d9cbfc8e096667d352b3b9c343da273c1731a 100644 (file)
--- a/win32utils/BuildAll.bat
+++ b/win32utils/BuildAll.bat
@@ -110,6 +110,7 @@ nmake /nologo -f signzone.mak CFG="signzone - Win32 Release"  NO_EXTERNAL_DEPS="
 nmake /nologo -f dsfromkey.mak CFG="dsfromkey - Win32 Release"  NO_EXTERNAL_DEPS="1"
 nmake /nologo -f keyfromlabel.mak CFG="keyfromlabel - Win32 Release"  NO_EXTERNAL_DEPS="1"
 nmake /nologo -f revoke.mak CFG="revoke - Win32 Release"  NO_EXTERNAL_DEPS="1"
+nmake /nologo -f importkey.mak CFG="importkey- Win32 Release"  NO_EXTERNAL_DEPS="1"
 nmake /nologo -f settime.mak CFG="settime - Win32 Release"  NO_EXTERNAL_DEPS="1"
 nmake /nologo -f verify.mak CFG="verify - Win32 Release"  NO_EXTERNAL_DEPS="1"
 cd ..\..

diff --git a/win32utils/BuildSetup.bat b/win32utils/BuildSetup.bat
index 1947fb3e0a4f3a40e5c9361eab4b3847606b0225..2cd5316d8182ed4fdadd99adc881ffcc7021d6c1 100644 (file)
--- a/win32utils/BuildSetup.bat
+++ b/win32utils/BuildSetup.bat
@@ -71,6 +71,7 @@ copy ..\bin\dnssec\dnssec-keygen.html ..\Build\Release
 copy ..\bin\dnssec\dnssec-signzone.html ..\Build\Release
 copy ..\bin\dnssec\dnssec-dsfromkey.html ..\Build\Release
 copy ..\bin\dnssec\dnssec-keyfromlabel.html ..\Build\Release
+copy ..\bin\dnssec\dnssec-importkey.html ..\Build\Release
 copy ..\bin\dnssec\dnssec-settime.html ..\Build\Release
 copy ..\bin\dnssec\dnssec-revoke.html ..\Build\Release
 copy ..\bin\dnssec\dnssec-verify.html ..\Build\Release

diff --git a/win32utils/index.html b/win32utils/index.html
index 05151cb093fa3a91ae43828be7bda67fc161dea5..2e89f895780c43b0ca981830d768f4ea7ee3c3ae 100644 (file)
--- a/win32utils/index.html
+++ b/win32utils/index.html
@@ -40,7 +40,8 @@
     <li><a href="dig.html">dig</a>
     <li><a href="dnssec-dsfromkey.html">dnssec-dsfromkey</a>
     <li><a href="dnssec-keygen.html">dnssec-keygen</a> |
-     <a href="dnssec-keyfromlabel.html">dnssec-keyfromlabel</a>
+     <a href="dnssec-keyfromlabel.html">dnssec-keyfromlabel</a> |
+     <a href="dnssec-keyfromlabel.html">dnssec-importkey</a>
     <li><a href="dnssec-settime.html">dnssec-settime</a> |
      <a href="dnssec-revoke.html">dnssec-revoke</a>
     <li><a href="dnssec-signzone.html">dnssec-signzone</a> |

diff --git a/win32utils/readme1st.txt b/win32utils/readme1st.txt
index 19adb7123d48b88989073b3a4ac18a2fa73a05fa..ae38ebd5d9efa9cd946972bcd6556ed740dbd97e 100644 (file)
--- a/win32utils/readme1st.txt
+++ b/win32utils/readme1st.txt
@@ -125,8 +125,9 @@ are HTML pages for each of the BIND 9 applications.
 
 The following tools have been built for Windows: dig, nslookup, host,
 nsupdate, rndc, rndc-confgen, named-checkconf, named-checkzone,
-ddns-confgen, dnssec-keygen, dnssec-signzone, dnssec-dsfromkey,
-dnssec-keyfromlabel, dnssec-revoke, dnssec-settime and dnssec-verify.
+ddns-confgen, dnssec-importkey, dnssec-keygen, dnssec-signzone,
+dnssec-dsfromkey, dnssec-keyfromlabel, dnssec-revoke, dnssec-settime
+and dnssec-verify.
 The latter tools are for use with DNSSEC.  All tools are installed
 in the dns/bin directory.
 

diff --git a/win32utils/updatelibxml2.pl b/win32utils/updatelibxml2.pl
index 3b6377ebc847014cc596708569e18010a9fc458a..b86924dd3e9d3c5fca24c528bdb644445f7ee973 100644 (file)
--- a/win32utils/updatelibxml2.pl
+++ b/win32utils/updatelibxml2.pl
@@ -49,6 +49,8 @@ $path = "..\\..\\";
              "../bin/dnssec/win32/dnssectool.dsp",
              "../bin/dnssec/win32/dsfromkey.dsp",
              "../bin/dnssec/win32/dsfromkey.mak",
+             "../bin/dnssec/win32/importkey.dsp",
+             "../bin/dnssec/win32/importkey.mak",
              "../bin/dnssec/win32/keyfromlabel.dsp",
              "../bin/dnssec/win32/keyfromlabel.mak",
              "../bin/dnssec/win32/keygen.dsp",