If HAVE_LIBCRYPTO isn't defined, define a stub signature_verify().

That cleans up its callers.

diff --git a/print-isoclns.c b/print-isoclns.c
index f2903941ba97ed07484952ea09cfefc3e52232d8..2cbb330179101c1f89911bb8cf775c9d8405b145 100644 (file)
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -2667,13 +2667,9 @@ isis_print(netdissect_options *ndo,
                if (tlv_len != ISIS_SUBTLV_AUTH_MD5_LEN+1)
                     ND_PRINT((ndo, ", (invalid subTLV) "));
 
-#ifdef HAVE_LIBCRYPTO
                 sigcheck = signature_verify(ndo, optr, length, tptr + 1,
                                             isis_clear_checksum_lifetime,
                                             header_lsp);
-#else
-                sigcheck = CANT_CHECK_SIGNATURE;
-#endif
                 ND_PRINT((ndo, " (%s)", tok2str(signature_check_values, "Unknown", sigcheck)));
 
                break;

diff --git a/print-rsvp.c b/print-rsvp.c
index 1726337736d347f59f7608c839c37d51f0e7f949..6e1acd673e99994d31c64f7c799d63a46ba0e9e0 100644 (file)
--- a/print-rsvp.c
+++ b/print-rsvp.c
@@ -654,21 +654,9 @@ rsvp_clear_checksum(void *header)
 
 static int
 rsvp_obj_print(netdissect_options *ndo,
-               const u_char *pptr
-#ifndef HAVE_LIBCRYPTO
-_U_
-#endif
-, u_int plen
-#ifndef HAVE_LIBCRYPTO
-_U_
-#endif
-, const u_char *tptr,
-                const char *ident, u_int tlen,
-                const struct rsvp_common_header *rsvp_com_header
-#ifndef HAVE_LIBCRYPTO
-_U_
-#endif
-)
+               const u_char *pptr, u_int plen, const u_char *tptr,
+               const char *ident, u_int tlen,
+               const struct rsvp_common_header *rsvp_com_header)
 {
     const struct rsvp_object_header *rsvp_obj_header;
     const u_char *obj_tptr;
@@ -1682,14 +1670,10 @@ _U_
                        EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->digest+8),
                        EXTRACT_32BITS(obj_ptr.rsvp_obj_integrity->digest + 12)));
 
-#ifdef HAVE_LIBCRYPTO
                 sigcheck = signature_verify(ndo, pptr, plen,
                                             obj_ptr.rsvp_obj_integrity->digest,
                                             rsvp_clear_checksum,
                                             rsvp_com_header);
-#else
-                sigcheck = CANT_CHECK_SIGNATURE;
-#endif
                 ND_PRINT((ndo, " (%s)", tok2str(signature_check_values, "Unknown", sigcheck)));
 
                 obj_tlen+=sizeof(struct rsvp_obj_integrity_t);

diff --git a/signature.c b/signature.c
index 77ec493b7db6baffac40632b9dec8a51693afefe..c97b853421e1c8f4fd2bab1d96ed0b225b42c807 100644 (file)
--- a/signature.c
+++ b/signature.c
@@ -109,9 +109,7 @@ signature_compute_hmac_md5(const uint8_t *text, int text_len, unsigned char *key
     MD5_Final(digest, &context);          /* finish up 2nd pass */
 }
 USES_APPLE_RST
-#endif
 
-#ifdef HAVE_LIBCRYPTO
 /*
  * Verify a cryptographic signature of the packet.
  * Currently only MD5 is supported.
@@ -198,6 +196,14 @@ signature_verify(netdissect_options *ndo, const u_char *pptr, u_int plen,
         return (SIGNATURE_INVALID);
     }
 }
+#else
+int
+signature_verify(netdissect_options *ndo _U_, const u_char *pptr _U_,
+                 u_int plen _U_, const u_char *sig_ptr _U_,
+                 void (*clear_rtn)(void *) _U_, const void *clear_arg _U_)
+{
+    return (CANT_CHECK_SIGNATURE);
+}
 #endif
 
 /*