rsasha512 fixup and successful test of new winsock handler.

git-svn-id: file:///svn/unbound/trunk@1606 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index d62b78c2033465960a6817af6ac38b3b672c85a0..61473ddae6f3fdd51aa52039e1be26845c7a4809 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
          in spurious event callbacks.
        - timers do not take up a fd slot for winsock handler.
        - faster fix for winsock reentrant check.
+       - fix rsasha512 unit test for new (interim) algorithm number.
 
 16 April 2009: Wouter
        - winsock event handler exit very quickly on signal, even if

diff --git a/testcode/ldns-testpkts.c b/testcode/ldns-testpkts.c
index 9dcb79b1da38b8c938cea027163e492a451c0539..bf389b426afac4ea43898cc98fef516f117a8490 100644 (file)
--- a/testcode/ldns-testpkts.c
+++ b/testcode/ldns-testpkts.c
@@ -590,6 +590,10 @@ match_list(ldns_rr_list* q, ldns_rr_list *p, bool mttl)
                if(ldns_rr_compare(ldns_rr_list_rr(q, i), 
                        ldns_rr_list_rr(p, i)) != 0) {
                        verbose(3, "rr %d different", i);
+                       verbose(3, "rr %d q", i);
+                       ldns_rr_print(stderr, ldns_rr_list_rr(q, i));
+                       verbose(3, "rr %d p", i);
+                       ldns_rr_print(stderr, ldns_rr_list_rr(p, i));
                        return 0;
                }
                if(mttl && ldns_rr_ttl(ldns_rr_list_rr(q, i)) !=

diff --git a/testdata/Kexample.com.+009+48886.ds b/testdata/Kexample.com.+009+48886.ds
new file mode 100644 (file)
index 0000000..b86bf72
--- /dev/null
+++ b/testdata/Kexample.com.+009+48886.ds
@@ -0,0 +1 @@
+example.com.   3600    IN      DS      48886 9 1 eb70a0d5001a3da004b428f01bf15cb5aad22f73 ; xupol-bamyt-hobuc-pyzop-bacur-gupaz-bakoz-cylyr-hepyt-dorol-foxux\r

diff --git a/testdata/Kexample.com.+009+48886.key b/testdata/Kexample.com.+009+48886.key
new file mode 100644 (file)
index 0000000..74f29d6
--- /dev/null
+++ b/testdata/Kexample.com.+009+48886.key
@@ -0,0 +1 @@
+example.com.   3600    IN      DNSKEY  256 3 9 AwEAAazmeO3BNv+xPYuFbQp8JN4XX+iKNuvJgD2QG5jRXI0IP5by+JGSob20OEmbPLqKcXWMRPICTyPBDaBh0tXA66DVlHV8rCtAT5Yqdrz2qw05SNYCGWJulscR6GM0e4gkO1FrBINr385IiMH3sJegBzm2HUbyb2I+xuFIfl7SgMuZ5fahHnhjDwsdgw+19OQlbYDRmNhMvtJemomIiGzPwrxEtKBlcUevcFPX7cPU7lpbcZwVP16xhLbtSNwMHvoCoRpJrAtdDGiSyAzTQef+jWuaUlFCPle6Qkghi51zmpBrPunqRCoYg7LIyJ9zS/KzPKX2zN2ASu9KJD3tDW9OSZM= ;{id = 48886 (zsk), size = 2048b}\r

diff --git a/testdata/Kexample.com.+009+48886.private b/testdata/Kexample.com.+009+48886.private
new file mode 100644 (file)
index 0000000..e2df55b
--- /dev/null
+++ b/testdata/Kexample.com.+009+48886.private
@@ -0,0 +1,10 @@
+Private-key-format: v1.2\r
+Algorithm: 9 (RSASHA512)\r
+Modulus: rOZ47cE2/7E9i4VtCnwk3hdf6Io268mAPZAbmNFcjQg/lvL4kZKhvbQ4SZs8uopxdYxE8gJPI8ENoGHS1cDroNWUdXysK0BPlip2vParDTlI1gIZYm6WxxHoYzR7iCQ7UWsEg2vfzkiIwfewl6AHObYdRvJvYj7G4Uh+XtKAy5nl9qEeeGMPCx2DD7X05CVtgNGY2Ey+0l6aiYiIbM/CvES0oGVxR69wU9ftw9TuWltxnBU/XrGEtu1I3Awe+gKhGkmsC10MaJLIDNNB5/6Na5pSUUI+V7pCSCGLnXOakGs+6epEKhiDssjIn3NL8rM8pfbM3YBK70okPe0Nb05Jkw==\r
+PublicExponent: AQAB\r
+PrivateExponent: FeWqcxIBUSi1TrI7ORS35pi3QNAgXIRMhX92v0fknMfqpcdny6fybAAjEM9kRYu7CtQU90FrnG+atjEtbnzcWqYyAx8i/udKLQ57szraNvaGTvQ9GsY+uj9+WvIOoxNTn+AZ1jsXQRzWlRo1dz6BK8Hwu0eA68Rfk7CGsKOgRCioONwz8m9/GTTxMsZ+VcLkenK/IyYOCnh47vrNkUGb5+3g9Bunkbymcjyhw79DLdMvRRYoqzvhAiGS8r+EpOtAA443iZ+RwfEae7U0VUJEPEEytLb3EZx2qjvWuXtN84tCvXpdum0M7y9dfDojH+I7ZvhiOIMmnWd20ldgjqqOQQ==\r
+Prime1: 0xom8n5L5YrcHIHTAZtQK039Ozqay5vOz6QvqqEiXevAdYdDUQVuX3VSAWCScF9OxfPXHZhX8z4hNpjc8zDirVUDlWRf77Shp1kjdhBZvwwxOp28uuXvg6g3VtTirEp0iwCCt6Wy4HErAKRFFZ0sEq5nzp/fn2y71AAWezLk4Gs=\r
+Prime2: 0axZNMdHG2ornNjoOJzQAgDDibmqBHgebkJg/f6IWI2X1ew044Qg+67t7VzvnkVe7UiVjLJYsnlVmXhIPA618hSIvPb2WH4QFNVBAW8Q9WeCSvczuTeyjg5BxZVNta4tSWrpm+oYLcwn0MDWJMCynQmT5C5pDjEQtlbQrutCZXk=\r
+Exponent1: pQ8+wr6jw3BG2PddsFTrY2DQjv4syOUj2NFNAAKL55oNWxgPN4uimHsYSsFi3wB2jGszmQ1kP2ol+BWgNXrU0qi1a5sXNEstVrdo9cilE6+J0oZBanWdSHlAA+Hi9sokxAb7LnMeIUX7VL4c0mCZdGXv/uycooAXgRUsftn1gc8=\r
+Exponent2: Zc1Ukree4sSt4D3AopwgsphEWH54+iqIO+imxyvqb3RwIEHLfBwPF6RbiT/yZ9ouuO7hDasaPa2DzjwEdoR9+sfVjEosWdL7Y+IW6edPSJe1P0i/KFLOswJhFNnlHS0wd9EdE8KZcsMJIeY/EyEsl+qqj8Oo5mcUQjPspsE7P6E=\r
+Coefficient: SkqMe/RECHeiSYo+DBGMOdBiCKrxDc02W1lVCM9k9tD7lN6OA2KdhxTWGtfNI147kQkRnR8Q6Qv/ushy9S+dYScDXjqB3n1vpKaklvPdWOXGokJds6zgiviUKxtYuFiDoluPNEdHblk9sThkTBb2qpb17R9xUNIX4zRidkQweHQ=\r

diff --git a/testdata/Kexample.com.+010+18320.ds b/testdata/Kexample.com.+010+18320.ds
deleted file mode 100644 (file)
index 5f1b08c..0000000
--- a/testdata/Kexample.com.+010+18320.ds
+++ /dev/null
@@ -1 +0,0 @@
-example.com.   3600    IN      DS      18320 10 1 c75d2cba6104e3962f93f326b1cbbee877e22f2d ; xucoh-torir-pamyb-gomon-kyrun-fased-kuses-rizuv-motov-dered-texyx

diff --git a/testdata/Kexample.com.+010+18320.key b/testdata/Kexample.com.+010+18320.key
deleted file mode 100644 (file)
index a506d6d..0000000
--- a/testdata/Kexample.com.+010+18320.key
+++ /dev/null
@@ -1 +0,0 @@
-example.com.   3600    IN      DNSKEY  256 3 10 AwEAAb3HJP1WF0wWvk9VqqZ2+xTpURPSwyiZcNRlO/hAXJisMA4/ZN2Kf0aNGewVDa6IhT8ehww5FBvVJm3R1KW/hqO+H3WzvCBpVDv1JdDqZvHMGiqEd2lCfKz4+fxuJ+HeUJBZlTz6pm9Rlqevry5uB7sKpgddDe2fK9CFCr7M1BzX ;{id = 18320 (zsk), size = 1024b}

diff --git a/testdata/Kexample.com.+010+18320.private b/testdata/Kexample.com.+010+18320.private
deleted file mode 100644 (file)
index 2c388ae..0000000
--- a/testdata/Kexample.com.+010+18320.private
+++ /dev/null
@@ -1,10 +0,0 @@
-Private-key-format: v1.2
-Algorithm: 10 (RSASHA512)
-Modulus: vcck/VYXTBa+T1Wqpnb7FOlRE9LDKJlw1GU7+EBcmKwwDj9k3Yp/Ro0Z7BUNroiFPx6HDDkUG9UmbdHUpb+Go74fdbO8IGlUO/Ul0Opm8cwaKoR3aUJ8rPj5/G4n4d5QkFmVPPqmb1GWp6+vLm4HuwqmB10N7Z8r0IUKvszUHNc=
-PublicExponent: AQAB
-PrivateExponent: i12zzFdsxHPvTlOa/qRhvvmYkPY2W5pTQacWYzjgxz2sDMqBSDBtR2JXpwfPBF09fRzuEAvauJXPotZ1U0NTm6erHSB7KaJN0GZRwNVty8MCoKjr3gDR1b82rEUexr3cTfq6+7ij8GZvhEY7vGNGKYyrj5t+wwZP9D/XB2okwAE=
-Prime1: 6lwq8K9nQC2Sxu2Vhp4a/q0cCEAk57GWdegBJW5btVYz1v87mgvR3x/tAXVgQhpwUk3U9L6wSR1z8HhEfEbp+Q==
-Prime2: z00jjSIdxRyE0XE3GKST0cZmFVc67Ov9OtV+tfFKbutR1ZokKqX4oEBf12rQDJgeBjCOoBAZOVwB8XLHlcNxTw==
-Exponent1: yOgWT5quks/+wdYulua3EZhpLZF/kbgl2hH32ZTPvZaWfjrzZ022ruZ5kQSEbman34alhuJp0WQUXhNb8oYAUQ==
-Exponent2: ewXvXDlr62diVx1WMjSxWOPh/zY2TRY7wOeke/tHTg4vEZGZdwnqQ8gQWLoV3/OCle/JJKqJHaZBrPWOBo3nNw==
-Coefficient: sMfUpptJTxBdhqgUVbunh6xtTpZWQ+tyR2DeLom2enXAFqiMBbhjgFA7CptPpsQFqkghdRvnz1JG2QYKLuWbbw==

diff --git a/testdata/test_signatures.10 b/testdata/test_signatures.10
index a5404f865a246bc0b232f81bad3912f2a8ffff08..4000bf5805d209fc3dd08ca0326f747ec800f8a5 100644 (file)
--- a/testdata/test_signatures.10
+++ b/testdata/test_signatures.10
@@ -10,7 +10,8 @@ ENTRY_BEGIN
 SECTION QUESTION
 sub.example.com.       IN DNSKEY
 SECTION ANSWER
-example.com.   3600    IN      DNSKEY  256 3 10 AwEAAb3HJP1WF0wWvk9VqqZ2+xTpURPSwyiZcNRlO/hAXJisMA4/ZN2Kf0aNGewVDa6IhT8ehww5FBvVJm3R1KW/hqO+H3WzvCBpVDv1JdDqZvHMGiqEd2lCfKz4+fxuJ+HeUJBZlTz6pm9Rlqevry5uB7sKpgddDe2fK9CFCr7M1BzX ;{id = 18320 (zsk), size = 1024b}
+example.com.    3600    IN      DNSKEY  256 3 9 AwEAAazmeO3BNv+xPYuFbQp8JN4XX+iKNuvJgD2QG5jRXI0IP5by+JGSob20OEmbPLqKcXWMRPICTyPBDaBh0tXA66DVlHV8rCtAT5Yqdrz2qw05SNYCGWJulscR6GM0e4gkO1FrBINr385IiMH3sJegBzm2HUbyb2I+xuFIfl7SgMuZ5fahHnhjDwsdgw+19OQlbYDRmNhMvtJemomIiGzPwrxEtKBlcUevcFPX7cPU7lpbcZwVP16xhLbtSNwMHvoCoRpJrAtdDGiSyAzTQef+jWuaUlFCPle6Qkghi51zmpBrPunqRCoYg7LIyJ9zS/KzPKX2zN2ASu9KJD3tDW9OSZM= ;{id = 48886 (zsk), size = 2048b}
+
 ENTRY_END
 
 ; entry to test
@@ -19,6 +20,7 @@ SECTION QUESTION
 www.example.com.    IN      A 
 SECTION ANSWER
 www.example.com.       3600    IN      A       192.0.2.66
-www.example.com.       3600    IN      RRSIG   A 10 3 3600 20070926134150 20070829134150 18320 example.com. m0FS92Zg6oyJE7CEwa4o2hkV+U6M/Xvniem/vLo9pz4tsAv7xxlMgT0Q8Uxl+pugiHTMSJ78V6fG/Kv6FZgesxKu70mLHQo1SjAgozRHuNwUB6cD8yeOeX0WafbRW4IfvSs6uauc+/SRukBFhJMdiX/IXw3syUGfntm03jcpWoc= ;{id = 18320}
+www.example.com.        3600    IN      RRSIG   A 9 3 3600 20070926134150 20070829134150 48886 example.com. Ys6CGNAxJ+0lG/EoDJqZOoZTlX8Aa1k124VjnSE2A9NTecZUX44TiKtJQtUu7cnUcURuNsqX5rulr/70Vx+ANeUot/ewtY6fX6qaGZVgIaNyyDw0Gu7oiAsjOE0bt5RS4VGvDpLSdxDlPV0Kbbc4fYSTsqiSe2idMokfD2bgPcFrIx2TcX/sF8Jyhn2MGiQsWryMWyvhRTZ1+dwQcPhkeslGFLF/SQpGx5BbW/BYQG026xb6ckL/F/Pu4Jf5sQTimTZXHi9iASeRNO34DM9bS0yDgc+nm3bEg8/pEGCdFuCt6dVv7JTFgnR9fPTbEbBHIi4ORw1oef11G2sRV/Ubvw== ;{id = 48886}
+
 ENTRY_END
 

diff --git a/util/winsock_event.c b/util/winsock_event.c
index 4e5a9f2b7016399d605c6650782d04ab9f70c547..33cf08a107cc983371a737bbe82d6d8e4ce26544 100644 (file)
--- a/util/winsock_event.c
+++ b/util/winsock_event.c
@@ -293,7 +293,7 @@ static int handle_select(struct event_base* base, struct timeval* wait)
        /* callbacks */
        if(base->tcp_stickies)
                startidx = 0; /* process all events, some are sticky */
-       for(i=startidx; i<numwait; i++) {
+       for(i=startidx; i<numwait; i++)
                eventlist[i]->just_checked = 1;
 
        verbose(VERB_CLIENT, "winsock_event signals");
@@ -588,7 +588,7 @@ int event_del(struct event *ev)
                ev->ev_base->max--;
                if(ev->idx < ev->ev_base->max)
                        ev->ev_base->items[ev->idx]->idx = ev->idx;
-               zero_waitfor(base->waitfor, ev->hEvent);
+               zero_waitfor(ev->ev_base->waitfor, ev->hEvent);
 
                if(WSAEventSelect(ev->ev_fd, ev->hEvent, 0) != 0)
                        log_err("WSAEventSelect(disable) failed: %s",