Changeset 238c3a5

Timestamp:

Feb 3, 2019, 8:58:44 PM (5 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master

Children:

9a0d25d

Parents:

396dc2c

git-author:

Anders Kaseorg <andersk@mit.edu> (01/31/19 02:02:40)

git-committer:

Anders Kaseorg <andersk@mit.edu> (02/03/19 20:58:44)

Message:

Rip out Kerberos IV support

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

Files:

• configure.ac (modified) (1 diff)
• zcrypt.c (modified) (2 diffs)

configure.ac

@@ -54 +54 @@
   [with_zephyr=check])
 
-AC_ARG_WITH([krb4],
-  AS_HELP_STRING([--with-krb4],
-                 [Build with kerberos IV]))
-
 AS_IF([test "x$with_zephyr" != xno],
-  [have_krb4=no
-
-   AS_IF([test "x$with_krb4" != "xno"],
-   [AC_MSG_CHECKING([for Kerberos IV])
-    AS_IF([krb5-config krb4 --libs >/dev/null 2>&1],
-      [AC_MSG_RESULT([yes])
-       have_krb4=yes
-       AC_DEFINE([HAVE_KERBEROS_IV], [1], [Define if you have kerberos IV])
-       AM_CFLAGS="${AM_CFLAGS} `krb5-config krb4 --cflags`"
-       LIBS="${LIBS} `krb5-config krb4 --libs`"
-      ],
-      [AC_MSG_RESULT([no])
-       AS_IF([test "x$with_krb4" = "xyes"],
-             [AC_MSG_ERROR([Kerberos IV requested but not found])])])])
-
-   AS_IF([test "x$have_krb4" != xyes],
-     [PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto],
-        [AM_CFLAGS="${AM_CFLAGS} ${LIBCRYPTO_CFLAGS}"
-         LIBS="${LIBS} ${LIBCRYPTO_LIBS}"
-        ],
-        [PKG_CHECK_MODULES([OPENSSL], [openssl],
-           [AM_CFLAGS="${AM_CFLAGS} ${OPENSSL_CFLAGS}"
-            LIBS="${LIBS} ${OPENSSL_LIBS}"
-           ])])])
+  [PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto],
+     [AM_CFLAGS="${AM_CFLAGS} ${LIBCRYPTO_CFLAGS}"
+      LIBS="${LIBS} ${LIBCRYPTO_LIBS}"
+     ],
+     [PKG_CHECK_MODULES([OPENSSL], [openssl],
+        [AM_CFLAGS="${AM_CFLAGS} ${OPENSSL_CFLAGS}"
+         LIBS="${LIBS} ${OPENSSL_LIBS}"
+        ])])
 
    AC_CHECK_LIB([zephyr], [ZGetSender],

zcrypt.c

@@ -21 +21 @@
 #include <config.h>
 
-#ifdef HAVE_KERBEROS_IV
-#include <kerberosIV/des.h>
-#else
 #include <openssl/des.h>
-#endif
 
 #include "filterproc.h"
@@ -100 +96 @@
 
 static void owl_zcrypt_string_to_schedule(char *keystring, des_key_schedule *schedule) {
-#ifdef HAVE_KERBEROS_IV
   des_cblock key;
-#else
-  des_cblock _key, *key = &_key;
-#endif
-
-  des_string_to_key(keystring, key);
-  des_key_sched(key, *schedule);
+
+  des_string_to_key(keystring, &key);
+  des_key_sched(&key, *schedule);
 }