Parcourir la source

- add empty non-terminals to nsec3 test data
- fixed a bug in which NSEC3 parsing would fail if there were
no rrtypes listed
- also, ignore exceptions when a listed type is not recognized


git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1159 e5f2f494-b856-4b98-b285-d166d9295462

Evan Hunt il y a 15 ans
Parent
commit
4f63a46a6a

+ 1 - 0
src/bin/loadzone/testdata/sql2.example.com

@@ -9,3 +9,4 @@ b	3600 IN A 192.168.2.2
 c	3600 IN A 192.168.2.3
 c	3600 IN A 192.168.2.3
 d	3600 IN A 192.168.2.4
 d	3600 IN A 192.168.2.4
 www	3600 IN A 192.168.2.5
 www	3600 IN A 192.168.2.5
+e.f.g.h.i 3600 IN A 192.168.2.6

+ 173 - 125
src/bin/loadzone/testdata/sql2.example.com.signed

@@ -1,4 +1,4 @@
-; File written on Fri Mar  5 19:18:38 2010
+; File written on Sat Mar  6 13:18:20 2010
 ; dnssec_signzone version 9.7.0
 ; dnssec_signzone version 9.7.0
 sql2.example.com.	3600	IN SOA	master.example.com. admin.example.com. (
 sql2.example.com.	3600	IN SOA	master.example.com. admin.example.com. (
 					678        ; serial
 					678        ; serial
@@ -7,23 +7,23 @@ sql2.example.com.	3600	IN SOA	master.example.com. admin.example.com. (
 					2419200    ; expire (4 weeks)
 					2419200    ; expire (4 weeks)
 					7200       ; minimum (2 hours)
 					7200       ; minimum (2 hours)
 					)
 					)
-			3600	RRSIG	SOA 5 3 3600 20100405021838 (
-					20100306021838 63192 sql2.example.com.
-					GHZ2Emfin4Fj4sKSAfhoDuHYo1omaAHFXdW3
-					bn8NjR+DXxKlhwCtZnnatWFcvrAxkkOipcLw
-					DGViJdrRvkKXShnZewapuYwUmX7RK1nbqJPo
-					Xvzs6QyhkaEcunNjf7qr8bbgAgV1z66dpzYL
-					tBSukPE4lgDHxT+BPE7TgB9Jvdc= )
+			3600	RRSIG	SOA 5 3 3600 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					KfrQ9XOqmkznma/GOmSdSBsi53eBhJiJ3n5t
+					58GUXgJNKNyKoNnFNABXfKKpNZzSXd0TXTbw
+					f3ZAQiP6i06y0PymmJepYsAZLJ5xXsK4Pk7t
+					ktJkiHht54PCcpJFWL0+vet9KGCE9U9P6KZW
+					0H5TfkPf9ZT9HoAe4q52UWYWs1w= )
 			3600	NS	dns01.example.com.
 			3600	NS	dns01.example.com.
 			3600	NS	dns02.example.com.
 			3600	NS	dns02.example.com.
 			3600	NS	dns03.example.com.
 			3600	NS	dns03.example.com.
-			3600	RRSIG	NS 5 3 3600 20100405021838 (
-					20100306021838 63192 sql2.example.com.
-					K/C9TBGNjaf9jwPAxNQlfN4qpTr07kYMmPyI
-					B3ScvmgVONa7+4LI86bSBDYC0qXhVo+oGkJc
-					u7DhcZ5YyaypafuoZTu4/Cbwqthwel69pw9Q
-					xi0kMWHv9/ijYTxplzG0oQZeZjgJ04hWukR8
-					L8FgtTwwL6IHI8llZqXBiAihsrQ= )
+			3600	RRSIG	NS 5 3 3600 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					RgvWnLGEjr8fAF8H1b63Ga3r0//ZJeIHYnhj
+					6xi9uLF/htHH7bUtWlh7C8YSPhcdPzLm34+P
+					MTl0B8+c4GIfaK/HLEL9lGlm/1ETHN55W8e9
+					U/4AOZQUG5RALQumlZDUFYWWz5yHFh5U2e1S
+					uCmPWCIMHypQ43bCzcaZ+5Fi1fM= )
 			3600	DNSKEY	256 3 5 (
 			3600	DNSKEY	256 3 5 (
 					AwEAAdKcbdCUqIv7gGzBFnmNaZjSY9uLXlYD
 					AwEAAdKcbdCUqIv7gGzBFnmNaZjSY9uLXlYD
 					mMC9XOYN79SIEdIYwvsiiygvURBxutSclG9R
 					mMC9XOYN79SIEdIYwvsiiygvURBxutSclG9R
@@ -43,118 +43,166 @@ sql2.example.com.	3600	IN SOA	master.example.com. admin.example.com. (
 					O9+hO4L7Wu8I89qJY2/xQ6SpDVHCoAj6kf3F
 					O9+hO4L7Wu8I89qJY2/xQ6SpDVHCoAj6kf3F
 					O/7YAwy60bef5HaUN7d/SY8=
 					O/7YAwy60bef5HaUN7d/SY8=
 					) ; key id = 38482
 					) ; key id = 38482
-			3600	RRSIG	DNSKEY 5 3 3600 20100405021838 (
-					20100306021838 38482 sql2.example.com.
-					yzX77VLc88eiigZECMPwR11vtVhoSAUL0Ado
-					us91613C9mskvBu2ThYalkwAQiQHJa3fOal+
-					a3DBzaGOI2n8FkynP/t2BjeSwNUR+k4Ts+kb
-					UBDIKA3f08bpXjWMRvRP+sLXZ98DiqU/7AkO
-					farImxOwVTrbvt14IjVCcQlal77pnWKNSWPE
-					0aDAtkqQNE5yDDik5Aj2aTtoSUKBvthBBH9+
-					zkNUmvUDSF0Ulywv3xUOpOldqoG9eWThogRg
-					zpRXYw4mrCBKrCTlbpQtrfn2o+GbTScMxAYk
-					cgqnfN8LkpzSYtK8HlGwhLHigSl3uB+M1F5n
-					WxD+6iKvsWMnnycdHA== )
-			3600	RRSIG	DNSKEY 5 3 3600 20100405021838 (
-					20100306021838 63192 sql2.example.com.
-					V84sEJFayUmg2mAvCJpirRy15dgRMQUJnqkX
-					xG8wO3vd8nNoQBZMoBJOFcDrEKvd81Vo/zoG
-					Namrhzx8MMtRxXzt0Q++mN0i376rTfNoTs1o
-					iJJ6x5V1o3X+Dt62F9aBRS7nqWRwAum7Eh1V
-					ViFKiSoLFiW+n+u1zwXYNx77lag= )
-			0	NSEC3PARAM 1 0 10 ADDFEE
-			0	RRSIG	NSEC3PARAM 5 3 0 20100405021838 (
-					20100306021838 63192 sql2.example.com.
-					KlhkWFiZuMp45BiugsAVV1RfiokV0mqLYibu
-					XGZttNfk2N1mDiGVLUyc2Y4Rdp4Xvma3lpGB
-					XZPCrdvky4eI+KwBi8dM7+pi1YPcQcEKyLYP
-					FN2I5GAehN5l0p/mEDJhxRym4Z+KaP4piHYI
-					Qlwdg/mLlPaAatG3TzMknNyjrVA= )
+			3600	RRSIG	DNSKEY 5 3 3600 20100405201820 (
+					20100306201820 38482 sql2.example.com.
+					QPTX3naB0fXW1Fo7j5YRs1+TRxqB5RwZaK3k
+					WAdFYdYgzYUtgFQnPr+5XHsbRaSw9Pjm9xR8
+					cg4Yzj0tfTJKW9evCVvnq85UTI9RUG8Jrd2H
+					7SudiWEw9c/PyAtF3jfJVD5jOnLnW+eG3qOw
+					RlmKQ3KWXh8JqeR9jhPKU7HyuOV4c+gnVwjA
+					DkLrBXNj9lwkHL5OAxsx7Z1MFdz43WuCweUM
+					cRhhs67y/6Ftbg+lV+Rx5PqypUuduUGSvYBc
+					E1At7oNwNOGctlw2HoA9INZFhXFJAvzMjSvr
+					9qMGYgFkPPwmEQHP5MyZK2I350W5aJIknQjh
+					eVBAxePYykiyWwjWaA== )
+			3600	RRSIG	DNSKEY 5 3 3600 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					AaVZLzIiQOVAmRsWbFHAJ+roA4sEPCwDjzS0
+					QGVWPNLgWRE2lvg1emwz2tabOf+MN4ZsNNma
+					GRJaY12U0/2+f6E7SFM1pbvGXa9Xy+5rUTeQ
+					oBPrRsupzQnu5/tf7GdIyK7GLP0mjbK/C3mz
+					7c8SpKQfYY2PlWeSuq7oOF/LMq8= )
+			0	NSEC3PARAM 1 0 10 FEEDABEE
+			0	RRSIG	NSEC3PARAM 5 3 0 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					t7HGVQG6264k6exPk83u4TCfu+7bh+gu5Lnz
+					T4Mv4kxYAtT6HXaVo4qc30xbizdINbb1WEFc
+					YtHcbPE+nkq5g840D9NZHvVXbnQuCpoPJ+m2
+					KaiL068ACSzroZfwBIZc0lZ+HZTdEgi6ra39
+					nhCwsuRy5txVuJDmJo9Og9SUlwg= )
 a.sql2.example.com.	3600	IN A	192.168.2.1
 a.sql2.example.com.	3600	IN A	192.168.2.1
-			3600	RRSIG	A 5 4 3600 20100405021838 (
-					20100306021838 63192 sql2.example.com.
-					ci3CrRml5ml74tNrEy/Bgy/CWaXP1sNoSTVi
-					0jgdzKGXg3xiOmbENEGr+mkbqH4hMVHzn3OO
-					ovqui7mL55C40fMPZb9rwSe9G7XvivBRlJY+
-					4JFdOWZNc1TBmjukDyR/MVpNz8wdtgeNbqPD
-					LsnRejxgvWXZMbjGk7sn7JglE5M= )
+			3600	RRSIG	A 5 4 3600 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					m/PjnWPZqPwjyfLB2fW+y5LTTOYMTfIWzCGh
+					Tmw1mgjLUEkkuOp9Ek86rSLlQzonR0Vsfepd
+					UtFblJhaeL+sHAZHrKE2jJfMC92XbJ8mmy/B
+					xtcPF4nSwb4rsKf/+aeWwyZYgiP4QJhkqjpC
+					VAgT7XZPokrWniZ1rCnIxBcjY9o= )
 b.sql2.example.com.	3600	IN A	192.168.2.2
 b.sql2.example.com.	3600	IN A	192.168.2.2
-			3600	RRSIG	A 5 4 3600 20100405021838 (
-					20100306021838 63192 sql2.example.com.
-					jG7Hlyg/M2SmPKG65jjzBsmwboWY7fpzSXm/
-					3h8luq/rvIlxU65XO6nAjweQOj4vJRsx3DxD
-					+sTcAsBbyAjsyfe1lDWlyIWB7xXCSdafNNWX
-					0GWV1+/v8cOLd1xwZhx7vIA8TkcWUvw6BNkX
-					896bCfew9yw2Z/GsSdTWlwdybBE= )
+			3600	RRSIG	A 5 4 3600 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					GS11IPL8gFNY+iHcDkkFWbHL9ZIIiUoBvuC/
+					ZUES7tuUgAEQYNH0AK29+f6hT7LprF9bbZmD
+					Gt7/vDR/h+n+18tPDCMZHCaF0jw9R49GF6cL
+					heli66yHq0ONsDMSrBRz91s+Bppo31qkLWc3
+					JKhrBr3DR+tUq49K6tGKbruR5Q8= )
 c.sql2.example.com.	3600	IN A	192.168.2.3
 c.sql2.example.com.	3600	IN A	192.168.2.3
-			3600	RRSIG	A 5 4 3600 20100405021838 (
-					20100306021838 63192 sql2.example.com.
-					k9s9zNDcO0BR+Gy+2zeFq1O/KNtq0y609Rwy
-					AsGpNjiF08rPWVpEUXDJDsO7gx03ES4gnbou
-					LYwtBrzlekjofSga8FtkWkcLaxCZ6+X1kuJJ
-					rBIaiq3AJkzIE4RvdqymOWMgGSb9W9szcbnd
-					h1OOHdoyW53z8O3EAEUFS16OAGs= )
+			3600	RRSIG	A 5 4 3600 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					LwPaUY7rquTT7UAoIPje6r/zLSuHrjYN/ecG
+					hWBIrZCTfxU0zJBc3t2r2GqOO06FTqxxpiVX
+					zmf6XkfqXlDTNn7uyH4uugOOdPYQrq2LVwAx
+					XVSBJpzROZZ4lnUmn8+W45L6a2ebVobSnWoJ
+					vDUI7cCXWI11wZeN1j65oGDT5EE= )
 d.sql2.example.com.	3600	IN A	192.168.2.4
 d.sql2.example.com.	3600	IN A	192.168.2.4
-			3600	RRSIG	A 5 4 3600 20100405021838 (
-					20100306021838 63192 sql2.example.com.
-					NeXmw3JQHJnfkvO/TeyNgtCYVMqNB24xB+gA
-					sMTbmsOp6AeYHCLe23yej3OiSFZE2ZDcGl7u
-					nAACdOtGhuLTXWgFIkAArK2uJEEzLcbxeYKG
-					XigvbKSGLayFiCWFKUrkCY45LSx8BFm8T1lL
-					gqqaEOoLsyXIMsaXZr+lxVKvloo= )
+			3600	RRSIG	A 5 4 3600 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					kotSmXQv4S8QWPt9PLv1ZMtATi+LJgQ+9KdO
+					D+5TKxGDNVX8ZMgvRZYxO7mJZU3yKT6abpL/
+					5JKB1zoFnvAe7Y6rQHIedVydkHYYHVedrzy1
+					aOQyNvOTlpIEkOeBDnZ+xL/FkA4nsBH8ZWJp
+					DgO5gB8z4jRqhfHGvOyLTGxlp4s= )
+e.f.g.h.i.sql2.example.com. 3600 IN A	192.168.2.6
+			3600	RRSIG	A 5 8 3600 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					j/3kOA3Uz0y2K+khDEHjDebhpza+q4JvSHot
+					crGI5vybYAJaVtvkAEwHbC9joL+ZWbO7dhnM
+					E29UiDaZPWFNxbwc8Y+XdbPzfas5HLNbBSOx
+					LHUgEUvoCS/67Rsq31NXJHiIX2RWKjgbhesU
+					euKp4xfo3oNcHVha1W9vE/4Aycc= )
 www.sql2.example.com.	3600	IN A	192.168.2.5
 www.sql2.example.com.	3600	IN A	192.168.2.5
-			3600	RRSIG	A 5 4 3600 20100405021838 (
-					20100306021838 63192 sql2.example.com.
-					lU5C4PWsIGRpr9J+L9/4/qa0DtSI8UqKsifT
-					sR6PvqCaQ1ckrBo7ydUMhvAFgaxMGellPx3L
-					bCiXg6lTmmYhu8OjD+MP75O0Wf0eHiLFc30O
-					ff+vxHXnr8nD3NaipNS2tknoJLTnN20B2IEe
-					si8jhHmKzDVQWiHDcWbk1mjXolI= )
-2BGB4LBTNVHRI9AK6UAJHH2OJT502O0N.sql2.example.com. 7200	IN NSEC3 1 0 10 ADDFEE GL4QIPNRBF61DU386BB2KR5421KMG027 A RRSIG
-			7200	RRSIG	NSEC3 5 4 7200 20100405021838 (
-					20100306021838 63192 sql2.example.com.
-					dkKEl+NpM93LpRGbz2kQqLvxOfzepLwTeM9/
-					jmU61386kWjhgMMBtw1BUBgukid3frGR6nvV
-					nJZxfFGUlLPI8xYHZ3jd4tvmVihCJLqgrYKq
-					kn1RS8iDWzJTcnCnoh/tk56WKRBbmSCRwa06
-					N4kzs7xDwZza/llhwKO0wtISEXk= )
-GL4QIPNRBF61DU386BB2KR5421KMG027.sql2.example.com. 7200	IN NSEC3 1 0 10 ADDFEE HTD0INO9630H7MCGPOEB6MF9SPVCA3R0 A RRSIG
-			7200	RRSIG	NSEC3 5 4 7200 20100405021838 (
-					20100306021838 63192 sql2.example.com.
-					xtklCx/faeEek/n0jipi+vOE+4wPqEDslD9t
-					iH/8XjR++2mVyYDqdttt4iVAnr66hFQ31ftJ
-					aLzFM951s2b7nyfHupJgRudyA9Y6uX2lFIjl
-					zrzRgZwMXwg7Ob0zX3M+09KccTt95wYO8/i4
-					hvRRerk/0XCpkfU0OE7aF5VBuos= )
-HTD0INO9630H7MCGPOEB6MF9SPVCA3R0.sql2.example.com. 7200	IN NSEC3 1 0 10 ADDFEE MKI8J0I7MHI2U4K0L3V0VLIRI3RCAD7R A RRSIG
-			7200	RRSIG	NSEC3 5 4 7200 20100405021838 (
-					20100306021838 63192 sql2.example.com.
-					DKv1FkZRyhNQxia2+hxtcQsOaA60gC0xPujv
-					vm3omETNxll7PwO69b9Nmh5/nv8CbxDrl+fQ
-					AbzBPP6FZdbQfR6yjLt+Xef1YG79qK6EEJpM
-					ylneYdx54cxTUo3WcviuBKygFc/clrr6Hea7
-					EC2YHjVfCniiqS3d9KrULV6KpL0= )
-MKI8J0I7MHI2U4K0L3V0VLIRI3RCAD7R.sql2.example.com. 7200	IN NSEC3 1 0 10 ADDFEE OQRIGUURA2EA10PTM2S3E8FF152OLJFM A RRSIG
-			7200	RRSIG	NSEC3 5 4 7200 20100405021838 (
-					20100306021838 63192 sql2.example.com.
-					Hk1MQB/K/xVocCITenl81R2SJlVklk9D0rUO
-					VHnaL35hO3pCznZQ3A8KzLjE0Zy8m1Yh7Pkb
-					w+KmjwpxTsj9cDFeUO050bwbM7cdesnRUBUR
-					0rLAQfZBI6UALTCkTj6sBbpOXYZHToeBr7ac
-					ZidcGHEkDMRonYePH+QD845fJSk= )
-OQRIGUURA2EA10PTM2S3E8FF152OLJFM.sql2.example.com. 7200	IN NSEC3 1 0 10 ADDFEE OU39TUD6NV4L80BF15H6TJ6DVNOERDP0 NS SOA RRSIG DNSKEY NSEC3PARAM
-			7200	RRSIG	NSEC3 5 4 7200 20100405021838 (
-					20100306021838 63192 sql2.example.com.
-					QZrp4Vqz2Muvrc2duM1sxgDFZBEJNOyaZTMx
-					F6OaVKOFZhcZQBzKJZkANDarJmKlwsSW9BAD
-					JvP5RpGzHAtL8zVSWJgeEkL47ldHdejyHhCQ
-					6Z8F3ip7lonIx9J3HoSQz3OSJS9chX63eAS9
-					2XegwKglK0aGl4UE5qxIURQj4TA= )
-OU39TUD6NV4L80BF15H6TJ6DVNOERDP0.sql2.example.com. 7200	IN NSEC3 1 0 10 ADDFEE 2BGB4LBTNVHRI9AK6UAJHH2OJT502O0N A RRSIG
-			7200	RRSIG	NSEC3 5 4 7200 20100405021838 (
-					20100306021838 63192 sql2.example.com.
-					qhn5WW5nC9neuarr1947bUW6rS4X0P8vU/L7
-					KlyzrbhPVDK/3Ko+S02nIonZ2Q7WMW2twb2A
-					N03SoLrwPPkTEK5BqTArbZha6R1a2HU1SNja
-					qtVgHqVKFz2DXY1jcewQ/cE0XwgeMn7Xunvz
-					E9Tk0jcWsfCJhs7E6TQ8IkeDvoM= )
+			3600	RRSIG	A 5 4 3600 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					Lzm869uT+scWYaZ4i1d3w6KlyHQ2dTTRS6gB
+					IUz0ICIHjokohuRvPSwaT+58fystxHCTyagi
+					YljhAkqu5uEDimpZbD+1emVougCB/+oZ13hM
+					tJRWYhm0DRi5k1op0YUPjZOK+cjD401R72eU
+					MoW3mvMWUtLfjfEPEICRtKhka4s= )
+1BB7SO0452U1QHL98UISNDD9218GELR5.sql2.example.com. 7200	IN NSEC3 1 0 10 FEEDABEE 4KLSVDE8KH8G95VU68R7AHBE1CPQN38J
+			7200	RRSIG	NSEC3 5 4 7200 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					rU0dJzYe7Suv9jV2QxkiLwaQoXHCJkuYKjOf
+					buSKojEn2oLuXGMGZurlUldKXsYZRI0MXLr0
+					YiCdT41l+wYozO7j8o06VRUK+/1O4IDwtFHG
+					qqhuQkdTnRDMnBUM+xv2Mxahqz8Z5vYCXEZN
+					soYp1rItHm5BDnImTZTsltAGSog= )
+4KLSVDE8KH8G95VU68R7AHBE1CPQN38J.sql2.example.com. 7200	IN NSEC3 1 0 10 FEEDABEE 56IEQ664LHDAKVPE2FL179MSM3QAOFVC
+			7200	RRSIG	NSEC3 5 4 7200 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					yId8xp62MPjebbyhF79pFu/PxYzF3c4HYm6c
+					YemNPeSLFIkWFirKPUT6TtLGIsT8oKbYvFOf
+					PLCwaSECf+RADIKGdwY/H/SUdLputQ9eDBh+
+					r4AcAHDcAqUMtKR/n1AH2H/55y6HVYIPcUtV
+					YUxWjDyc8h2pVVItMmIXxnN4u2M= )
+56IEQ664LHDAKVPE2FL179MSM3QAOFVC.sql2.example.com. 7200	IN NSEC3 1 0 10 FEEDABEE 703OOGCKF8VEV1N7U64D1JG19URETN8N A RRSIG
+			7200	RRSIG	NSEC3 5 4 7200 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					FVoPudFuxp9ZuaueUKICGHdJbvGlwc1SFHan
+					YKM8DFRQ0aKErHy9t7bz5AbQnFAFxB9Tp6oQ
+					FNT0/uE5EvnqaePDNB6Fr798f3DWsQtrZHPp
+					m4WRsTPB//Z230TbNvamgVDI0ZQ0oiuWV7ru
+					ougi6h4SvmMElm4DuuP7BGNyxJc= )
+703OOGCKF8VEV1N7U64D1JG19URETN8N.sql2.example.com. 7200	IN NSEC3 1 0 10 FEEDABEE 9MIO34KMC2CTADVUOQTN701HEHAOIJV4 A RRSIG
+			7200	RRSIG	NSEC3 5 4 7200 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					dSffreKHlEI4QfysxhQutKgN+ivXlviZ4DEh
+					hDufXltcqpb6TPaYD6cmuzNn9XuevkkaBUMH
+					xDnIVlswqNM/mAqNPj+JERn0IdYqgo+417eK
+					zWlreJJEKrQmFm2jyR0mOXDA7tfQ+ixJq4rP
+					irsj+J3XwjMC/tRc/CctVJBIPUc= )
+9MIO34KMC2CTADVUOQTN701HEHAOIJV4.sql2.example.com. 7200	IN NSEC3 1 0 10 FEEDABEE C11DRVQ8EROM87TGA0L6SF95TBUQ2NP9 A RRSIG
+			7200	RRSIG	NSEC3 5 4 7200 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					UUsR47rBoq51clFS0a6sif92QIBhG/9GnYyo
+					E6kvm0toDb1MTAGsCDT7GesBUlKwMPX/tTFs
+					9XrkZ6rH+1fXmd+JVTqJmP+1hhKWEw8RpdXL
+					Ipy7ggnV38hwrjrYCWGSBGvNmpBuFDVp1Oq0
+					zqI1b0u161XG8UBReNKljWMq7+w= )
+C11DRVQ8EROM87TGA0L6SF95TBUQ2NP9.sql2.example.com. 7200	IN NSEC3 1 0 10 FEEDABEE C48J0GMNIURCDD3JOIF27DHEOFTO58NO A RRSIG
+			7200	RRSIG	NSEC3 5 4 7200 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					HOoLSVwuScARIEI143WOLRPPDVDGuQdwJpav
+					Zo37xTNE2XArJP/K4kTkzpTru9F8ZWzqwFg0
+					d4OMA9aXQJliXuAv6UXg1cEKTXJZAJq7mGBY
+					0ebGRhoz2I9KmGOKsQBZxICU75W0jhE9b8rn
+					mdADPl/60+e2peHMDHRqJ4N1inM= )
+C48J0GMNIURCDD3JOIF27DHEOFTO58NO.sql2.example.com. 7200	IN NSEC3 1 0 10 FEEDABEE HFJAHGJ7USQ4P089M59VJF93STEC7KOP NS SOA RRSIG DNSKEY NSEC3PARAM
+			7200	RRSIG	NSEC3 5 4 7200 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					pvCVQefsh/pfURkw3vq36NeS5cfyvVqXlr6T
+					RfNSnVy1M7Npxm1m28aQr9BNaZxnmtj2+QLl
+					a6LgPSwbHA1TMADQh5Ox3kgsXpcbfbk1DL81
+					jZ0JXvq9l6zz2QXCkWDCKpCk6Wqb8/Pu3R4M
+					v2URnSwvAjy0sCLfaW896ltUpxA= )
+HFJAHGJ7USQ4P089M59VJF93STEC7KOP.sql2.example.com. 7200	IN NSEC3 1 0 10 FEEDABEE LEK0EOMORCJS470JFDVAM4KODNFE81VK
+			7200	RRSIG	NSEC3 5 4 7200 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					fzcwXVhbPS0GwEJevd+rapWWYDrXa5Ax7rOm
+					VPEIfaPETeMbgme5791+xz4cLK2UJseY1+gI
+					K8de/c/NkaUXVN+zUvaiQocLFT66qcHq2Bmr
+					DD309UQ0KnbM7XSH7PlbeCND6qbaFSSEJEoL
+					Tootbi7siyRVHVB68tycVZ9Cqps= )
+LEK0EOMORCJS470JFDVAM4KODNFE81VK.sql2.example.com. 7200	IN NSEC3 1 0 10 FEEDABEE LU05RS28R05LDEKVCLMFTQRO181U41TO A RRSIG
+			7200	RRSIG	NSEC3 5 4 7200 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					wCn3qQvxBMzhGf94+o3xqLo0waxvuaUgH0sX
+					Q6E+yqwq+R5zRsjMdug42ZsaHMH1ZsaojFCM
+					mOlnlcrpbksMrQmQbAyuf2JGnl87PPvDlzq+
+					UZjIgh11c87LDTGkskjxRSd+RbKEVD07z1WO
+					em7vZHzv9PxluAtJbYlk2FBoEWI= )
+LU05RS28R05LDEKVCLMFTQRO181U41TO.sql2.example.com. 7200	IN NSEC3 1 0 10 FEEDABEE RKBUCQT8T78GV6QBCGBHCHC019LG73SJ A RRSIG
+			7200	RRSIG	NSEC3 5 4 7200 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					dOmFGke6UMAu7IpgZEe5QLbupKfRvdGHvIZh
+					enEcTQysPPTeR1wVgHZnjMNXNadEjezUQYqA
+					3XPeVD/tlO1rwGaWdhhaBqTRFOZc4yT05Naj
+					JPY3Xy+riJkIy4g5M+iuk5ybheV3mYZM2fO2
+					rONFJ6aGiJ8V2kZbeSjjLGm6t2g= )
+RKBUCQT8T78GV6QBCGBHCHC019LG73SJ.sql2.example.com. 7200	IN NSEC3 1 0 10 FEEDABEE 1BB7SO0452U1QHL98UISNDD9218GELR5
+			7200	RRSIG	NSEC3 5 4 7200 20100405201820 (
+					20100306201820 63192 sql2.example.com.
+					lsQHuIrErkWE9IITEKW4KtK1PmzEC30LkmnR
+					/slhFCaC8U460pSuNyDeG4OvZ3gq96kdRQWo
+					8eDPnCsMcL+slvN47JQPkDwg01HyrJcTa/5U
+					UIUgKKHO6WgwFl+Ny8hzg0z1+DFJ0VjJz443
+					0Y/aRJVdzTronHlN/JlAqjbTmnQ= )

+ 9 - 2
src/lib/dns/rdata/generic/nsec3_50.cc

@@ -96,8 +96,15 @@ NSEC3::NSEC3(const string& nsec3_str) :
         string type;
         string type;
         int code;
         int code;
         iss >> type;
         iss >> type;
-        code = RRType(type).getCode();
-        bitmap[code / 8] |= (0x80 >> (code % 8));
+
+        if (iss.eof() || type.length() == 0) {
+            break;
+        }
+
+        try {
+            code = RRType(type).getCode();
+            bitmap[code / 8] |= (0x80 >> (code % 8));
+        } catch (...) {}
     } while(!iss.eof());
     } while(!iss.eof());
 
 
     for (int window = 0; window < 256; window++) {
     for (int window = 0; window < 256; window++) {