From 31f23bc71ced3b0646117a62d94ad823e1150112 Mon Sep 17 00:00:00 2001
From: zrj <rimvydas.jasinskas@gmail.com>
Date: Wed, 17 Apr 2019 06:56:33 +0300
Subject: [PATCH] dhcpcd(8): Convert to LibreSSL MD5 and SHA2 hash API.

---
 sbin/dhcpcd/Makefile | 12 +++++++++---
 sbin/dhcpcd/config.h |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sbin/dhcpcd/Makefile b/sbin/dhcpcd/Makefile
index 0071ea1198..7663f0f9e3 100644
--- a/sbin/dhcpcd/Makefile
+++ b/sbin/dhcpcd/Makefile
@@ -30,10 +30,16 @@ SRCS+=		pidfile.c strtoi.c strtou.c
 .PATH:		${DISTDIR}/compat/crypt
 SRCS+=		hmac.c
 
-DPADD=		${LIBMD} ${LIBCRYPTO}
-LDADD=		-lmd -lprivate_crypto
+# Fully convert to openssl/md5.h and openssl/sha2.h
+FLAGS_GROUPS=	openssl
+openssl_FLAGS=	-I${_SHLIBDIRPREFIX}/usr/include/priv/openssl
+openssl_FLAGS+=	-DMD5Init=MD5_Init -DMD5Update=MD5_Update -DMD5Final=MD5_Final
+openssl_FLAGS_FILES= hmac.c ipv6.c
+
+CFLAGS+=	${PRIVATELIB_CFLAGS}
+DPADD=		${LIBCRYPTO}
+LDADD=		-lprivate_crypto
 LDFLAGS+=	${PRIVATELIB_LDFLAGS}
-CFLAGS+=	-I${.CURDIR}/../../crypto/libressl/include
 
 # system directories
 _SYSCONFDIR=	/etc
diff --git a/sbin/dhcpcd/config.h b/sbin/dhcpcd/config.h
index 095d3e3fff..e399dc10d9 100644
--- a/sbin/dhcpcd/config.h
+++ b/sbin/dhcpcd/config.h
@@ -11,5 +11,5 @@
 #include			"compat/pidfile.h"
 #include			"compat/strtoi.h"
 #define	HAVE_MD5_H
-#define	SHA2_H			<sha256.h>
+#define	SHA2_H			<openssl/sha.h>
 #include			"compat/crypt/hmac.h"
-- 
2.41.0