Merge into a single US-exportable libcrypt, which only provides

one-way hash functions for authentication purposes.  There is no more
"set the libcrypt->libXXXcrypt" nightmare.
- Undo the libmd.so hack, use -D to hide the md5c.c internals.
- Remove the symlink hacks in release/Makefile
- the algorthm is set by set_crypt_format() as before.  If this is
  not called, it tries to heuristically figure out the hash format, and
  if all else fails, it uses the optional auth.conf entry to chose the
  overall default hash.
- Since source has non-hidden crypto in it there may be some issues with
  having the source it in some countries, so preserve the "secure/*"
  division.  You can still build a des-free libcrypt library if you want
  to badly enough.  This should not be a problem in the US or exporting
  from the US as freebsd.org had notified BXA some time ago.  That makes
  this stuff re-exportable by anyone.
- For consistancy, the default in absence of any other clues is md5.  This
  is to try and minimize POLA across buildworld where folk may suddenly
  be activating des-crypt()-hash support.  Since the des hash may not
  always be present, it seemed sensible to make the stronger md5 algorithm
  the default.
All things being equal, no functionality is lost.

Reviewed-by: jkh

(flame-proof suit on)

1 files changed, 0 insertions, 73 deletions

diff --git a/secure/lib/libcrypt/Makefile b/secure/lib/libcrypt/Makefile
deleted file mode 100644
index b46df11..0000000
--- a/secure/lib/libcrypt/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# $FreeBSD$
-#
-
-SHLIB_MAJOR=	2
-LIB=		descrypt
-
-LCRYPTBASE=	libcrypt
-LSCRYPTBASE=	lib${LIB}
-
-LCRYPTSO=	${LCRYPTBASE}.so.${SHLIB_MAJOR}
-LSCRYPTSO=	${LSCRYPTBASE}.so.${SHLIB_MAJOR}
-
-.if ${OBJFORMAT} == elf
-SONAME=		${LCRYPTSO}
-.endif
-
-.PATH:		${.CURDIR}/../../../lib/libmd ${.CURDIR}/../../../lib/libcrypt
-SRCS=		crypt.c crypt-md5.c misc.c
-STATICSRCS=	md5c.c
-STATICOBJS=	${STATICSRCS:S/.c/.o/g}
-SRCS+=		crypt-des.c
-MAN3=		crypt.3
-MLINKS=		crypt.3 crypt_get_format.3 crypt.3 crypt_set_format.3
-CFLAGS+=	-I${.CURDIR}/../../../lib/libmd
-CFLAGS+=	-I${.CURDIR}/../../../lib/libcrypt
-CFLAGS+=	-DNONEXPORTABLE_CRYPT
-CFLAGS+=	-DLIBC_SCCS -Wall
-PRECIOUSLIB=	yes
-
-# Include this early to pick up the definitions of SHLIB_MAJOR and
-# SHLIB_MINOR which are used in the existence tests.
-.include "${.CURDIR}/../../../lib/Makefile.inc"
-
-# We only install the links if they do not already exist.
-# This may have to be revised
-.if !exists(${DESTDIR}${LIBDIR}/${LCRYPTBASE}.a)
-SYMLINKS+=	${LSCRYPTBASE}.a ${LIBDIR}/${LCRYPTBASE}.a
-.endif
-.if !defined(NOPROFILE) && !exists(${DESTDIR}${LIBDIR}/${LCRYPTBASE}_p.a)
-SYMLINKS+=	${LSCRYPTBASE}_p.a ${LIBDIR}/${LCRYPTBASE}_p.a
-.endif
-.if !defined(NOPIC) && !exists(${DESTDIR}${SHLIBDIR}/${LCRYPTSO})
-SYMLINKS+=	${LSCRYPTSO} ${SHLIBDIR}/${LCRYPTSO}
-.endif
-.if !defined(NOPIC) && ${OBJFORMAT} == elf && \
-    !exists(${DESTDIR}${SHLIBDIR}/${LCRYPTBASE}.so)
-SYMLINKS+=	${LSCRYPTBASE}.so ${SHLIBDIR}/${LCRYPTBASE}.so
-.endif
-
-.include <bsd.lib.mk>
-
-afterinstall:
-.if !defined(NODESCRYPTLINKS)
-.if !defined(NOPIC)
-	@cd ${DESTDIR}${SHLIBDIR}; \
-	rm -f ${LCRYPTSO}; \
-	ln -sf ${LSCRYPTSO} ${LCRYPTSO};
-.endif
-.if !defined(NOPIC) && ${OBJFORMAT} == elf
-	@cd ${DESTDIR}${SHLIBDIR}; \
-	rm -f ${LCRYPTBASE}.so; \
-	ln -sf ${LSCRYPTBASE}.so libcrypt.so
-.endif
-	@cd  ${DESTDIR}${LIBDIR}; \
-	rm -f ${LCRYPTBASE}.a; \
-	ln -sf ${LSCRYPTBASE}.a libcrypt.a
-.if !defined(NOPROFILE)
-	@cd  ${DESTDIR}${LIBDIR}; \
-	rm -f ${LCRYPTBASE}_p.a; \
-	ln -sf ${LSCRYPTBASE}_p.a libcrypt_p.a
-.endif
-.endif