svn commit: r230743 - in stable/9/usr.bin: . csup

[Marius Strobl]

Author: marius
Date: Sun Jan 29 14:55:20 2012
New Revision: 230743
URL: http://svn.freebsd.org/changeset/base/230743

Log:
  MFC: r228857
  
  On FreeBSD just use the MD5 implementation of libmd rather than that of
  libcrypto so we don't need to relinquish csup when world is built without
  OpenSSL.

Modified:
  stable/9/usr.bin/Makefile
  stable/9/usr.bin/csup/Makefile
  stable/9/usr.bin/csup/auth.c
  stable/9/usr.bin/csup/misc.c
  stable/9/usr.bin/csup/misc.h
Directory Properties:
  stable/9/usr.bin/   (props changed)
  stable/9/usr.bin/ar/   (props changed)
  stable/9/usr.bin/calendar/   (props changed)
  stable/9/usr.bin/clang/   (props changed)
  stable/9/usr.bin/compress/   (props changed)
  stable/9/usr.bin/cpio/   (props changed)
  stable/9/usr.bin/csup/   (props changed)
  stable/9/usr.bin/du/   (props changed)
  stable/9/usr.bin/fetch/   (props changed)
  stable/9/usr.bin/gprof/   (props changed)
  stable/9/usr.bin/grep/   (props changed)
  stable/9/usr.bin/hexdump/   (props changed)
  stable/9/usr.bin/indent/   (props changed)
  stable/9/usr.bin/mail/   (props changed)
  stable/9/usr.bin/make/   (props changed)
  stable/9/usr.bin/mkesdb/   (props changed)
  stable/9/usr.bin/mt/   (props changed)
  stable/9/usr.bin/ncplist/   (props changed)
  stable/9/usr.bin/netstat/   (props changed)
  stable/9/usr.bin/procstat/   (props changed)
  stable/9/usr.bin/rctl/   (props changed)
  stable/9/usr.bin/rwho/   (props changed)
  stable/9/usr.bin/script/   (props changed)
  stable/9/usr.bin/sed/   (props changed)
  stable/9/usr.bin/tar/   (props changed)
  stable/9/usr.bin/truss/   (props changed)
  stable/9/usr.bin/usbhidaction/   (props changed)
  stable/9/usr.bin/usbhidctl/   (props changed)
  stable/9/usr.bin/vacation/   (props changed)
  stable/9/usr.bin/vmstat/   (props changed)
  stable/9/usr.bin/xlint/   (props changed)

Modified: stable/9/usr.bin/Makefile
==============================================================================
--- stable/9/usr.bin/Makefile	Sun Jan 29 14:52:42 2012	(r230742)
+++ stable/9/usr.bin/Makefile	Sun Jan 29 14:55:20 2012	(r230743)
@@ -250,10 +250,11 @@ SUBDIR+=	bc
 SUBDIR+=	chkey
 SUBDIR+=	dc
 SUBDIR+=	newkey
+.endif
+
 .if ${MK_LIBTHR} != "no"
 SUBDIR+=	csup
 .endif
-.endif
 
 .if ${MK_LOCATE} != "no"
 SUBDIR+=	locate

Modified: stable/9/usr.bin/csup/Makefile
==============================================================================
--- stable/9/usr.bin/csup/Makefile	Sun Jan 29 14:52:42 2012	(r230742)
+++ stable/9/usr.bin/csup/Makefile	Sun Jan 29 14:55:20 2012	(r230743)
@@ -33,8 +33,8 @@ CFLAGS+= -I. -I${.CURDIR}
 CFLAGS+= -DHAVE_FFLAGS -DNDEBUG
 WARNS?=	1
 
-DPADD=	${LIBCRYPTO} ${LIBZ} ${LIBPTHREAD}
-LDADD=	-lcrypto -lz -lpthread
+DPADD=	${LIBMD} ${LIBZ} ${LIBPTHREAD}
+LDADD=	-lmd -lz -lpthread
 
 SCRIPTS=	cpasswd.sh
 MAN=		csup.1 cpasswd.1

Modified: stable/9/usr.bin/csup/auth.c
==============================================================================
--- stable/9/usr.bin/csup/auth.c	Sun Jan 29 14:52:42 2012	(r230742)
+++ stable/9/usr.bin/csup/auth.c	Sun Jan 29 14:55:20 2012	(r230743)
@@ -35,7 +35,6 @@
 #include <netinet/in.h>
 
 #include <ctype.h>
-#include <openssl/md5.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

Modified: stable/9/usr.bin/csup/misc.c
==============================================================================
--- stable/9/usr.bin/csup/misc.c	Sun Jan 29 14:52:42 2012	(r230742)
+++ stable/9/usr.bin/csup/misc.c	Sun Jan 29 14:55:20 2012	(r230743)
@@ -28,7 +28,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <openssl/md5.h>
 
 #include <assert.h>
 #include <err.h>

Modified: stable/9/usr.bin/csup/misc.h
==============================================================================
--- stable/9/usr.bin/csup/misc.h	Sun Jan 29 14:52:42 2012	(r230742)
+++ stable/9/usr.bin/csup/misc.h	Sun Jan 29 14:55:20 2012	(r230743)
@@ -28,10 +28,18 @@
 #ifndef _MISC_H_
 #define _MISC_H_
 
-#include <openssl/md5.h>
-
 #include <sys/types.h>
 
+#ifdef __FreeBSD__
+#include <md5.h>
+#define	MD5_DIGEST_LENGTH	16
+#define	MD5_Init		MD5Init
+#define	MD5_Final		MD5Final
+#define	MD5_Update		MD5Update
+#else
+#include <openssl/md5.h>
+#endif
+
 /* If we're not compiling in a C99 environment, define the C99 types. */
 #if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901