remove unnecessary header defines, condense md5

.gitignore

@@ -54,7 +54,7 @@ config.c
 constraint.c
 control.c
 include/imsg.h
-include/md5_openbsd.h
+include/md5.h
 include/sha2_openbsd.h
 log.c
 log.h

configure.ac

@@ -199,7 +199,7 @@ if test "x$ac_cv_have___va_copy" = "xyes" ; then
 	AC_DEFINE([HAVE___VA_COPY], [1], [Define if __va_copy exists])
 fi
 
-AC_CHECK_HEADERS([sys/sysctl.h err.h ifaddrs.h md5.h paths.h sha2.h])
+AC_CHECK_HEADERS([sys/sysctl.h err.h ifaddrs.h paths.h])
 AC_CHECK_HEADERS([sys/sensors.h],
 	AM_CONDITIONAL(HAVE_SENSORS, true),
 	AM_CONDITIONAL(HAVE_SENSORS, false)

include/Makefile.am

@@ -12,7 +12,6 @@ noinst_HEADERS += ifaddrs.h
 noinst_HEADERS += imsg.h
 noinst_HEADERS += string.h
 noinst_HEADERS += md5.h
-noinst_HEADERS += md5_openbsd.h
 noinst_HEADERS += sha2.h
 noinst_HEADERS += sha2_openbsd.h
 noinst_HEADERS += stdlib.h

include/md5.h

@@ -1,10 +0,0 @@
-/*
- * Public domain
- * md5.h compatibility shim
- */
-
-#ifdef HAVE_MD5_H
-#include_next <md5.h>
-#else
-#include "md5_openbsd.h"
-#endif

include/sha2.h

@@ -3,25 +3,9 @@
  * sha2.h compatibility shim
  */
 
-#ifdef HAVE_SHA2_H
-#include_next <sha2.h>
-#else
-
 #include "sha2_openbsd.h"
 
-#define __weak_alias(alias,sym)
-
-#define SHA224Transform(a, b) SHA256Transform(a, b)
-#define SHA224Update(a, b, c) SHA256Update(a, b, c)
-#define SHA224Pad(a) SHA256Pad(a)
-
-#define SHA384Transform(a, b) SHA512Transform(a, b)
-#define SHA384Update(a, b, c) SHA512Update(a, b, c)
-#define SHA384Pad(a) SHA512Pad(a)
-
 #define SHA512_CTX SHA2_CTX
 #define SHA512_Init(ctx) SHA512Init(ctx)
 #define SHA512_Update(ctx, buf, len) SHA512Update(ctx, (void *)buf, len)
 #define SHA512_Final(digest, ctx) SHA512Final(digest, ctx)
-
-#endif

update.sh

@@ -28,7 +28,7 @@ ntpd_src=$dir/openbsd/src/usr.sbin/ntpd
 CP='cp -p'
 PATCH='patch -p0 -s'
 
-sed '/DECLS/d' $libc_inc/md5.h > include/md5_openbsd.h
+sed '/DECLS/d' $libc_inc/md5.h > include/md5.h
 sed '/DECLS/d' $libc_inc/sha2.h > include/sha2_openbsd.h
 cp $libutil_src/imsg.h include/
 cp $libutil_src/imsg.c compat/