Remove dns_message_rechecksig()

This is a tiny helper function which is used only once and can be
replaced with two function calls instead. Removing this makes
supporting asynchronous signature checking less complicated.

diff --git a/bin/named/server.c b/bin/named/server.c
index 162b556542488510909caa5cd5930e2456c9d18b..6c4ed095ab483a7511a003222dafa95675319425 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -10117,7 +10117,8 @@ get_matching_view(isc_netaddr_t *srcaddr, isc_netaddr_t *destaddr,
                        }
 
                        /* Check the signature, then release the quota  */
-                       *sigresult = dns_message_rechecksig(message, view);
+                       dns_message_resetsig(message);
+                       *sigresult = dns_message_checksig(message, view);
                        if (sig0_qresult == ISC_R_SUCCESS) {
                                isc_quota_release(&sctx->sig0checksquota);
                        }

diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h
index 677e02826c1c5430be3864121ede683492211d74..ed135979d5ff21fbdb60c54d9e66b0c1ce3f27d1 100644 (file)
--- a/lib/dns/include/dns/message.h
+++ b/lib/dns/include/dns/message.h
@@ -1327,27 +1327,6 @@ dns_message_checksig(dns_message_t *msg, dns_view_t *view);
  *\li  #DNS_R_TSIGVERIFYFAILURE - The TSIG failed to verify
  */
 
-isc_result_t
-dns_message_rechecksig(dns_message_t *msg, dns_view_t *view);
-/*%<
- * Reset the signature state and then if the message was signed,
- * verify the message.
- *
- * Requires:
- *
- *\li  msg is a valid parsed message.
- *\li  view is a valid view or NULL
- *
- * Returns:
- *
- *\li  #ISC_R_SUCCESS          - the message was unsigned, or the message
- *                               was signed correctly.
- *
- *\li  #DNS_R_EXPECTEDTSIG     - A TSIG was expected, but not seen
- *\li  #DNS_R_UNEXPECTEDTSIG   - A TSIG was seen but not expected
- *\li  #DNS_R_TSIGVERIFYFAILURE - The TSIG failed to verify
- */
-
 void
 dns_message_resetsig(dns_message_t *msg);
 /*%<

diff --git a/lib/dns/message.c b/lib/dns/message.c
index 4f0d7740faa1dc7718ec7bdd62b3c6be93abd420..e99fd5edc9ae673958a6889de96ecd881762f1c8 100644 (file)
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -3177,12 +3177,6 @@ dns_message_resetsig(dns_message_t *msg) {
        }
 }
 
-isc_result_t
-dns_message_rechecksig(dns_message_t *msg, dns_view_t *view) {
-       dns_message_resetsig(msg);
-       return (dns_message_checksig(msg, view));
-}
-
 #ifdef SKAN_MSG_DEBUG
 void
 dns_message_dumpsig(dns_message_t *msg, char *txt1) {