From 7ba2b2006ca22a0ba79e85b5886bba120f2a5b6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Fri, 20 Apr 2007 08:29:05 +0000 Subject: [PATCH] rename des to hcrypto git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20466 ec53bebd-3082-4978-b11e-865c3cabbd6b --- admin/Makefile.am | 4 +- appl/afsutil/Makefile.am | 2 +- appl/ftp/ftp/Makefile.am | 4 +- appl/ftp/ftpd/Makefile.am | 2 +- appl/kf/Makefile.am | 2 +- appl/kx/Makefile.am | 4 +- appl/login/Makefile.am | 2 +- appl/otp/Makefile.am | 2 +- appl/popper/Makefile.am | 2 +- appl/push/Makefile.am | 2 +- appl/rsh/Makefile.am | 2 +- appl/su/Makefile.am | 4 +- appl/telnet/libtelnet/Makefile.am | 2 +- appl/telnet/telnet/Makefile.am | 4 +- appl/telnet/telnetd/Makefile.am | 4 +- appl/test/Makefile.am | 2 +- appl/xnlock/Makefile.am | 2 +- cf/ChangeLog | 4 ++ cf/crypto.m4 | 61 ++++++++++++------------ kadmin/Makefile.am | 4 +- kcm/Makefile.am | 4 +- kdc/Makefile.am | 10 ++-- kpasswd/Makefile.am | 4 +- kuser/Makefile.am | 8 ++-- lib/Makefile.am | 4 +- lib/auth/afskauthlib/Makefile.am | 4 +- lib/auth/pam/Makefile.am | 4 +- lib/auth/sia/Makefile.am | 8 ++-- lib/gssapi/Makefile.am | 4 +- lib/{des => hcrypto}/.cvsignore | 0 lib/{des => hcrypto}/ChangeLog | 0 lib/{des => hcrypto}/DESperate.txt | 0 lib/{des => hcrypto}/Makefile.am | 2 +- lib/{des => hcrypto}/aes.c | 0 lib/{des => hcrypto}/aes.h | 0 lib/{des => hcrypto}/bn.c | 0 lib/{des => hcrypto}/bn.h | 0 lib/{des => hcrypto}/des-tables.h | 0 lib/{des => hcrypto}/des.c | 0 lib/{des => hcrypto}/des.h | 0 lib/{des => hcrypto}/destest.c | 0 lib/{des => hcrypto}/dh-imath.c | 0 lib/{des => hcrypto}/dh.c | 0 lib/{des => hcrypto}/dh.h | 0 lib/{des => hcrypto}/dllmain.c | 0 lib/{des => hcrypto}/dsa.c | 0 lib/{des => hcrypto}/dsa.h | 0 lib/{des => hcrypto}/engine.c | 0 lib/{des => hcrypto}/engine.h | 0 lib/{des => hcrypto}/evp.c | 0 lib/{des => hcrypto}/evp.h | 0 lib/{des => hcrypto}/gen-des.pl | 0 lib/{des => hcrypto}/hash.h | 0 lib/{des => hcrypto}/hmac.c | 0 lib/{des => hcrypto}/hmac.h | 0 lib/{des => hcrypto}/imath/LICENSE | 0 lib/{des => hcrypto}/imath/imath.c | 0 lib/{des => hcrypto}/imath/imath.h | 0 lib/{des => hcrypto}/imath/import.sh | 0 lib/{des => hcrypto}/imath/iprime.c | 0 lib/{des => hcrypto}/imath/iprime.h | 0 lib/{des => hcrypto}/md2.c | 0 lib/{des => hcrypto}/md2.h | 0 lib/{des => hcrypto}/md4.c | 0 lib/{des => hcrypto}/md4.h | 0 lib/{des => hcrypto}/md5.c | 0 lib/{des => hcrypto}/md5.h | 0 lib/{des => hcrypto}/md5crypt_test.c | 0 lib/{des => hcrypto}/mdtest.c | 0 lib/{des => hcrypto}/passwd_dialog.aps | Bin lib/{des => hcrypto}/passwd_dialog.clw | 0 lib/{des => hcrypto}/passwd_dialog.rc | 0 lib/{des => hcrypto}/passwd_dialog.res | Bin lib/{des => hcrypto}/passwd_dlg.c | 0 lib/{des => hcrypto}/passwd_dlg.h | 0 lib/{des => hcrypto}/pkcs12.c | 0 lib/{des => hcrypto}/pkcs12.h | 0 lib/{des => hcrypto}/pkcs5.c | 0 lib/{des => hcrypto}/rand-egd.c | 0 lib/{des => hcrypto}/rand-fortuna.c | 0 lib/{des => hcrypto}/rand-unix.c | 0 lib/{des => hcrypto}/rand.c | 0 lib/{des => hcrypto}/rand.h | 0 lib/{des => hcrypto}/randi.h | 0 lib/{des => hcrypto}/rc2.c | 0 lib/{des => hcrypto}/rc2.h | 0 lib/{des => hcrypto}/rc2test.c | 0 lib/{des => hcrypto}/rc4.c | 0 lib/{des => hcrypto}/rc4.h | 0 lib/{des => hcrypto}/rctest.c | 0 lib/{des => hcrypto}/resource.h | 0 lib/{des => hcrypto}/rijndael-alg-fst.c | 0 lib/{des => hcrypto}/rijndael-alg-fst.h | 0 lib/{des => hcrypto}/rnd_keys.c | 0 lib/{des => hcrypto}/rsa-imath.c | 0 lib/{des => hcrypto}/rsa.c | 0 lib/{des => hcrypto}/rsa.h | 0 lib/{des => hcrypto}/rsakey.der | Bin lib/{des => hcrypto}/sha.c | 0 lib/{des => hcrypto}/sha.h | 0 lib/{des => hcrypto}/sha256.c | 0 lib/{des => hcrypto}/test_bn.c | 0 lib/{des => hcrypto}/test_cipher.c | 0 lib/{des => hcrypto}/test_crypto.in | 0 lib/{des => hcrypto}/test_engine_dso.c | 0 lib/{des => hcrypto}/test_hmac.c | 0 lib/{des => hcrypto}/test_imath.c | 0 lib/{des => hcrypto}/test_pkcs12.c | 0 lib/{des => hcrypto}/test_pkcs5.c | 0 lib/{des => hcrypto}/test_rand.c | 0 lib/{des => hcrypto}/test_rsa.c | 0 lib/{des => hcrypto}/ui.c | 0 lib/{des => hcrypto}/ui.h | 0 lib/hdb/Makefile.am | 4 +- lib/hx509/Makefile.am | 8 ++-- lib/kadm5/Makefile.am | 4 +- lib/kafs/Makefile.am | 4 +- lib/krb5/Makefile.am | 6 +-- lib/otp/Makefile.am | 4 +- lib/vers/Makefile.am | 2 +- tools/Makefile.am | 4 +- 121 files changed, 103 insertions(+), 100 deletions(-) rename lib/{des => hcrypto}/.cvsignore (100%) rename lib/{des => hcrypto}/ChangeLog (100%) rename lib/{des => hcrypto}/DESperate.txt (100%) rename lib/{des => hcrypto}/Makefile.am (98%) rename lib/{des => hcrypto}/aes.c (100%) rename lib/{des => hcrypto}/aes.h (100%) rename lib/{des => hcrypto}/bn.c (100%) rename lib/{des => hcrypto}/bn.h (100%) rename lib/{des => hcrypto}/des-tables.h (100%) rename lib/{des => hcrypto}/des.c (100%) rename lib/{des => hcrypto}/des.h (100%) rename lib/{des => hcrypto}/destest.c (100%) rename lib/{des => hcrypto}/dh-imath.c (100%) rename lib/{des => hcrypto}/dh.c (100%) rename lib/{des => hcrypto}/dh.h (100%) rename lib/{des => hcrypto}/dllmain.c (100%) rename lib/{des => hcrypto}/dsa.c (100%) rename lib/{des => hcrypto}/dsa.h (100%) rename lib/{des => hcrypto}/engine.c (100%) rename lib/{des => hcrypto}/engine.h (100%) rename lib/{des => hcrypto}/evp.c (100%) rename lib/{des => hcrypto}/evp.h (100%) rename lib/{des => hcrypto}/gen-des.pl (100%) rename lib/{des => hcrypto}/hash.h (100%) rename lib/{des => hcrypto}/hmac.c (100%) rename lib/{des => hcrypto}/hmac.h (100%) rename lib/{des => hcrypto}/imath/LICENSE (100%) rename lib/{des => hcrypto}/imath/imath.c (100%) rename lib/{des => hcrypto}/imath/imath.h (100%) rename lib/{des => hcrypto}/imath/import.sh (100%) rename lib/{des => hcrypto}/imath/iprime.c (100%) rename lib/{des => hcrypto}/imath/iprime.h (100%) rename lib/{des => hcrypto}/md2.c (100%) rename lib/{des => hcrypto}/md2.h (100%) rename lib/{des => hcrypto}/md4.c (100%) rename lib/{des => hcrypto}/md4.h (100%) rename lib/{des => hcrypto}/md5.c (100%) rename lib/{des => hcrypto}/md5.h (100%) rename lib/{des => hcrypto}/md5crypt_test.c (100%) rename lib/{des => hcrypto}/mdtest.c (100%) rename lib/{des => hcrypto}/passwd_dialog.aps (100%) rename lib/{des => hcrypto}/passwd_dialog.clw (100%) rename lib/{des => hcrypto}/passwd_dialog.rc (100%) rename lib/{des => hcrypto}/passwd_dialog.res (100%) rename lib/{des => hcrypto}/passwd_dlg.c (100%) rename lib/{des => hcrypto}/passwd_dlg.h (100%) rename lib/{des => hcrypto}/pkcs12.c (100%) rename lib/{des => hcrypto}/pkcs12.h (100%) rename lib/{des => hcrypto}/pkcs5.c (100%) rename lib/{des => hcrypto}/rand-egd.c (100%) rename lib/{des => hcrypto}/rand-fortuna.c (100%) rename lib/{des => hcrypto}/rand-unix.c (100%) rename lib/{des => hcrypto}/rand.c (100%) rename lib/{des => hcrypto}/rand.h (100%) rename lib/{des => hcrypto}/randi.h (100%) rename lib/{des => hcrypto}/rc2.c (100%) rename lib/{des => hcrypto}/rc2.h (100%) rename lib/{des => hcrypto}/rc2test.c (100%) rename lib/{des => hcrypto}/rc4.c (100%) rename lib/{des => hcrypto}/rc4.h (100%) rename lib/{des => hcrypto}/rctest.c (100%) rename lib/{des => hcrypto}/resource.h (100%) rename lib/{des => hcrypto}/rijndael-alg-fst.c (100%) rename lib/{des => hcrypto}/rijndael-alg-fst.h (100%) rename lib/{des => hcrypto}/rnd_keys.c (100%) rename lib/{des => hcrypto}/rsa-imath.c (100%) rename lib/{des => hcrypto}/rsa.c (100%) rename lib/{des => hcrypto}/rsa.h (100%) rename lib/{des => hcrypto}/rsakey.der (100%) rename lib/{des => hcrypto}/sha.c (100%) rename lib/{des => hcrypto}/sha.h (100%) rename lib/{des => hcrypto}/sha256.c (100%) rename lib/{des => hcrypto}/test_bn.c (100%) rename lib/{des => hcrypto}/test_cipher.c (100%) rename lib/{des => hcrypto}/test_crypto.in (100%) rename lib/{des => hcrypto}/test_engine_dso.c (100%) rename lib/{des => hcrypto}/test_hmac.c (100%) rename lib/{des => hcrypto}/test_imath.c (100%) rename lib/{des => hcrypto}/test_pkcs12.c (100%) rename lib/{des => hcrypto}/test_pkcs5.c (100%) rename lib/{des => hcrypto}/test_rand.c (100%) rename lib/{des => hcrypto}/test_rsa.c (100%) rename lib/{des => hcrypto}/ui.c (100%) rename lib/{des => hcrypto}/ui.h (100%) diff --git a/admin/Makefile.am b/admin/Makefile.am index b2fc9e139..df312014d 100644 --- a/admin/Makefile.am +++ b/admin/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -AM_CPPFLAGS += $(INCLUDE_readline) $(INCLUDE_des) +AM_CPPFLAGS += $(INCLUDE_readline) $(INCLUDE_hcrypto) SLC = $(top_builddir)/lib/sl/slc @@ -35,7 +35,7 @@ ktutil-commands.c ktutil-commands.h: ktutil-commands.in LDADD = \ $(top_builddir)/lib/kadm5/libkadm5clnt.la \ $(top_builddir)/lib/krb5/libkrb5.la \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/asn1/libasn1.la \ $(top_builddir)/lib/sl/libsl.la \ $(LIB_readline) \ diff --git a/appl/afsutil/Makefile.am b/appl/afsutil/Makefile.am index 5e83c7de8..6650ed47d 100644 --- a/appl/afsutil/Makefile.am +++ b/appl/afsutil/Makefile.am @@ -16,7 +16,7 @@ LDADD = $(LIB_kafs) \ $(LIB_krb4) \ $(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/asn1/libasn1.la \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(LIB_roken) EXTRA_DIST = $(man_MANS) diff --git a/appl/ftp/ftp/Makefile.am b/appl/ftp/ftp/Makefile.am index 21ca534a3..8effb870b 100644 --- a/appl/ftp/ftp/Makefile.am +++ b/appl/ftp/ftp/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -AM_CPPFLAGS += -I$(srcdir)/../common $(INCLUDE_readline) $(INCLUDE_krb4) $(INCLUDE_des) +AM_CPPFLAGS += -I$(srcdir)/../common $(INCLUDE_readline) $(INCLUDE_krb4) $(INCLUDE_hcrypto) bin_PROGRAMS = ftp @@ -42,7 +42,7 @@ LDADD = \ $(LIB_gssapi) \ $(LIB_krb5) \ $(LIB_krb4) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(LIB_roken) \ $(LIB_readline) diff --git a/appl/ftp/ftpd/Makefile.am b/appl/ftp/ftpd/Makefile.am index cc3874457..ededd1d5a 100644 --- a/appl/ftp/ftpd/Makefile.am +++ b/appl/ftp/ftpd/Makefile.am @@ -53,7 +53,7 @@ LDADD = ../common/libcommon.a \ $(LIB_krb5) \ $(LIB_kafs) \ $(LIB_krb4) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(LIB_roken) EXTRA_DIST = $(man_MANS) diff --git a/appl/kf/Makefile.am b/appl/kf/Makefile.am index b3f840b37..eb78cca99 100644 --- a/appl/kf/Makefile.am +++ b/appl/kf/Makefile.am @@ -13,7 +13,7 @@ kf_SOURCES = kf.c kf_locl.h kfd_SOURCES = kfd.c kf_locl.h LDADD = $(top_builddir)/lib/krb5/libkrb5.la \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) diff --git a/appl/kx/Makefile.am b/appl/kx/Makefile.am index 8f679c1c4..394bbd6f7 100644 --- a/appl/kx/Makefile.am +++ b/appl/kx/Makefile.am @@ -66,8 +66,8 @@ tenletxr: tenletxr.in LDADD = \ $(LIB_kafs) \ - $(LIB_krb5) \ + $(LIB_krb5) \ $(LIB_krb4) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(LIB_roken) \ $(X_LIBS) $(LIB_XauReadAuth) $(X_PRE_LIBS) $(X_EXTRA_LIBS) diff --git a/appl/login/Makefile.am b/appl/login/Makefile.am index 134be3e8e..05f4cb01d 100644 --- a/appl/login/Makefile.am +++ b/appl/login/Makefile.am @@ -29,7 +29,7 @@ LDADD = $(LIB_otp) \ $(LIB_kafs) \ $(top_builddir)/lib/krb5/libkrb5.la \ $(LIB_krb4) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) \ $(LIB_security) \ diff --git a/appl/otp/Makefile.am b/appl/otp/Makefile.am index f5dbd2711..e5d7246d9 100644 --- a/appl/otp/Makefile.am +++ b/appl/otp/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -AM_CPPFLAGS += $(INCLUDE_des) +AM_CPPFLAGS += $(INCLUDE_hcrypto) bin_PROGRAMS = otp otpprint bin_SUIDS = otp diff --git a/appl/popper/Makefile.am b/appl/popper/Makefile.am index 104fb46ca..45af1ec47 100644 --- a/appl/popper/Makefile.am +++ b/appl/popper/Makefile.am @@ -42,7 +42,7 @@ LDADD = \ $(top_builddir)/lib/gssapi/libgssapi.la \ $(LIB_krb5) \ $(LIB_krb4) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(LIB_roken) \ $(DBLIB) diff --git a/appl/push/Makefile.am b/appl/push/Makefile.am index 523854c59..6e15e065e 100644 --- a/appl/push/Makefile.am +++ b/appl/push/Makefile.am @@ -22,6 +22,6 @@ EXTRA_DIST = pfrom.in $(man_MANS) LDADD = $(LIB_krb5) \ $(LIB_krb4) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(LIB_roken) \ $(LIB_hesiod) diff --git a/appl/rsh/Makefile.am b/appl/rsh/Makefile.am index c2784deb2..bf770763a 100644 --- a/appl/rsh/Makefile.am +++ b/appl/rsh/Makefile.am @@ -23,7 +23,7 @@ limits_conf.c: LDADD = $(LIB_kafs) \ $(LIB_krb5) \ $(LIB_krb4) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(LIB_roken) EXTRA_DIST = $(man_MANS) diff --git a/appl/su/Makefile.am b/appl/su/Makefile.am index 27d9d4ca4..34687b85e 100644 --- a/appl/su/Makefile.am +++ b/appl/su/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_des) +AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) bin_PROGRAMS = su bin_SUIDS = su @@ -12,7 +12,7 @@ man_MANS = su.1 LDADD = $(LIB_kafs) \ $(top_builddir)/lib/krb5/libkrb5.la \ $(LIB_krb4) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) diff --git a/appl/telnet/libtelnet/Makefile.am b/appl/telnet/libtelnet/Makefile.am index 948797a2f..3acb53339 100644 --- a/appl/telnet/libtelnet/Makefile.am +++ b/appl/telnet/libtelnet/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -AM_CPPFLAGS += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_des) +AM_CPPFLAGS += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_hcrypto) noinst_LIBRARIES = libtelnet.a diff --git a/appl/telnet/telnet/Makefile.am b/appl/telnet/telnet/Makefile.am index 735fa7cb6..4daa9b30f 100644 --- a/appl/telnet/telnet/Makefile.am +++ b/appl/telnet/telnet/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -AM_CPPFLAGS += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_des) +AM_CPPFLAGS += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_hcrypto) bin_PROGRAMS = telnet @@ -17,7 +17,7 @@ man_MANS = telnet.1 LDADD = ../libtelnet/libtelnet.a \ $(LIB_krb5) \ $(LIB_krb4) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(LIB_tgetent) \ $(LIB_kdfs) \ $(LIB_roken) diff --git a/appl/telnet/telnetd/Makefile.am b/appl/telnet/telnetd/Makefile.am index ca638fd84..c439c8a35 100644 --- a/appl/telnet/telnetd/Makefile.am +++ b/appl/telnet/telnetd/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -AM_CPPFLAGS += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_des) +AM_CPPFLAGS += -I$(srcdir)/.. $(INCLUDE_krb4) $(INCLUDE_hcrypto) libexec_PROGRAMS = telnetd @@ -17,7 +17,7 @@ LDADD = \ ../libtelnet/libtelnet.a \ $(LIB_krb5) \ $(LIB_krb4) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(LIB_tgetent) \ $(LIB_logwtmp) \ $(LIB_logout) \ diff --git a/appl/test/Makefile.am b/appl/test/Makefile.am index 78e93a977..67801c9e1 100644 --- a/appl/test/Makefile.am +++ b/appl/test/Makefile.am @@ -37,6 +37,6 @@ nt_gss_client_LDADD = $(gssapi_server_LDADD) nt_gss_server_LDADD = $(nt_gss_client_LDADD) LDADD = $(top_builddir)/lib/krb5/libkrb5.la \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) diff --git a/appl/xnlock/Makefile.am b/appl/xnlock/Makefile.am index 9bc8dea20..6ad62c78f 100644 --- a/appl/xnlock/Makefile.am +++ b/appl/xnlock/Makefile.am @@ -27,6 +27,6 @@ LDADD = \ $(LIB_kafs) \ $(LIB_krb5) \ $(LIB_krb4) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(LIB_roken) \ $(X_LIBS) -lXt $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) diff --git a/cf/ChangeLog b/cf/ChangeLog index 1ef39147b..07702aef7 100644 --- a/cf/ChangeLog +++ b/cf/ChangeLog @@ -1,3 +1,7 @@ +2007-04-19 Love Hörnquist Åstrand + + * version-script.m4: check if ld supports --version-script + 2007-04-11 Love Hörnquist Åstrand * roken-frag.m4: drop broken-getnameinfo.m4 diff --git a/cf/crypto.m4 b/cf/crypto.m4 index 8ddf7f974..9eb53adaa 100644 --- a/cf/crypto.m4 +++ b/cf/crypto.m4 @@ -2,8 +2,7 @@ dnl $Id$ dnl dnl test for crypto libraries: dnl - libcrypto (from openssl) -dnl - libdes (from krb4) -dnl - own-built libdes +dnl - own-built libhcrypto m4_define([test_headers], [ #undef KRB5 /* makes md4.h et al unhappy */ @@ -62,7 +61,7 @@ AC_DEFUN([KRB_CRYPTO],[ crypto_lib=unknown AC_WITH_ALL([openssl]) -DIR_des= +DIR_hcrypto= AC_MSG_CHECKING([for crypto library]) @@ -104,35 +103,35 @@ if test "$crypto_lib" = "unknown" -a "$with_krb4" != "no"; then CFLAGS="$save_CFLAGS" LIBS="$save_LIBS" if test "$ires" -a "$lres"; then - INCLUDE_des="$ires" - LIB_des="$lres" + INCLUDE_hcrypto="$ires" + LIB_hcrypto="$lres" crypto_lib=krb4 AC_MSG_RESULT([same as krb4]) - LIB_des_a='$(LIB_des)' - LIB_des_so='$(LIB_des)' - LIB_des_appl='$(LIB_des)' + LIB_hcrypto_a='$(LIB_hcrypto)' + LIB_hcrypto_so='$(LIB_hcrypto)' + LIB_hcrypto_appl='$(LIB_hcrypto)' fi fi if test "$crypto_lib" = "unknown" -a "$with_openssl" != "no"; then save_CFLAGS="$CFLAGS" save_LIBS="$LIBS" - INCLUDE_des= - LIB_des= + INCLUDE_hcrypto= + LIB_hcrypto= if test "$with_openssl_include" != ""; then - INCLUDE_des="-I${with_openssl_include}" + INCLUDE_hcrypto="-I${with_openssl_include}" fi if test "$with_openssl_lib" != ""; then - LIB_des="-L${with_openssl_lib}" + LIB_hcrypto="-L${with_openssl_lib}" fi - CFLAGS="-DHAVE_OPENSSL ${INCLUDE_des} ${CFLAGS}" - saved_LIB_des="$LIB_des" + CFLAGS="-DHAVE_OPENSSL ${INCLUDE_hcrypto} ${CFLAGS}" + saved_LIB_hcrypto="$LIB_hcrypto" for lres in "" "-lnsl -lsocket"; do - LIB_des="${saved_LIB_des} -lcrypto $lres" - LIB_des_a="$LIB_des" - LIB_des_so="$LIB_des" - LIB_des_appl="$LIB_des" - LIBS="${LIBS} ${LIB_des}" + LIB_hcrypto="${saved_LIB_hcrypto} -lcrypto $lres" + LIB_hcrypto_a="$LIB_hcrypto" + LIB_hcrypto_so="$LIB_hcrypto" + LIB_hcrypto_appl="$LIB_hcrypto" + LIBS="${LIBS} ${LIB_hcrypto}" AC_LINK_IFELSE([AC_LANG_PROGRAM([test_headers],[test_body])], [ crypto_lib=libcrypto openssl=yes AC_MSG_RESULT([libcrypto]) @@ -147,13 +146,13 @@ fi if test "$crypto_lib" = "unknown"; then - DIR_des='des' - LIB_des='$(top_builddir)/lib/des/libhcrypto.la' - LIB_des_a='$(top_builddir)/lib/des/.libs/libhcrypto.a' - LIB_des_so='$(top_builddir)/lib/des/.libs/libhcrypto.so' - LIB_des_appl="-lhcrypto" + DIR_hcrypto='hcrypto' + LIB_hcrypto='$(top_builddir)/lib/hcrypto/libhcrypto.la' + LIB_hcrypto_a='$(top_builddir)/lib/hcrypto/.libs/libhcrypto.a' + LIB_hcrypto_so='$(top_builddir)/lib/hcrypto/.libs/libhcrypto.so' + LIB_hcrypto_appl="-lhcrypto" - AC_MSG_RESULT([included libdes]) + AC_MSG_RESULT([included libhcrypto]) fi @@ -168,10 +167,10 @@ if test "$openssl" = "yes"; then fi AM_CONDITIONAL(HAVE_OPENSSL, test "$openssl" = yes)dnl -AC_SUBST(DIR_des) -AC_SUBST(INCLUDE_des) -AC_SUBST(LIB_des) -AC_SUBST(LIB_des_a) -AC_SUBST(LIB_des_so) -AC_SUBST(LIB_des_appl) +AC_SUBST(DIR_hcrypto) +AC_SUBST(INCLUDE_hcrypto) +AC_SUBST(LIB_hcrypto) +AC_SUBST(LIB_hcrypto_a) +AC_SUBST(LIB_hcrypto_so) +AC_SUBST(LIB_hcrypto_appl) ]) diff --git a/kadmin/Makefile.am b/kadmin/Makefile.am index 32eb2a544..a39885a91 100644 --- a/kadmin/Makefile.am +++ b/kadmin/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -AM_CPPFLAGS += $(INCLUDE_readline) $(INCLUDE_des) -I$(srcdir)/../lib/krb5 +AM_CPPFLAGS += $(INCLUDE_readline) $(INCLUDE_hcrypto) -I$(srcdir)/../lib/krb5 sbin_PROGRAMS = kadmin @@ -65,7 +65,7 @@ LDADD_common = \ $(top_builddir)/lib/hdb/libhdb.la \ $(LIB_openldap) \ $(top_builddir)/lib/krb5/libkrb5.la \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) \ $(DBLIB) diff --git a/kcm/Makefile.am b/kcm/Makefile.am index dcb37a6de..654cdd9d3 100644 --- a/kcm/Makefile.am +++ b/kcm/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_des) -I$(srcdir)/../lib/krb5 +AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I$(srcdir)/../lib/krb5 libexec_PROGRAMS = kcm @@ -35,7 +35,7 @@ LDADD = $(top_builddir)/lib/hdb/libhdb.la \ $(LIB_openldap) \ $(top_builddir)/lib/krb5/libkrb5.la \ $(LIB_krb4) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) \ $(LIB_door_create) \ diff --git a/kdc/Makefile.am b/kdc/Makefile.am index 8868fd61b..de57c9d43 100644 --- a/kdc/Makefile.am +++ b/kdc/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_des) -I$(srcdir)/../lib/krb5 +AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I$(srcdir)/../lib/krb5 lib_LTLIBRARIES = libkdc.la @@ -63,7 +63,7 @@ hprop_LDADD = \ $(LIB_openldap) \ $(top_builddir)/lib/krb5/libkrb5.la \ $(LIB_kdb) $(LIB_krb4) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) \ $(DBLIB) @@ -73,7 +73,7 @@ hpropd_LDADD = \ $(LIB_openldap) \ $(top_builddir)/lib/krb5/libkrb5.la \ $(LIB_kdb) $(LIB_krb4) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) \ $(DBLIB) @@ -89,7 +89,7 @@ libkdc_la_LIBADD = \ $(top_builddir)/lib/krb5/libkrb5.la \ $(LIB_kdb) $(LIB_krb4) \ $(top_builddir)/lib/ntlm/libheimntlm.la \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) \ $(DBLIB) @@ -98,7 +98,7 @@ LDADD = $(top_builddir)/lib/hdb/libhdb.la \ $(LIB_openldap) \ $(top_builddir)/lib/krb5/libkrb5.la \ $(LIB_krb4) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) \ $(DBLIB) diff --git a/kpasswd/Makefile.am b/kpasswd/Makefile.am index e781f088b..83509053e 100644 --- a/kpasswd/Makefile.am +++ b/kpasswd/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -AM_CPPFLAGS += $(INCLUDE_des) +AM_CPPFLAGS += $(INCLUDE_hcrypto) man_MANS = kpasswd.1 kpasswdd.8 @@ -26,7 +26,7 @@ kpasswdd_LDADD = \ $(DBLIB) LDADD = $(top_builddir)/lib/krb5/libkrb5.la \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) diff --git a/kuser/Makefile.am b/kuser/Makefile.am index bfe8219fd..3045e75c0 100644 --- a/kuser/Makefile.am +++ b/kuser/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_des) -I$(srcdir)/../lib/krb5 +AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I$(srcdir)/../lib/krb5 man_MANS = kinit.1 klist.1 kdestroy.1 kgetcred.1 kimpersonate.1 @@ -18,7 +18,7 @@ kinit_LDADD = \ $(LIB_kafs) \ $(top_builddir)/lib/krb5/libkrb5.la \ $(LIB_krb4) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) @@ -34,7 +34,7 @@ nodist_kdigest_SOURCES = kdigest-commands.c kdigest_LDADD = \ $(top_builddir)/lib/ntlm/libheimntlm.la \ $(top_builddir)/lib/krb5/libkrb5.la \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/asn1/libasn1.la \ $(top_builddir)/lib/sl/libsl.la \ $(LIB_roken) @@ -48,7 +48,7 @@ kdigest-commands.c kdigest-commands.h: kdigest-commands.in LDADD = \ $(top_builddir)/lib/krb5/libkrb5.la \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) diff --git a/lib/Makefile.am b/lib/Makefile.am index 2d09ca0f2..aa7ba3bec 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -15,8 +15,8 @@ if COM_ERR dir_com_err = com_err endif if !HAVE_OPENSSL -dir_des = des +dir_hcrypto = hcrypto endif -SUBDIRS = roken vers editline $(dir_com_err) sl asn1 $(dir_des) hx509 \ +SUBDIRS = roken vers editline $(dir_com_err) sl asn1 $(dir_hcrypto) hx509 \ krb5 ntlm kafs gssapi hdb kadm5 auth $(dir_45) $(dir_otp) $(dir_dce) diff --git a/lib/auth/afskauthlib/Makefile.am b/lib/auth/afskauthlib/Makefile.am index 1e7932a68..7f19c7ff4 100644 --- a/lib/auth/afskauthlib/Makefile.am +++ b/lib/auth/afskauthlib/Makefile.am @@ -32,7 +32,7 @@ L = \ $(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_krb4) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/roken/libroken.la \ -lc @@ -41,7 +41,7 @@ else L = \ $(KAFS) \ $(LIB_krb4) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/roken/libroken.la \ -lc endif diff --git a/lib/auth/pam/Makefile.am b/lib/auth/pam/Makefile.am index 119c40ba8..e92157c59 100644 --- a/lib/auth/pam/Makefile.am +++ b/lib/auth/pam/Makefile.am @@ -19,14 +19,14 @@ KAFS_S=$(top_builddir)/lib/kafs/.libs/libkafs.so L = \ $(KAFS) \ $(top_builddir)/lib/krb/.libs/libkrb.a \ - $(LIB_des_a) \ + $(LIB_hcrypto_a) \ $(top_builddir)/lib/roken/.libs/libroken.a \ -lc L_shared = \ $(KAFS_S) \ $(top_builddir)/lib/krb/.libs/libkrb.so \ - $(LIB_des_so) \ + $(LIB_hcrypto_so) \ $(top_builddir)/lib/roken/.libs/libroken.so \ $(LIB_getpwnam_r) \ -lc diff --git a/lib/auth/sia/Makefile.am b/lib/auth/sia/Makefile.am index 0c7b5584c..52e210c0a 100644 --- a/lib/auth/sia/Makefile.am +++ b/lib/auth/sia/Makefile.am @@ -21,7 +21,7 @@ L = \ $(top_builddir)/lib/krb5/.libs/libkrb5.a \ $(top_builddir)/lib/asn1/.libs/libasn1.a \ $(LIB_krb4) \ - $(LIB_des_a) \ + $(LIB_hcrypto_a) \ $(LIB_com_err_a) \ $(top_builddir)/lib/roken/.libs/libroken.a \ $(LIB_getpwnam_r) \ @@ -32,7 +32,7 @@ L_shared = \ $(top_builddir)/lib/krb5/.libs/libkrb5.so \ $(top_builddir)/lib/asn1/.libs/libasn1.so \ $(LIB_krb4) \ - $(LIB_des_so) \ + $(LIB_hcrypto_so) \ $(LIB_com_err_so) \ $(top_builddir)/lib/roken/.libs/libroken.so \ $(LIB_getpwnam_r) \ @@ -46,7 +46,7 @@ L = \ $(KAFS) \ $(top_builddir)/lib/kadm/.libs/libkadm.a \ $(top_builddir)/lib/krb/.libs/libkrb.a \ - $(LIB_des_a) \ + $(LIB_hcrypto_a) \ $(top_builddir)/lib/com_err/.libs/libcom_err.a \ $(top_builddir)/lib/roken/.libs/libroken.a \ $(LIB_getpwnam_r) \ @@ -56,7 +56,7 @@ L_shared = \ $(KAFS_S) \ $(top_builddir)/lib/kadm/.libs/libkadm.so \ $(top_builddir)/lib/krb/.libs/libkrb.so \ - $(LIB_des_so) \ + $(LIB_hcrypto_so) \ $(top_builddir)/lib/com_err/.libs/libcom_err.so \ $(top_builddir)/lib/roken/.libs/libroken.so \ $(LIB_getpwnam_r) \ diff --git a/lib/gssapi/Makefile.am b/lib/gssapi/Makefile.am index 8f434d4cb..8fd167a17 100644 --- a/lib/gssapi/Makefile.am +++ b/lib/gssapi/Makefile.am @@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = subdir-objects AM_CPPFLAGS += -I$(srcdir)/../krb5 \ -I$(srcdir) \ -I$(srcdir)/mech \ - $(INCLUDE_des) \ + $(INCLUDE_hcrypto) \ $(INCLUDE_krb4) lib_LTLIBRARIES = libgssapi.la @@ -201,7 +201,7 @@ libgssapi_la_LIBADD = \ $(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_com_err) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(LIBADD_roken) man_MANS = gssapi.3 gss_acquire_cred.3 diff --git a/lib/des/.cvsignore b/lib/hcrypto/.cvsignore similarity index 100% rename from lib/des/.cvsignore rename to lib/hcrypto/.cvsignore diff --git a/lib/des/ChangeLog b/lib/hcrypto/ChangeLog similarity index 100% rename from lib/des/ChangeLog rename to lib/hcrypto/ChangeLog diff --git a/lib/des/DESperate.txt b/lib/hcrypto/DESperate.txt similarity index 100% rename from lib/des/DESperate.txt rename to lib/hcrypto/DESperate.txt diff --git a/lib/des/Makefile.am b/lib/hcrypto/Makefile.am similarity index 98% rename from lib/des/Makefile.am rename to lib/hcrypto/Makefile.am index 4e58890c6..1a706a197 100644 --- a/lib/des/Makefile.am +++ b/lib/hcrypto/Makefile.am @@ -130,7 +130,7 @@ imathsource = \ $(libhcrypto_la_OBJECTS): hcrypto-link hcrypto-link: - $(LN_S) $(srcdir)/../des hcrypto + $(LN_S) $(srcdir)/../hcrypto hcrypto touch hcrypto-link do_subst = sed -e 's,[@]srcdir[@],$(srcdir),g' diff --git a/lib/des/aes.c b/lib/hcrypto/aes.c similarity index 100% rename from lib/des/aes.c rename to lib/hcrypto/aes.c diff --git a/lib/des/aes.h b/lib/hcrypto/aes.h similarity index 100% rename from lib/des/aes.h rename to lib/hcrypto/aes.h diff --git a/lib/des/bn.c b/lib/hcrypto/bn.c similarity index 100% rename from lib/des/bn.c rename to lib/hcrypto/bn.c diff --git a/lib/des/bn.h b/lib/hcrypto/bn.h similarity index 100% rename from lib/des/bn.h rename to lib/hcrypto/bn.h diff --git a/lib/des/des-tables.h b/lib/hcrypto/des-tables.h similarity index 100% rename from lib/des/des-tables.h rename to lib/hcrypto/des-tables.h diff --git a/lib/des/des.c b/lib/hcrypto/des.c similarity index 100% rename from lib/des/des.c rename to lib/hcrypto/des.c diff --git a/lib/des/des.h b/lib/hcrypto/des.h similarity index 100% rename from lib/des/des.h rename to lib/hcrypto/des.h diff --git a/lib/des/destest.c b/lib/hcrypto/destest.c similarity index 100% rename from lib/des/destest.c rename to lib/hcrypto/destest.c diff --git a/lib/des/dh-imath.c b/lib/hcrypto/dh-imath.c similarity index 100% rename from lib/des/dh-imath.c rename to lib/hcrypto/dh-imath.c diff --git a/lib/des/dh.c b/lib/hcrypto/dh.c similarity index 100% rename from lib/des/dh.c rename to lib/hcrypto/dh.c diff --git a/lib/des/dh.h b/lib/hcrypto/dh.h similarity index 100% rename from lib/des/dh.h rename to lib/hcrypto/dh.h diff --git a/lib/des/dllmain.c b/lib/hcrypto/dllmain.c similarity index 100% rename from lib/des/dllmain.c rename to lib/hcrypto/dllmain.c diff --git a/lib/des/dsa.c b/lib/hcrypto/dsa.c similarity index 100% rename from lib/des/dsa.c rename to lib/hcrypto/dsa.c diff --git a/lib/des/dsa.h b/lib/hcrypto/dsa.h similarity index 100% rename from lib/des/dsa.h rename to lib/hcrypto/dsa.h diff --git a/lib/des/engine.c b/lib/hcrypto/engine.c similarity index 100% rename from lib/des/engine.c rename to lib/hcrypto/engine.c diff --git a/lib/des/engine.h b/lib/hcrypto/engine.h similarity index 100% rename from lib/des/engine.h rename to lib/hcrypto/engine.h diff --git a/lib/des/evp.c b/lib/hcrypto/evp.c similarity index 100% rename from lib/des/evp.c rename to lib/hcrypto/evp.c diff --git a/lib/des/evp.h b/lib/hcrypto/evp.h similarity index 100% rename from lib/des/evp.h rename to lib/hcrypto/evp.h diff --git a/lib/des/gen-des.pl b/lib/hcrypto/gen-des.pl similarity index 100% rename from lib/des/gen-des.pl rename to lib/hcrypto/gen-des.pl diff --git a/lib/des/hash.h b/lib/hcrypto/hash.h similarity index 100% rename from lib/des/hash.h rename to lib/hcrypto/hash.h diff --git a/lib/des/hmac.c b/lib/hcrypto/hmac.c similarity index 100% rename from lib/des/hmac.c rename to lib/hcrypto/hmac.c diff --git a/lib/des/hmac.h b/lib/hcrypto/hmac.h similarity index 100% rename from lib/des/hmac.h rename to lib/hcrypto/hmac.h diff --git a/lib/des/imath/LICENSE b/lib/hcrypto/imath/LICENSE similarity index 100% rename from lib/des/imath/LICENSE rename to lib/hcrypto/imath/LICENSE diff --git a/lib/des/imath/imath.c b/lib/hcrypto/imath/imath.c similarity index 100% rename from lib/des/imath/imath.c rename to lib/hcrypto/imath/imath.c diff --git a/lib/des/imath/imath.h b/lib/hcrypto/imath/imath.h similarity index 100% rename from lib/des/imath/imath.h rename to lib/hcrypto/imath/imath.h diff --git a/lib/des/imath/import.sh b/lib/hcrypto/imath/import.sh similarity index 100% rename from lib/des/imath/import.sh rename to lib/hcrypto/imath/import.sh diff --git a/lib/des/imath/iprime.c b/lib/hcrypto/imath/iprime.c similarity index 100% rename from lib/des/imath/iprime.c rename to lib/hcrypto/imath/iprime.c diff --git a/lib/des/imath/iprime.h b/lib/hcrypto/imath/iprime.h similarity index 100% rename from lib/des/imath/iprime.h rename to lib/hcrypto/imath/iprime.h diff --git a/lib/des/md2.c b/lib/hcrypto/md2.c similarity index 100% rename from lib/des/md2.c rename to lib/hcrypto/md2.c diff --git a/lib/des/md2.h b/lib/hcrypto/md2.h similarity index 100% rename from lib/des/md2.h rename to lib/hcrypto/md2.h diff --git a/lib/des/md4.c b/lib/hcrypto/md4.c similarity index 100% rename from lib/des/md4.c rename to lib/hcrypto/md4.c diff --git a/lib/des/md4.h b/lib/hcrypto/md4.h similarity index 100% rename from lib/des/md4.h rename to lib/hcrypto/md4.h diff --git a/lib/des/md5.c b/lib/hcrypto/md5.c similarity index 100% rename from lib/des/md5.c rename to lib/hcrypto/md5.c diff --git a/lib/des/md5.h b/lib/hcrypto/md5.h similarity index 100% rename from lib/des/md5.h rename to lib/hcrypto/md5.h diff --git a/lib/des/md5crypt_test.c b/lib/hcrypto/md5crypt_test.c similarity index 100% rename from lib/des/md5crypt_test.c rename to lib/hcrypto/md5crypt_test.c diff --git a/lib/des/mdtest.c b/lib/hcrypto/mdtest.c similarity index 100% rename from lib/des/mdtest.c rename to lib/hcrypto/mdtest.c diff --git a/lib/des/passwd_dialog.aps b/lib/hcrypto/passwd_dialog.aps similarity index 100% rename from lib/des/passwd_dialog.aps rename to lib/hcrypto/passwd_dialog.aps diff --git a/lib/des/passwd_dialog.clw b/lib/hcrypto/passwd_dialog.clw similarity index 100% rename from lib/des/passwd_dialog.clw rename to lib/hcrypto/passwd_dialog.clw diff --git a/lib/des/passwd_dialog.rc b/lib/hcrypto/passwd_dialog.rc similarity index 100% rename from lib/des/passwd_dialog.rc rename to lib/hcrypto/passwd_dialog.rc diff --git a/lib/des/passwd_dialog.res b/lib/hcrypto/passwd_dialog.res similarity index 100% rename from lib/des/passwd_dialog.res rename to lib/hcrypto/passwd_dialog.res diff --git a/lib/des/passwd_dlg.c b/lib/hcrypto/passwd_dlg.c similarity index 100% rename from lib/des/passwd_dlg.c rename to lib/hcrypto/passwd_dlg.c diff --git a/lib/des/passwd_dlg.h b/lib/hcrypto/passwd_dlg.h similarity index 100% rename from lib/des/passwd_dlg.h rename to lib/hcrypto/passwd_dlg.h diff --git a/lib/des/pkcs12.c b/lib/hcrypto/pkcs12.c similarity index 100% rename from lib/des/pkcs12.c rename to lib/hcrypto/pkcs12.c diff --git a/lib/des/pkcs12.h b/lib/hcrypto/pkcs12.h similarity index 100% rename from lib/des/pkcs12.h rename to lib/hcrypto/pkcs12.h diff --git a/lib/des/pkcs5.c b/lib/hcrypto/pkcs5.c similarity index 100% rename from lib/des/pkcs5.c rename to lib/hcrypto/pkcs5.c diff --git a/lib/des/rand-egd.c b/lib/hcrypto/rand-egd.c similarity index 100% rename from lib/des/rand-egd.c rename to lib/hcrypto/rand-egd.c diff --git a/lib/des/rand-fortuna.c b/lib/hcrypto/rand-fortuna.c similarity index 100% rename from lib/des/rand-fortuna.c rename to lib/hcrypto/rand-fortuna.c diff --git a/lib/des/rand-unix.c b/lib/hcrypto/rand-unix.c similarity index 100% rename from lib/des/rand-unix.c rename to lib/hcrypto/rand-unix.c diff --git a/lib/des/rand.c b/lib/hcrypto/rand.c similarity index 100% rename from lib/des/rand.c rename to lib/hcrypto/rand.c diff --git a/lib/des/rand.h b/lib/hcrypto/rand.h similarity index 100% rename from lib/des/rand.h rename to lib/hcrypto/rand.h diff --git a/lib/des/randi.h b/lib/hcrypto/randi.h similarity index 100% rename from lib/des/randi.h rename to lib/hcrypto/randi.h diff --git a/lib/des/rc2.c b/lib/hcrypto/rc2.c similarity index 100% rename from lib/des/rc2.c rename to lib/hcrypto/rc2.c diff --git a/lib/des/rc2.h b/lib/hcrypto/rc2.h similarity index 100% rename from lib/des/rc2.h rename to lib/hcrypto/rc2.h diff --git a/lib/des/rc2test.c b/lib/hcrypto/rc2test.c similarity index 100% rename from lib/des/rc2test.c rename to lib/hcrypto/rc2test.c diff --git a/lib/des/rc4.c b/lib/hcrypto/rc4.c similarity index 100% rename from lib/des/rc4.c rename to lib/hcrypto/rc4.c diff --git a/lib/des/rc4.h b/lib/hcrypto/rc4.h similarity index 100% rename from lib/des/rc4.h rename to lib/hcrypto/rc4.h diff --git a/lib/des/rctest.c b/lib/hcrypto/rctest.c similarity index 100% rename from lib/des/rctest.c rename to lib/hcrypto/rctest.c diff --git a/lib/des/resource.h b/lib/hcrypto/resource.h similarity index 100% rename from lib/des/resource.h rename to lib/hcrypto/resource.h diff --git a/lib/des/rijndael-alg-fst.c b/lib/hcrypto/rijndael-alg-fst.c similarity index 100% rename from lib/des/rijndael-alg-fst.c rename to lib/hcrypto/rijndael-alg-fst.c diff --git a/lib/des/rijndael-alg-fst.h b/lib/hcrypto/rijndael-alg-fst.h similarity index 100% rename from lib/des/rijndael-alg-fst.h rename to lib/hcrypto/rijndael-alg-fst.h diff --git a/lib/des/rnd_keys.c b/lib/hcrypto/rnd_keys.c similarity index 100% rename from lib/des/rnd_keys.c rename to lib/hcrypto/rnd_keys.c diff --git a/lib/des/rsa-imath.c b/lib/hcrypto/rsa-imath.c similarity index 100% rename from lib/des/rsa-imath.c rename to lib/hcrypto/rsa-imath.c diff --git a/lib/des/rsa.c b/lib/hcrypto/rsa.c similarity index 100% rename from lib/des/rsa.c rename to lib/hcrypto/rsa.c diff --git a/lib/des/rsa.h b/lib/hcrypto/rsa.h similarity index 100% rename from lib/des/rsa.h rename to lib/hcrypto/rsa.h diff --git a/lib/des/rsakey.der b/lib/hcrypto/rsakey.der similarity index 100% rename from lib/des/rsakey.der rename to lib/hcrypto/rsakey.der diff --git a/lib/des/sha.c b/lib/hcrypto/sha.c similarity index 100% rename from lib/des/sha.c rename to lib/hcrypto/sha.c diff --git a/lib/des/sha.h b/lib/hcrypto/sha.h similarity index 100% rename from lib/des/sha.h rename to lib/hcrypto/sha.h diff --git a/lib/des/sha256.c b/lib/hcrypto/sha256.c similarity index 100% rename from lib/des/sha256.c rename to lib/hcrypto/sha256.c diff --git a/lib/des/test_bn.c b/lib/hcrypto/test_bn.c similarity index 100% rename from lib/des/test_bn.c rename to lib/hcrypto/test_bn.c diff --git a/lib/des/test_cipher.c b/lib/hcrypto/test_cipher.c similarity index 100% rename from lib/des/test_cipher.c rename to lib/hcrypto/test_cipher.c diff --git a/lib/des/test_crypto.in b/lib/hcrypto/test_crypto.in similarity index 100% rename from lib/des/test_crypto.in rename to lib/hcrypto/test_crypto.in diff --git a/lib/des/test_engine_dso.c b/lib/hcrypto/test_engine_dso.c similarity index 100% rename from lib/des/test_engine_dso.c rename to lib/hcrypto/test_engine_dso.c diff --git a/lib/des/test_hmac.c b/lib/hcrypto/test_hmac.c similarity index 100% rename from lib/des/test_hmac.c rename to lib/hcrypto/test_hmac.c diff --git a/lib/des/test_imath.c b/lib/hcrypto/test_imath.c similarity index 100% rename from lib/des/test_imath.c rename to lib/hcrypto/test_imath.c diff --git a/lib/des/test_pkcs12.c b/lib/hcrypto/test_pkcs12.c similarity index 100% rename from lib/des/test_pkcs12.c rename to lib/hcrypto/test_pkcs12.c diff --git a/lib/des/test_pkcs5.c b/lib/hcrypto/test_pkcs5.c similarity index 100% rename from lib/des/test_pkcs5.c rename to lib/hcrypto/test_pkcs5.c diff --git a/lib/des/test_rand.c b/lib/hcrypto/test_rand.c similarity index 100% rename from lib/des/test_rand.c rename to lib/hcrypto/test_rand.c diff --git a/lib/des/test_rsa.c b/lib/hcrypto/test_rsa.c similarity index 100% rename from lib/des/test_rsa.c rename to lib/hcrypto/test_rsa.c diff --git a/lib/des/ui.c b/lib/hcrypto/ui.c similarity index 100% rename from lib/des/ui.c rename to lib/hcrypto/ui.c diff --git a/lib/des/ui.h b/lib/hcrypto/ui.h similarity index 100% rename from lib/des/ui.h rename to lib/hcrypto/ui.h diff --git a/lib/hdb/Makefile.am b/lib/hdb/Makefile.am index 3b28182b1..0660c5815 100644 --- a/lib/hdb/Makefile.am +++ b/lib/hdb/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -AM_CPPFLAGS += -I../asn1 -I$(srcdir)/../asn1 $(INCLUDE_des) +AM_CPPFLAGS += -I../asn1 -I$(srcdir)/../asn1 $(INCLUDE_hcrypto) BUILT_SOURCES = \ $(gen_files_hdb:.x=.c) \ @@ -32,7 +32,7 @@ LDADD = libhdb.la \ $(LIB_openldap) \ ../krb5/libkrb5.la \ ../asn1/libasn1.la \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(LIB_roken) \ $(LIB_ldopen) diff --git a/lib/hx509/Makefile.am b/lib/hx509/Makefile.am index c41c514e7..f649285b1 100644 --- a/lib/hx509/Makefile.am +++ b/lib/hx509/Makefile.am @@ -80,12 +80,12 @@ dist_libhx509_la_SOURCES = \ libhx509_la_LIBADD = \ $(LIB_com_err) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIBADD_roken) \ $(LIB_dlopen) -libhx509_la_CPPFLAGS = -I$(srcdir)/ref $(INCLUDE_des) +libhx509_la_CPPFLAGS = -I$(srcdir)/ref $(INCLUDE_hcrypto) nodist_libhx509_la_SOURCES = $(BUILT_SOURCES) $(gen_files_ocsp) ocsp_asn1.h: ocsp_asn1_files @@ -125,11 +125,11 @@ nodist_hxtool_SOURCES = hxtool-commands.c hxtool-commands.h $(hxtool_OBJECTS): hxtool-commands.h -hxtool_CPPFLAGS = $(INCLUDE_des) +hxtool_CPPFLAGS = $(INCLUDE_hcrypto) hxtool_LDADD = \ libhx509.la \ $(top_builddir)/lib/asn1/libasn1.la \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(LIB_roken) \ $(top_builddir)/lib/sl/libsl.la diff --git a/lib/kadm5/Makefile.am b/lib/kadm5/Makefile.am index 38f75e7e1..8e5292855 100644 --- a/lib/kadm5/Makefile.am +++ b/lib/kadm5/Makefile.am @@ -120,7 +120,7 @@ LDADD = \ $(LIB_openldap) \ $(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/asn1/libasn1.la \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(LIB_roken) \ $(DBLIB) \ $(LIB_dlopen) \ @@ -132,7 +132,7 @@ iprop_log_LDADD = \ $(LIB_openldap) \ $(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/asn1/libasn1.la \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/sl/libsl.la \ $(LIB_readline) \ $(LIB_roken) \ diff --git a/lib/kafs/Makefile.am b/lib/kafs/Makefile.am index 4485a65ec..bb8c1ffd0 100644 --- a/lib/kafs/Makefile.am +++ b/lib/kafs/Makefile.am @@ -5,7 +5,7 @@ include $(top_srcdir)/Makefile.am.common AM_CPPFLAGS += $(AFS_EXTRA_DEFS) $(ROKEN_RENAME) if KRB4 -DEPLIB_krb4 = $(LIB_krb4) $(LIB_des) +DEPLIB_krb4 = $(LIB_krb4) $(LIB_hcrypto) krb4_am_workaround = $(INCLUDE_krb4) else DEPLIB_krb4 = @@ -15,7 +15,7 @@ AM_CPPFLAGS += $(krb4_am_workaround) if KRB5 DEPLIB_krb5 = ../krb5/libkrb5.la -krb5_am_workaround = $(INCLUDE_des) -I$(top_srcdir)/lib/krb5 +krb5_am_workaround = $(INCLUDE_hcrypto) -I$(top_srcdir)/lib/krb5 else DEPLIB_krb5 = krb5_am_workaround = diff --git a/lib/krb5/Makefile.am b/lib/krb5/Makefile.am index 7ab4ce14f..77a5c9804 100644 --- a/lib/krb5/Makefile.am +++ b/lib/krb5/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_des) -I../com_err -I$(srcdir)/../com_err +AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I../com_err -I$(srcdir)/../com_err bin_PROGRAMS = verify_krb5_conf @@ -39,7 +39,7 @@ TESTS = \ check_PROGRAMS = $(TESTS) test_hostname LDADD = libkrb5.la \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIB_roken) @@ -50,7 +50,7 @@ endif libkrb5_la_LIBADD = \ $(LIB_pkinit) \ $(LIB_com_err) \ - $(LIB_des) \ + $(LIB_hcrypto) \ $(top_builddir)/lib/asn1/libasn1.la \ $(LIBADD_roken) \ $(LIB_door_create) \ diff --git a/lib/otp/Makefile.am b/lib/otp/Makefile.am index 881d83280..7438edf91 100644 --- a/lib/otp/Makefile.am +++ b/lib/otp/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.am.common -AM_CPPFLAGS += $(INCLUDE_des) $(ROKEN_RENAME) +AM_CPPFLAGS += $(INCLUDE_hcrypto) $(ROKEN_RENAME) noinst_PROGRAMS = otptest @@ -14,7 +14,7 @@ include_HEADERS = otp.h lib_LTLIBRARIES = libotp.la libotp_la_LDFLAGS = -version-info 1:4:1 -libotp_la_LIBADD = $(LIB_des) $(LIB_roken) $(LIB_NDBM) +libotp_la_LIBADD = $(LIB_hcrypto) $(LIB_roken) $(LIB_NDBM) if HAVE_DB3 ndbm_wrap = ndbm_wrap.c ndbm_wrap.h diff --git a/lib/vers/Makefile.am b/lib/vers/Makefile.am index 447c39321..3e19c1f5d 100644 --- a/lib/vers/Makefile.am +++ b/lib/vers/Makefile.am @@ -14,7 +14,7 @@ if KRB4 if KRB5 ## need to link with des here; otherwise, if krb4 is shared the link ## will fail with unresolved references -make_print_version_LDADD = $(LIB_krb4) $(LIB_des) +make_print_version_LDADD = $(LIB_krb4) $(LIB_hcrypto) endif endif diff --git a/tools/Makefile.am b/tools/Makefile.am index 26a11b77b..9b5d3c0fb 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -22,8 +22,8 @@ krb5-config: krb5-config.in -e "s!@includedir\@!$(includedir)!g" \ -e "s!@LIB_crypt\@!$(LIB_crypt)!g" \ -e "s!@LIB_dbopen\@!$(LIB_dbopen)!g" \ - -e "s!@INCLUDE_des\@!$(INCLUDE_des)!g" \ - -e "s!@LIB_des_appl\@!$(LIB_des_appl)!g" \ + -e "s!@INCLUDE_hcrypto\@!$(INCLUDE_hcrypto)!g" \ + -e "s!@LIB_hcrypto_appl\@!$(LIB_hcrypto_appl)!g" \ -e "s!@LIB_dlopen\@!$(LIB_dlopen)!g" \ -e "s!@LIB_door_create\@!$(LIB_door_create)!g" \ -e "s!@LIB_pkinit\@!$(LIB_pkinit)!g" \