Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
* Makeconfig (rpath-dirs): Add crypt.
(all-subdirs): Remove md5crypt. 
* crypt/sysdeps/unix/crypt.c: Move to crypt/. 
* crypt/sysdeps/unix/crypt-entry.c: Move to crypt/. 
* sysdeps/generic/crypt-entry.c: Delete. 
* crypt/sysdeps/unix/crypt.h: Move to crypt/. 
* sysdeps/generic/crypt.h: Delete. 
* crypt/sysdeps/unix/crypt-private.h: Move to crypt/. 
* crypt/sysdeps/unix/crypt_util.c: Move to crypt/. 
* crypt/sysdeps/unix/des_impl.c: Move to sunrpc/. 
* sysdeps/generic/des_impl.c: Delete. 
* crypt/sysdeps/unix/ufc-crypt.h: Move to crypt/. 
* crypt/sysdeps: Delete. 
* crypt/crypt_util.c: Don't use `patchlevel.h'. 
* md5-crypt/Versions: Move to crypt/. 
* md5-crypt/md5-crypt.c: Move to crypt/. 
* md5-crypt/md5.c: Move to crypt/. 
* md5-crypt/md5c-test.c: Move to crypt/. 
* md5-crypt/md5test.c: Move to crypt/. 
* md5-crypt: Delete. 
* crypt/Makefile: Adjust for new structure.
2000-03-03  Geoff Keating  <geoffk@cygnus.com>

	* Makeconfig (rpath-dirs): Add crypt.
	(all-subdirs): Remove md5crypt.
	* crypt/sysdeps/unix/crypt.c: Move to crypt/.
	* crypt/sysdeps/unix/crypt-entry.c: Move to crypt/.
	* sysdeps/generic/crypt-entry.c: Delete.
	* crypt/sysdeps/unix/crypt.h: Move to crypt/.
	* sysdeps/generic/crypt.h: Delete.
	* crypt/sysdeps/unix/crypt-private.h: Move to crypt/.
	* crypt/sysdeps/unix/crypt_util.c: Move to crypt/.
	* crypt/sysdeps/unix/des_impl.c: Move to sunrpc/.
	* sysdeps/generic/des_impl.c: Delete.
	* crypt/sysdeps/unix/ufc-crypt.h: Move to crypt/.
	* crypt/sysdeps: Delete.
	* crypt/crypt_util.c: Don't use `patchlevel.h'.
	* md5-crypt/Versions: Move to crypt/.
	* md5-crypt/md5-crypt.c: Move to crypt/.
	* md5-crypt/md5.c: Move to crypt/.
	* md5-crypt/md5c-test.c: Move to crypt/.
	* md5-crypt/md5test.c: Move to crypt/.
	* md5-crypt: Delete.
	* crypt/Makefile: Adjust for new structure.
  • Loading branch information
Geoff Keating committed Mar 4, 2000
1 parent e3d53b0 commit b11f595
Show file tree
Hide file tree
Showing 24 changed files with 51 additions and 291 deletions.
24 changes: 24 additions & 0 deletions ChangeLog
@@ -1,3 +1,27 @@
2000-03-03 Geoff Keating <geoffk@cygnus.com>

* Makeconfig (rpath-dirs): Add crypt.
(all-subdirs): Remove md5crypt.
* crypt/sysdeps/unix/crypt.c: Move to crypt/.
* crypt/sysdeps/unix/crypt-entry.c: Move to crypt/.
* sysdeps/generic/crypt-entry.c: Delete.
* crypt/sysdeps/unix/crypt.h: Move to crypt/.
* sysdeps/generic/crypt.h: Delete.
* crypt/sysdeps/unix/crypt-private.h: Move to crypt/.
* crypt/sysdeps/unix/crypt_util.c: Move to crypt/.
* crypt/sysdeps/unix/des_impl.c: Move to sunrpc/.
* sysdeps/generic/des_impl.c: Delete.
* crypt/sysdeps/unix/ufc-crypt.h: Move to crypt/.
* crypt/sysdeps: Delete.
* crypt/crypt_util.c: Don't use `patchlevel.h'.
* md5-crypt/Versions: Move to crypt/.
* md5-crypt/md5-crypt.c: Move to crypt/.
* md5-crypt/md5.c: Move to crypt/.
* md5-crypt/md5c-test.c: Move to crypt/.
* md5-crypt/md5test.c: Move to crypt/.
* md5-crypt: Delete.
* crypt/Makefile: Adjust for new structure.

2000-03-03 Paul Eggert <eggert@twinsun.com>

* posix/regex.c (MB_LEN_MAX): Include <limits.h> to define;
Expand Down
4 changes: 2 additions & 2 deletions Makeconfig
Expand Up @@ -414,7 +414,7 @@ link-libc = -Wl,-rpath-link=$(rpath-link) \
$(common-objpfx)libc.so$(libc.so-version) \
$(common-objpfx)$(patsubst %,$(libtype.oS),c) $(gnulib)
# This is how to find at build-time things that will be installed there.
rpath-dirs = math elf dlfcn nss nis rt resolv
rpath-dirs = math elf dlfcn nss nis rt resolv crypt
rpath-link = \
$(common-objdir):$(subst $(empty) ,:,$(patsubst ../$(subdir),.,$(rpath-dirs:%=$(common-objpfx)%)))
elfobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)elf)
Expand Down Expand Up @@ -781,7 +781,7 @@ endif
all-subdirs = csu assert ctype locale intl catgets math setjmp signal \
stdlib stdio-common $(stdio) malloc string wcsmbs time dirent \
grp pwd posix io termios resource misc socket sysvipc gmon \
gnulib iconv iconvdata wctype manual shadow md5-crypt po argp \
gnulib iconv iconvdata wctype manual shadow po argp \
crypt $(add-ons) nss localedata timezone rt debug \
$(sysdep-subdirs) $(dlfcn) $(binfmt-subdir)
all-subdirs := $(filter-out $(sysdep-inhibit-subdirs),$(all-subdirs))
Expand Down
33 changes: 24 additions & 9 deletions crypt/Makefile
@@ -1,4 +1,4 @@
# Copyright (C) 1996 Free Software Foundation, Inc.
# Copyright (C) 1996, 2000 Free Software Foundation, Inc.
# This file is part of the GNU C Library.

# The GNU C Library is free software; you can redistribute it and/or
Expand All @@ -17,20 +17,35 @@
# Boston, MA 02111-1307, USA.

#
# Sub-makefile for DES crypt portion of the library.
# Sub-makefile for crypt() portion of the library.
#
subdir := crypt

tests = cert
headers := crypt.h

distribute := md5.h

extra-libs := libcrypt
extra-libs-others := $(extra-libs)

libcrypt-routines := crypt-entry md5-crypt md5 crypt crypt_util

tests = cert md5test md5c-test

include ../Makeconfig

rpath-dirs += md5-crypt
ifeq ($(crypt-in-libc),yes)
routines += $(libcrypt-routines)
endif

$(objpfx)md5test: $(objpfx)md5.o

include ../Rules

ifeq ($(build-shared),yes)
$(objpfx)cert: $(common-objpfx)md5-crypt/libcrypt.so$(libcrypt.so-version)
else
$(objpfx)cert: $(common-objpfx)md5-crypt/libcrypt.a
endif
LDLIBS-cert = crypt/libcrypt
LDLIBS-md5c-test = crypt/libcrypt

# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
# This ensures they will load libc.so for needed symbols if loaded by
# a statically-linked program that hasn't already loaded it.
$(objpfx)libcrypt.so: $(common-objpfx)libc.so
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 1 addition & 4 deletions crypt/sysdeps/unix/crypt_util.c → crypt/crypt_util.c
@@ -1,7 +1,7 @@
/*
* UFC-crypt: ultra fast crypt(3) implementation
*
* Copyright (C) 1991, 92, 93, 96, 97, 98 Free Software Foundation, Inc.
* Copyright (C) 1991, 92, 93, 96, 97, 98, 2000 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
Expand Down Expand Up @@ -34,7 +34,6 @@
#endif

#ifndef DOS
#include "patchlevel.h"
#include "ufc-crypt.h"
#else
/*
Expand All @@ -61,8 +60,6 @@ STATIC void shuffle_sb (long64 *k, ufc_long saltbits);
#endif


static const char patchlevel_str[] = PATCHLEVEL;

/*
* Permutation done once on the 56 bit
* key derived from the original 8 byte ASCII key.
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 0 additions & 2 deletions crypt/sysdeps/mach/hurd/Implies

This file was deleted.

4 changes: 0 additions & 4 deletions crypt/sysdeps/unix/Makefile

This file was deleted.

25 changes: 0 additions & 25 deletions crypt/sysdeps/unix/patchlevel.h

This file was deleted.

File renamed without changes.
83 changes: 0 additions & 83 deletions md5-crypt/Makefile

This file was deleted.

1 change: 0 additions & 1 deletion md5-crypt/onlymd5-entry.c

This file was deleted.

File renamed without changes.
72 changes: 0 additions & 72 deletions sysdeps/generic/crypt-entry.c

This file was deleted.

59 changes: 0 additions & 59 deletions sysdeps/generic/crypt.h

This file was deleted.

0 comments on commit b11f595

Please sign in to comment.