Changeset 238c3a5 for zcrypt.c

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>

File:

• zcrypt.c (modified) (2 diffs)

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);
 }