From: zrj <rimvydas.jasinskas@gmail.com>
Date: Mon, 8 Apr 2019 11:16:07 +0000 (+0300)
Subject: rtquery(8): Fix MD5 prototypes.
X-Git-Tag: v5.7.0~335
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/832fc40b53da433af57754588b7cd3313adbd3c3

rtquery(8): Fix MD5 prototypes.

Do not use local MD5 prototypes.
The libcrypto is not needed, rtquery(8) is static.

Caught-by: LTO
---

diff --git a/sbin/routed/rtquery/Makefile b/sbin/routed/rtquery/Makefile
index fd454d1c86..574fcac230 100644
--- a/sbin/routed/rtquery/Makefile
+++ b/sbin/routed/rtquery/Makefile
@@ -6,5 +6,6 @@ MAN=	rtquery.8
 LDADD+=	-lmd
 DPADD+=	${LIBMD}
 NO_WARRAY_BOUNDS=
+CFLAGS+=	-I${.CURDIR}/../../../crypto/libressl/include
 
 .include <bsd.prog.mk>
diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c
index f02f46d1af..14cc8935d7 100644
--- a/sbin/routed/rtquery/rtquery.c
+++ b/sbin/routed/rtquery/rtquery.c
@@ -48,6 +48,7 @@ char copyright[] =
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <md5.h>
 
 #if !defined(__NetBSD__)
 static char sccsid[] __attribute__((unused))= "@(#)query.c	8.1 (Berkeley) 6/5/93";
@@ -57,17 +58,6 @@ __RCSID("$NetBSD: rtquery.c,v 1.10 1999/02/23 10:47:41 christos Exp $");
 
 #define _HAVE_SIN_LEN
 
-#define MD5_DIGEST_LEN 16
-typedef struct {
-	u_int32_t state[4];		/* state (ABCD) */
-	u_int32_t count[2];		/* # of bits, modulo 2^64 (LSB 1st) */
-	unsigned char buffer[64];	/* input buffer */
-} MD5_CTX;
-extern void MD5Init(MD5_CTX*);
-extern void MD5Update(MD5_CTX*, u_char*, u_int);
-extern void MD5Final(u_char[MD5_DIGEST_LEN], MD5_CTX*);
-
-
 #define	WTIME	15		/* Time to wait for all responses */
 #define	STIME	(250*1000)	/* usec to wait for another response */