Changeset b5fe6d2

Timestamp:

Feb 24, 2009, 11:48:47 PM (16 years ago)

Author:

Sam Hartman <hartmans@debian.org>

Branches:

master, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

32f834a

Parents:

3da3afe

git-author:

Sam Hartman <hartmans@mit.edu> (02/24/09 23:41:54)

git-committer:

Sam Hartman <hartmans@debian.org> (02/24/09 23:48:47)

Message:

Support zcrypt using OpenSSL DES

Support a hackish mechanism for detecting OpenSSL DES if des425 is not
present.  If you include des.h then they include macros to be
consistent with the des425 API.  However these macros rename
des_ecb_encrypto te DES_ecb_encrypt.  Searching for both the macros
and the functions was annoying in autoconf, so instead we search for
those internal function names.

Also, search  for /usr/include/openssl if no krb4 includes are found.

File:

• configure.ac (modified) (3 diffs)

configure.ac

@@ -39 +39 @@
         CPPFLAGS=${CPPFLAGS}\ -I/usr/local/include/kerberosIV
         AC_MSG_RESULT(yes)
+elif test -d /usr/include/openssl; then
+        CFLAGS=${CFLAGS}\ -I/usr/include/openssl
+        CPPFLAGS=${CPPFLAGS}\ -I/usr/include/openssl
+        AC_MSG_RESULT(OpenSSL DES found instead)
 else
         AC_MSG_RESULT(no)
@@ -58 +62 @@
 AC_CHECK_LIB(socket, socket)
 dnl AC_CHECK_LIB(des425, req_act_vno)
-AC_CHECK_LIB(des425, des_cbc_encrypt)
+AC_CHECK_LIB(des425, des_cbc_encrypt,,AC_CHECK_LIB(crypto,DES_cbc_encrypt))
 AC_CHECK_LIB(resolv, res_search)
 dnl AC_CHECK_LIB(zephyr, ZGetSender,, AC_MSG_ERROR(No zephyr library found.))
@@ -70 +74 @@
 
 AC_CHECK_FUNCS(use_default_colors resizeterm des_string_to_key des_key_sched des_ecb_encrypt)
+AC_CHECK_FUNCS(                            DES_string_to_key  DES_ecb_encrypt DES_key_sched)
 
 AC_MSG_CHECKING(for des_ecb_encrypt prototype)