Changeset c269e22

Timestamp:

Apr 20, 2003, 4:58:47 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

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

Children:

c86a35c

Parents:

e51b410

Message:

if we don't have des functions, do not try to build in zcrypt

Files:

• ChangeLog (modified) (1 diff)
• config.h.in (modified) (1 diff)
• configure (modified) (6 diffs)
• configure.in (modified) (2 diffs)
• message.c (modified) (3 diffs)
• owl.h (modified) (1 diff)
• zcrypt.c (modified) (2 diffs)

ChangeLog

@@ -68 +68 @@
           keypress.c
         do_encrypt declaired static
+        if we don't have des functions, do not try to build in zcrypt
         
 1.2.8

config.h.in

@@ -48 +48 @@
 #undef HAVE_USE_DEFAULT_COLORS
 
+#undef HAVE_DES_STRING_TO_KEY
+
+#undef HAVE_DES_KEY_SCHED
+
+#undef HAVE_DES_ECB_ENCRYPT
+
 #undef TERMINFO

configure

@@ -1380 +1380 @@
 
 
-for ac_func in use_default_colors
+for ac_func in use_default_colors des_string_to_key des_key_sched des_ecb_encrypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -1436 +1436 @@
 
 
-
 echo $ac_n "checking for des_ecb_encrypt prototype""... $ac_c" 1>&6
-echo "configure:1441: checking for des_ecb_encrypt prototype" >&5
+echo "configure:1440: checking for des_ecb_encrypt prototype" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1443 "configure"
+#line 1442 "configure"
 #include "confdefs.h"
 #include <des.h>
@@ -1448 +1447 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_des_ecb_encrypt_proto=no
@@ -1465 +1464 @@
 
 fi
+
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
@@ -1804 +1804 @@
 
 fi
-
 
 
@@ -1840 +1839 @@
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1843: checking for a BSD compatible install" >&5
+echo "configure:1842: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then

configure.in

@@ -43 +43 @@
 AC_CHECK_LIB(zephyr, ZInitLocationInfo, AC_DEFINE([HAVE_LIBZEPHYR_ZINITLOCATIONINFO], [], [Have ZInitLocationInfo]),)
 
-AC_CHECK_FUNCS(use_default_colors)
-
+AC_CHECK_FUNCS(use_default_colors des_string_to_key des_key_sched des_ecb_encrypt)
 
 AC_MSG_CHECKING(for des_ecb_encrypt prototype)
@@ -56 +55 @@
         AC_DEFINE([HAVE_DES_ECB_ENCRYPT_PROTO], [], [have proto for des_ecb_encrypt])
 fi
+
 
 dnl Checks for header files.

message.c

@@ -428 +428 @@
 void owl_message_create_from_znotice(owl_message *m, ZNotice_t *n) {
   struct hostent *hent;
-  int k, ret;
+  int k;
   char *ptr, *tmp, *tmp2;
 
@@ -478 +478 @@
   owl_free(tmp);
 
+#ifdef OWL_HAVE_DES  
   /* if zcrypt is enabled try to decrypt the message */
   if (owl_global_is_zcrypt(&g) && !strcasecmp(n->z_opcode, "crypt")) {
     char *out;
+    int ret;
 
     out=owl_malloc(strlen(owl_message_get_body(m))*16+20);
@@ -490 +492 @@
     }
   }
+#endif  
 
   /* save the hostname */

owl.h

@@ -111 +111 @@
 
 #define OWL_CMD_ALIAS_SUMMARY_PREFIX "command alias to: "
+
+#if defined(HAVE_DES_STRING_TO_KEY) && defined(HAVE_DES_KEY_SCHED) && defined(HAVE_DES_ECB_ENCRYPT)
+#define OWL_HAVE_DES 1
+#endif
 
 #define OWL_META(key) ((key)|0200)

zcrypt.c

@@ -17 +17 @@
 #include <sys/wait.h>
 #include "owl.h"
+
+#ifdef OWL_HAVE_DES
 
 #define BASE_CODE 70
@@ -691 +693 @@
   return(0);
 }
+
+#endif