summaryrefslogtreecommitdiff
path: root/cipher.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-10-28 13:25:17 +1000
committerDamien Miller <djm@mindrot.org>1999-10-28 13:25:17 +1000
commit7f6ea0264d01aa40b20df8dc75141631479da054 (patch)
treea30aa324db2b41c64e1216ce73b7b7468e5ff706 /cipher.h
parent3d112efc672b877c74893229d3fd30f99489b9ff (diff)
downloadopenssh-git-7f6ea0264d01aa40b20df8dc75141631479da054.tar.gz
- Integrated patch from Dan Brosemer <odin@linuxfreak.com>
- Build fixes - Autoconf - Change binary names to open* - Fixed autoconf script to detect PAM on RH6.1 - Added tests for libpwdb, and OpenBSD functions to autoconf (not used yet)
Diffstat (limited to 'cipher.h')
-rw-r--r--cipher.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/cipher.h b/cipher.h
index 4ecb8f8d..9c2a0b52 100644
--- a/cipher.h
+++ b/cipher.h
@@ -11,13 +11,21 @@ Created: Wed Apr 19 16:50:42 1995 ylo
*/
-/* RCSID("$Id: cipher.h,v 1.1 1999/10/27 03:42:44 damien Exp $"); */
+/* RCSID("$Id: cipher.h,v 1.2 1999/10/28 03:25:17 damien Exp $"); */
+
+#include "config.h"
#ifndef CIPHER_H
#define CIPHER_H
+#ifdef HAVE_OPENSSL
#include <openssl/des.h>
#include <openssl/blowfish.h>
+#endif
+#ifdef HAVE_SSL
+#include <ssl/des.h>
+#include <ssl/blowfish.h>
+#endif
/* Cipher types. New types can be added, but old types should not be removed
for compatibility. The maximum allowed value is 31. */