use m4 macros for test cases, also test for older hash names
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11439 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
201
cf/crypto.m4
201
cf/crypto.m4
@@ -5,6 +5,50 @@ dnl - libcrypto (from openssl)
|
||||
dnl - libdes (from krb4)
|
||||
dnl - own-built libdes
|
||||
|
||||
m4_define([test_headers], [
|
||||
#undef KRB5 /* makes md4.h et al unhappy */
|
||||
#ifdef HAVE_OPENSSL
|
||||
#include <openssl/md4.h>
|
||||
#include <openssl/md5.h>
|
||||
#include <openssl/sha.h>
|
||||
#include <openssl/des.h>
|
||||
#include <openssl/rc4.h>
|
||||
#else
|
||||
#include <md4.h>
|
||||
#include <md5.h>
|
||||
#include <sha.h>
|
||||
#include <des.h>
|
||||
#include <rc4.h>
|
||||
#endif
|
||||
#ifdef OLD_HASH_NAMES
|
||||
typedef struct md4 MD4_CTX;
|
||||
#define MD4_Init(C) md4_init((C))
|
||||
#define MD4_Update(C, D, L) md4_update((C), (D), (L))
|
||||
#define MD4_Final(D, C) md4_finito((C), (D))
|
||||
typedef struct md5 MD5_CTX;
|
||||
#define MD5_Init(C) md5_init((C))
|
||||
#define MD5_Update(C, D, L) md5_update((C), (D), (L))
|
||||
#define MD5_Final(D, C) md5_finito((C), (D))
|
||||
typedef struct sha SHA_CTX;
|
||||
#define SHA1_Init(C) sha_init((C))
|
||||
#define SHA1_Update(C, D, L) sha_update((C), (D), (L))
|
||||
#define SHA1_Final(D, C) sha_finito((C), (D))
|
||||
#endif
|
||||
])
|
||||
m4_define([test_body], [
|
||||
void *schedule = 0;
|
||||
MD4_CTX md4;
|
||||
MD5_CTX md5;
|
||||
SHA_CTX sha1;
|
||||
|
||||
MD4_Init(&md4);
|
||||
MD5_Init(&md5);
|
||||
SHA1_Init(&sha1);
|
||||
|
||||
des_cbc_encrypt(0, 0, 0, schedule, 0, 0);
|
||||
RC4(0, 0, 0, 0);])
|
||||
|
||||
|
||||
AC_DEFUN([KRB_CRYPTO],[
|
||||
crypto_lib=unknown
|
||||
AC_WITH_ALL([openssl])
|
||||
@@ -14,6 +58,7 @@ DIR_des=
|
||||
AC_MSG_CHECKING([for crypto library])
|
||||
|
||||
openssl=no
|
||||
old_hash=no
|
||||
|
||||
if test "$crypto_lib" = "unknown" -a "$with_krb4" != "no"; then
|
||||
save_CPPFLAGS="$CPPFLAGS"
|
||||
@@ -29,91 +74,22 @@ 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)
|
||||
CFLAGS="$i $save_CFLAGS"
|
||||
AC_TRY_COMPILE([
|
||||
#undef KRB5 /* makes md4.h et al unhappy */
|
||||
#define KRB4
|
||||
#include <openssl/md4.h>
|
||||
#include <openssl/md5.h>
|
||||
#include <openssl/sha.h>
|
||||
#include <openssl/des.h>
|
||||
#include <openssl/rc4.h>
|
||||
], [
|
||||
MD4_CTX md4;
|
||||
MD5_CTX md5;
|
||||
SHA_CTX sha1;
|
||||
|
||||
MD4_Init(&md4);
|
||||
MD5_Init(&md5);
|
||||
SHA1_Init(&sha1);
|
||||
|
||||
des_cbc_encrypt(0, 0, 0, 0, 0, 0);
|
||||
RC4(0, 0, 0, 0);],openssl=yes ires="$i"; break)
|
||||
AC_TRY_COMPILE([
|
||||
#undef KRB5 /* makes md4.h et al unhappy */
|
||||
#define KRB4
|
||||
#include <md4.h>
|
||||
#include <md5.h>
|
||||
#include <sha.h>
|
||||
#include <des.h>
|
||||
#include <rc4.h>
|
||||
], [
|
||||
MD4_CTX md4;
|
||||
MD5_CTX md5;
|
||||
SHA_CTX sha1;
|
||||
|
||||
MD4_Init(&md4);
|
||||
MD5_Init(&md5);
|
||||
SHA1_Init(&sha1);
|
||||
|
||||
des_cbc_encrypt(0, 0, 0, 0, 0, 0);
|
||||
RC4(0, 0, 0, 0);],ires="$i"; break)
|
||||
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"
|
||||
if test "$openssl" = yes; then
|
||||
AC_TRY_LINK([
|
||||
#undef KRB5 /* makes md4.h et al unhappy */
|
||||
#define KRB4
|
||||
#include <openssl/md4.h>
|
||||
#include <openssl/md5.h>
|
||||
#include <openssl/sha.h>
|
||||
#include <openssl/des.h>
|
||||
#include <openssl/rc4.h>
|
||||
], [
|
||||
MD4_CTX md4;
|
||||
MD5_CTX md5;
|
||||
SHA_CTX sha1;
|
||||
|
||||
MD4_Init(&md4);
|
||||
MD5_Init(&md5);
|
||||
SHA1_Init(&sha1);
|
||||
|
||||
des_cbc_encrypt(0, 0, 0, 0, 0, 0);
|
||||
RC4(0, 0, 0, 0);],lres="$i $j"; break 2)
|
||||
else
|
||||
AC_TRY_LINK([
|
||||
#undef KRB5 /* makes md4.h et al unhappy */
|
||||
#define KRB4
|
||||
#include <md4.h>
|
||||
#include <md5.h>
|
||||
#include <sha.h>
|
||||
#include <des.h>
|
||||
#include <rc4.h>
|
||||
], [
|
||||
MD4_CTX md4;
|
||||
MD5_CTX md5;
|
||||
SHA_CTX sha1;
|
||||
|
||||
MD4_Init(&md4);
|
||||
MD5_Init(&md5);
|
||||
SHA1_Init(&sha1);
|
||||
|
||||
des_cbc_encrypt(0, 0, 0, 0, 0, 0);
|
||||
RC4(0, 0, 0, 0);],lres="$i $j"; break 2)
|
||||
fi
|
||||
AC_TRY_LINK(test_headers, test_body,
|
||||
lres="$i $j"; break 2)
|
||||
done
|
||||
done
|
||||
CFLAGS="$save_CFLAGS"
|
||||
@@ -130,47 +106,28 @@ if test "$crypto_lib" = "unknown" -a "$with_krb4" != "no"; then
|
||||
fi
|
||||
|
||||
if test "$crypto_lib" = "unknown" -a "$with_openssl" != "no"; then
|
||||
|
||||
save_CPPFLAGS="$CPPFLAGS"
|
||||
save_LIBS="$LIBS"
|
||||
INCLUDE_des=
|
||||
LIB_des=
|
||||
if test "$with_openssl_include" != ""; then
|
||||
INCLUDE_des="-I${with_openssl}/include"
|
||||
fi
|
||||
if test "$with_openssl_lib" != ""; then
|
||||
LIB_des="-L${with_openssl}/lib"
|
||||
fi
|
||||
CPPFLAGS="${INCLUDE_des} ${CPPFLAGS}"
|
||||
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([
|
||||
#include <openssl/md4.h>
|
||||
#include <openssl/md5.h>
|
||||
#include <openssl/sha.h>
|
||||
#include <openssl/des.h>
|
||||
#include <openssl/rc4.h>
|
||||
],
|
||||
[
|
||||
void *schedule = 0;
|
||||
MD4_CTX md4;
|
||||
MD5_CTX md5;
|
||||
SHA_CTX sha1;
|
||||
|
||||
MD4_Init(&md4);
|
||||
MD5_Init(&md5);
|
||||
SHA1_Init(&sha1);
|
||||
|
||||
des_cbc_encrypt(0, 0, 0, schedule, 0, 0);
|
||||
RC4(0, 0, 0, 0);
|
||||
], [
|
||||
crypto_lib=libcrypto openssl=yes
|
||||
AC_MSG_RESULT([libcrypto])])
|
||||
CPPFLAGS="$save_CPPFLAGS"
|
||||
LIBS="$save_LIBS"
|
||||
save_CFLAGS="$CFLAGS"
|
||||
save_LIBS="$LIBS"
|
||||
INCLUDE_des=
|
||||
LIB_des=
|
||||
if test "$with_openssl_include" != ""; then
|
||||
INCLUDE_des="-I${with_openssl}/include"
|
||||
fi
|
||||
if test "$with_openssl_lib" != ""; then
|
||||
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])
|
||||
])
|
||||
CFLAGS="$save_CFLAGS"
|
||||
LIBS="$save_LIBS"
|
||||
fi
|
||||
|
||||
if test "$crypto_lib" = "unknown"; then
|
||||
@@ -194,6 +151,10 @@ fi
|
||||
if test "$openssl" = "yes"; then
|
||||
AC_DEFINE([HAVE_OPENSSL], 1, [define to use openssl's libcrypto])
|
||||
fi
|
||||
if test "$old_hash" = yes; then
|
||||
AC_DEFINE([HAVE_OLD_HASH_NAMES], 1,
|
||||
[define if you have hash functions like md4_finito()])
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_OPENSSL, test "$openssl" = yes)dnl
|
||||
|
||||
AC_SUBST(DIR_des)
|
||||
|
Reference in New Issue
Block a user