summaryrefslogtreecommitdiffstats
path: root/crypto/heimdal/cf
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/heimdal/cf')
-rw-r--r--crypto/heimdal/cf/ChangeLog51
-rw-r--r--crypto/heimdal/cf/Makefile.am.common6
-rw-r--r--crypto/heimdal/cf/check-compile-et.m418
-rw-r--r--crypto/heimdal/cf/check-var.m411
-rw-r--r--crypto/heimdal/cf/crypto.m471
-rw-r--r--crypto/heimdal/cf/make-proto.pl6
-rw-r--r--crypto/heimdal/cf/roken-frag.m44
-rw-r--r--crypto/heimdal/cf/sunos.m42
8 files changed, 130 insertions, 39 deletions
diff --git a/crypto/heimdal/cf/ChangeLog b/crypto/heimdal/cf/ChangeLog
index 5421d90..16787e1 100644
--- a/crypto/heimdal/cf/ChangeLog
+++ b/crypto/heimdal/cf/ChangeLog
@@ -1,3 +1,54 @@
+2003-05-08 Johan Danielsson <joda@pdc.kth.se>
+
+ * Makefile.am.common: change install-data-local to
+ install-data-hook
+
+2003-05-05 Assar Westerlund <assar@kth.se>
+
+ * crypto.m4: define OPENSSL_DES_LIBDES_COMPATIBILITY
+
+2003-04-03 Love Hörnquist Åstrand <lha@it.su.se>
+
+ * crypto.m4: check if libcrypto needs -lnsl or -lsocket
+
+2003-04-02 Love Hörnquist Åstrand <lha@it.su.se>
+
+ * crypto.m4: in the case where se don't link with kerberos 4, use
+ ${with_openssl_include} if its are set (not
+ ${with_openssl}/include) same for with_openssl_lib
+
+2003-03-18 Love Hörnquist Åstrand <lha@it.su.se>
+
+ * Makefile.am.common: always define LIB_kafs
+
+2003-03-12 Love Hörnquist Åstrand <lha@it.su.se>
+
+ * check-compile-et.m4: check if the output of compile_et needs
+ initialize_error_table_r
+
+2003-02-17 Love Hörnquist Åstrand <lha@it.su.se>
+
+ * check-var.m4: add a check if the variable is avaible when we
+ include the headerfiles
+
+2002-12-18 Johan Danielsson <joda@pdc.kth.se>
+
+ * roken-frag.m4: res_nsearch takes 6 parameters; spotted by Howard
+ Chu
+
+2002-10-25 Johan Danielsson <joda@pdc.kth.se>
+
+ * crypto.m4: do a better job at matching headers to libraries
+
+2002-10-16 Johan Danielsson <joda@pdc.kth.se>
+
+ * sunos.m4: more quoting
+
+2002-09-19 Johan Danielsson <joda@pdc.kth.se>
+
+ * make-proto.pl: check the processed string for closing ), not the
+ source
+
2002-09-10 Johan Danielsson <joda@pdc.kth.se>
* crypto.m4: use m4 macros for test cases, also test for older
diff --git a/crypto/heimdal/cf/Makefile.am.common b/crypto/heimdal/cf/Makefile.am.common
index a59eed3..bd7a73d 100644
--- a/crypto/heimdal/cf/Makefile.am.common
+++ b/crypto/heimdal/cf/Makefile.am.common
@@ -1,4 +1,4 @@
-# $Id: Makefile.am.common,v 1.36 2002/08/19 16:10:25 joda Exp $
+# $Id: Makefile.am.common,v 1.37.2.1 2003/05/08 17:08:09 joda Exp $
AUTOMAKE_OPTIONS = foreign no-dependencies 1.6
@@ -190,7 +190,7 @@ dist-hook: dist-cat1-mans dist-cat3-mans dist-cat5-mans dist-cat8-mans
install-cat-mans:
$(SHELL) $(top_srcdir)/cf/install-catman.sh "$(INSTALL_DATA)" "$(mkinstalldirs)" "$(srcdir)" "$(DESTDIR)$(mandir)" '$(CATMANEXT)' $(man_MANS) $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man8_MANS)
-install-data-local: install-cat-mans
+install-data-hook: install-cat-mans
.et.h:
@@ -198,9 +198,7 @@ install-data-local: install-cat-mans
.et.c:
$(COMPILE_ET) $<
-if KRB4
LIB_kafs = $(top_builddir)/lib/kafs/libkafs.la $(AIX_EXTRA_KAFS)
-endif
if KRB5
LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
diff --git a/crypto/heimdal/cf/check-compile-et.m4 b/crypto/heimdal/cf/check-compile-et.m4
index 080faeb..096b267 100644
--- a/crypto/heimdal/cf/check-compile-et.m4
+++ b/crypto/heimdal/cf/check-compile-et.m4
@@ -1,4 +1,4 @@
-dnl $Id: check-compile-et.m4,v 1.6 2001/09/02 17:08:48 assar Exp $
+dnl $Id: check-compile-et.m4,v 1.7 2003/03/12 16:48:52 lha Exp $
dnl
dnl CHECK_COMPILE_ET
AC_DEFUN([CHECK_COMPILE_ET], [
@@ -6,6 +6,7 @@ AC_DEFUN([CHECK_COMPILE_ET], [
AC_CHECK_PROG(COMPILE_ET, compile_et, [compile_et])
krb_cv_compile_et="no"
+krb_cv_com_err_need_r=""
if test "${COMPILE_ET}" = "compile_et"; then
dnl We have compile_et. Now let's see if it supports `prefix' and `index'.
@@ -34,6 +35,20 @@ int main(){return (CONFTEST_CODE2 - CONFTEST_CODE1) != 127;}
], [krb_cv_compile_et="yes"],[CPPFLAGS="${save_CPPFLAGS}"])
fi
AC_MSG_RESULT(${krb_cv_compile_et})
+if test "${krb_cv_compile_et}" = "yes"; then
+ AC_MSG_CHECKING(for if com_err needs to have a initialize_error_table_r)
+ save2_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS"
+ AC_EGREP_CPP(initialize_error_table_r,[#include "conftest_et.c"],
+ [krb_cv_com_err_need_r="initialize_error_table_r(0,0,0,0);"
+ CPPFLAGS="$save2_CPPFLAGS"],
+ [CPPFLAGS="${save_CPPFLAGS}"])
+ if test X"$krb_cv_com_err_need_r" = X ; then
+ AC_MSG_RESULT(no)
+ else
+ AC_MSG_RESULT(yes)
+ fi
+fi
rm -fr conftest*
fi
@@ -45,6 +60,7 @@ if test "${krb_cv_compile_et}" = "yes"; then
AC_TRY_LINK([#include <com_err.h>],[
const char *p;
p = error_message(0);
+ $krb_cv_com_err_need_r
],[krb_cv_com_err="yes"],[krb_cv_com_err="no"; CPPFLAGS="${save_CPPFLAGS}"])
AC_MSG_RESULT(${krb_cv_com_err})
LIBS="${krb_cv_save_LIBS}"
diff --git a/crypto/heimdal/cf/check-var.m4 b/crypto/heimdal/cf/check-var.m4
index e409067..1960f72 100644
--- a/crypto/heimdal/cf/check-var.m4
+++ b/crypto/heimdal/cf/check-var.m4
@@ -1,13 +1,20 @@
-dnl $Id: check-var.m4,v 1.6 2001/08/21 12:00:16 joda Exp $
+dnl $Id: check-var.m4,v 1.7 2003/02/17 00:44:57 lha Exp $
dnl
dnl rk_CHECK_VAR(variable, includes)
AC_DEFUN([rk_CHECK_VAR], [
AC_MSG_CHECKING(for $1)
AC_CACHE_VAL(ac_cv_var_$1, [
+m4_ifval([$2],[
+ AC_TRY_LINK([$2
+ void * foo() { return &$1; }],
+ [foo()],
+ ac_cv_var_$1=yes, ac_cv_var_$1=no)])
+if test "$ac_cv_var_$1" != yes ; then
AC_TRY_LINK([extern int $1;
int foo() { return $1; }],
[foo()],
ac_cv_var_$1=yes, ac_cv_var_$1=no)
+fi
])
ac_foo=`eval echo \\$ac_cv_var_$1`
AC_MSG_RESULT($ac_foo)
@@ -19,4 +26,4 @@ fi
])
AC_WARNING_ENABLE([obsolete])
-AU_DEFUN([AC_CHECK_VAR], [rk_CHECK_VAR([$2], [$1])], [foo]) \ No newline at end of file
+AU_DEFUN([AC_CHECK_VAR], [rk_CHECK_VAR([$2], [$1])], [foo])
diff --git a/crypto/heimdal/cf/crypto.m4 b/crypto/heimdal/cf/crypto.m4
index 4cd6ad0..c79ba4c 100644
--- a/crypto/heimdal/cf/crypto.m4
+++ b/crypto/heimdal/cf/crypto.m4
@@ -1,4 +1,4 @@
-dnl $Id: crypto.m4,v 1.13 2002/09/10 19:55:48 joda Exp $
+dnl $Id: crypto.m4,v 1.16.2.1 2003/05/05 20:08:32 joda Exp $
dnl
dnl test for crypto libraries:
dnl - libcrypto (from openssl)
@@ -11,8 +11,10 @@ m4_define([test_headers], [
#include <openssl/md4.h>
#include <openssl/md5.h>
#include <openssl/sha.h>
+ #define OPENSSL_DES_LIBDES_COMPATIBILITY
#include <openssl/des.h>
#include <openssl/rc4.h>
+ #include <openssl/rand.h>
#else
#include <md4.h>
#include <md5.h>
@@ -44,6 +46,9 @@ m4_define([test_body], [
MD4_Init(&md4);
MD5_Init(&md5);
SHA1_Init(&sha1);
+ #ifdef HAVE_OPENSSL
+ RAND_status();
+ #endif
des_cbc_encrypt(0, 0, 0, schedule, 0, 0);
RC4(0, 0, 0, 0);])
@@ -75,23 +80,31 @@ if test "$crypto_lib" = "unknown" -a "$with_krb4" != "no"; then
ires=
for i in $INCLUDE_krb4; do
CFLAGS="-DHAVE_OPENSSL $i $save_CFLAGS"
- AC_TRY_COMPILE(test_headers, test_body,
- openssl=yes ires="$i"; break)
+ for j in $cdirs; do
+ for k in $clibs; do
+ LIBS="$j $k $save_LIBS"
+ AC_TRY_LINK(test_headers, test_body,
+ openssl=yes ires="$i" lres="$j $k"; break 3)
+ done
+ done
CFLAGS="$i $save_CFLAGS"
- AC_TRY_COMPILE(test_headers, test_body,
- openssl=no ires="$i"; break)
- CFLAGS="-DOLD_HASH_NAMES $i $save_CFLAGS"
- AC_TRY_COMPILE(test_headers, test_body,
- openssl=no ires="$i" old_hash=yes; break)
- done
- lres=
- for i in $cdirs; do
- for j in $clibs; do
- LIBS="$i $j $save_LIBS"
- AC_TRY_LINK(test_headers, test_body,
- lres="$i $j"; break 2)
+ for j in $cdirs; do
+ for k in $clibs; do
+ LIBS="$j $k $save_LIBS"
+ AC_TRY_LINK(test_headers, test_body,
+ openssl=no ires="$i" lres="$j $k"; break 3)
+ done
+ done
+ CFLAGS="-DHAVE_OLD_HASH_NAMES $i $save_CFLAGS"
+ for j in $cdirs; do
+ for k in $clibs; do
+ LIBS="$j $k $save_LIBS"
+ AC_TRY_LINK(test_headers, test_body,
+ openssl=no ires="$i" lres="$j $k"; break 3)
+ done
done
done
+
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
if test "$ires" -a "$lres"; then
@@ -111,21 +124,27 @@ if test "$crypto_lib" = "unknown" -a "$with_openssl" != "no"; then
INCLUDE_des=
LIB_des=
if test "$with_openssl_include" != ""; then
- INCLUDE_des="-I${with_openssl}/include"
+ INCLUDE_des="-I${with_openssl_include}"
fi
if test "$with_openssl_lib" != ""; then
- LIB_des="-L${with_openssl}/lib"
+ LIB_des="-L${with_openssl_lib}"
fi
CFLAGS="-DHAVE_OPENSSL ${INCLUDE_des} ${CFLAGS}"
- LIB_des="${LIB_des} -lcrypto"
- LIB_des_a="$LIB_des"
- LIB_des_so="$LIB_des"
- LIB_des_appl="$LIB_des"
- LIBS="${LIBS} ${LIB_des}"
- AC_TRY_LINK(test_headers, test_body, [
- crypto_lib=libcrypto openssl=yes
- AC_MSG_RESULT([libcrypto])
- ])
+ saved_LIB_des="$LIB_des"
+ 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}"
+ AC_TRY_LINK(test_headers, test_body, [
+ crypto_lib=libcrypto openssl=yes
+ AC_MSG_RESULT([libcrypto])
+ ])
+ if test "$crypto_lib" = libcrypto ; then
+ break;
+ fi
+ done
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
fi
diff --git a/crypto/heimdal/cf/make-proto.pl b/crypto/heimdal/cf/make-proto.pl
index dd386e4..769d96c 100644
--- a/crypto/heimdal/cf/make-proto.pl
+++ b/crypto/heimdal/cf/make-proto.pl
@@ -1,5 +1,5 @@
# Make prototypes from .c files
-# $Id: make-proto.pl,v 1.15 2002/08/12 16:23:58 joda Exp $
+# $Id: make-proto.pl,v 1.16 2002/09/19 19:29:42 joda Exp $
##use Getopt::Std;
require 'getopts.pl';
@@ -49,9 +49,9 @@ while(<>) {
s/\/\*(.|\n)*\ca//;
}
s/^\s*//;
- s/\s$//;
+ s/\s*$//;
s/\s+/ /g;
- if($line =~ /\)\s$/){
+ if($_ =~ /\)$/){
if(!/^static/ && !/^PRIVATE/){
if(/(.*)(__attribute__\s?\(.*\))/) {
$attr = $2;
diff --git a/crypto/heimdal/cf/roken-frag.m4 b/crypto/heimdal/cf/roken-frag.m4
index 21cf12c..fc263ad 100644
--- a/crypto/heimdal/cf/roken-frag.m4
+++ b/crypto/heimdal/cf/roken-frag.m4
@@ -1,4 +1,4 @@
-dnl $Id: roken-frag.m4,v 1.44 2002/09/04 20:57:30 joda Exp $
+dnl $Id: roken-frag.m4,v 1.45 2002/12/18 17:34:25 joda Exp $
dnl
dnl some code to get roken working
dnl
@@ -143,7 +143,7 @@ AC_FIND_FUNC(res_nsearch, resolv,
#include <resolv.h>
#endif
],
-[0,0,0,0,0])
+[0,0,0,0,0,0])
AC_FIND_FUNC(dn_expand, resolv,
[
diff --git a/crypto/heimdal/cf/sunos.m4 b/crypto/heimdal/cf/sunos.m4
index c093278..6572d0b 100644
--- a/crypto/heimdal/cf/sunos.m4
+++ b/crypto/heimdal/cf/sunos.m4
@@ -1,5 +1,5 @@
dnl
-dnl $Id: sunos.m4,v 1.1.4.1 2002/10/21 14:29:36 joda Exp $
+dnl $Id: sunos.m4,v 1.2 2002/10/16 14:42:13 joda Exp $
dnl
AC_DEFUN([rk_SUNOS],[
OpenPOWER on IntegriCloud