summaryrefslogtreecommitdiff
path: root/server/zserver.h
diff options
context:
space:
mode:
authorGravatar Karl Ramm <kcr@mit.edu>2008-12-23 15:48:17 +0000
committerGravatar Karl Ramm <kcr@mit.edu>2008-12-23 15:48:17 +0000
commitece7e910d202b217ace407e68c87e83fbd3dff1e (patch)
tree688c445c177c3233cf46aa78c55630cfa9b5fa42 /server/zserver.h
parentca4df1a45da447c703b7dae45863d0c5cb9baaf1 (diff)
allow des key brain dumps from transition servers to krb5-only servers
Diffstat (limited to 'server/zserver.h')
-rw-r--r--server/zserver.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/server/zserver.h b/server/zserver.h
index cceb270..ca60844 100644
--- a/server/zserver.h
+++ b/server/zserver.h
@@ -61,7 +61,12 @@ extern C_Block __Zephyr_session;
/* Current time as cached by main(); use instead of time(). */
#define NOW t_local.tv_sec
-#ifdef HAVE_KRB4
+#if defined(HAVE_OPENSSL) & !defined(HAVE_KRB4)
+#define OPENSSL_DES_LIBDES_COMPATIBILITY
+#include <openssl/des.h>
+#endif
+
+#if defined(HAVE_KRB4) || defined(HAVE_OPENSSL)
/* Kerberos shouldn't stick us with array types... */
typedef struct {
des_key_schedule s;