Changeset c269e22


Ignore:
Timestamp:
Apr 20, 2003, 4:58:47 PM (18 years ago)
Author:
James M. Kretchmar <kretch@mit.edu>
Branches:
master, barnowl_perlaim, debian, owl, 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:
7 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    rf87c490 rc269e22  
    6868          keypress.c
    6969        do_encrypt declaired static
     70        if we don't have des functions, do not try to build in zcrypt
    7071       
    71721.2.8
  • config.h.in

    re51b410 rc269e22  
    4848#undef HAVE_USE_DEFAULT_COLORS
    4949
     50#undef HAVE_DES_STRING_TO_KEY
     51
     52#undef HAVE_DES_KEY_SCHED
     53
     54#undef HAVE_DES_ECB_ENCRYPT
     55
    5056#undef TERMINFO
  • configure

    re51b410 rc269e22  
    13801380
    13811381
    1382 for ac_func in use_default_colors
     1382for ac_func in use_default_colors des_string_to_key des_key_sched des_ecb_encrypt
    13831383do
    13841384echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
     
    14361436
    14371437
    1438 
    14391438echo $ac_n "checking for des_ecb_encrypt prototype""... $ac_c" 1>&6
    1440 echo "configure:1441: checking for des_ecb_encrypt prototype" >&5
     1439echo "configure:1440: checking for des_ecb_encrypt prototype" >&5
    14411440cat > conftest.$ac_ext <<EOF
    1442 #line 1443 "configure"
     1441#line 1442 "configure"
    14431442#include "confdefs.h"
    14441443#include <des.h>
     
    14481447; return 0; }
    14491448EOF
    1450 if { (eval echo configure:1451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     1449if { (eval echo configure:1450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    14511450  rm -rf conftest*
    14521451  ac_cv_des_ecb_encrypt_proto=no
     
    14651464
    14661465fi
     1466
    14671467
    14681468echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
     
    18041804
    18051805fi
    1806 
    18071806
    18081807
     
    18401839# ./install, which can be erroneously created by make from ./install.sh.
    18411840echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
    1842 echo "configure:1843: checking for a BSD compatible install" >&5
     1841echo "configure:1842: checking for a BSD compatible install" >&5
    18431842if test -z "$INSTALL"; then
    18441843if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
  • configure.in

    re51b410 rc269e22  
    4343AC_CHECK_LIB(zephyr, ZInitLocationInfo, AC_DEFINE([HAVE_LIBZEPHYR_ZINITLOCATIONINFO], [], [Have ZInitLocationInfo]),)
    4444
    45 AC_CHECK_FUNCS(use_default_colors)
    46 
     45AC_CHECK_FUNCS(use_default_colors des_string_to_key des_key_sched des_ecb_encrypt)
    4746
    4847AC_MSG_CHECKING(for des_ecb_encrypt prototype)
     
    5655        AC_DEFINE([HAVE_DES_ECB_ENCRYPT_PROTO], [], [have proto for des_ecb_encrypt])
    5756fi
     57
    5858
    5959dnl Checks for header files.
  • message.c

    recd5dc5 rc269e22  
    428428void owl_message_create_from_znotice(owl_message *m, ZNotice_t *n) {
    429429  struct hostent *hent;
    430   int k, ret;
     430  int k;
    431431  char *ptr, *tmp, *tmp2;
    432432
     
    478478  owl_free(tmp);
    479479
     480#ifdef OWL_HAVE_DES 
    480481  /* if zcrypt is enabled try to decrypt the message */
    481482  if (owl_global_is_zcrypt(&g) && !strcasecmp(n->z_opcode, "crypt")) {
    482483    char *out;
     484    int ret;
    483485
    484486    out=owl_malloc(strlen(owl_message_get_body(m))*16+20);
     
    490492    }
    491493  }
     494#endif 
    492495
    493496  /* save the hostname */
  • owl.h

    rf87c490 rc269e22  
    111111
    112112#define OWL_CMD_ALIAS_SUMMARY_PREFIX "command alias to: "
     113
     114#if defined(HAVE_DES_STRING_TO_KEY) && defined(HAVE_DES_KEY_SCHED) && defined(HAVE_DES_ECB_ENCRYPT)
     115#define OWL_HAVE_DES 1
     116#endif
    113117
    114118#define OWL_META(key) ((key)|0200)
  • zcrypt.c

    rf87c490 rc269e22  
    1717#include <sys/wait.h>
    1818#include "owl.h"
     19
     20#ifdef OWL_HAVE_DES
    1921
    2022#define BASE_CODE 70
     
    691693  return(0);
    692694}
     695
     696#endif
Note: See TracChangeset for help on using the changeset viewer.