From 5f05637b0ef7058d3ab2ff385251f73dcc9cb5f7 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sun, 16 Apr 2000 12:31:48 +1000
Subject:  - Reduce diff against OpenBSD source    - All OpenSSL includes are
 now unconditionally referenced as      openssl/foo.h    - Pick up formatting
 changes    - Other minor changed (typecasts, etc) that I missed

---
 cipher.h | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'cipher.h')

diff --git a/cipher.h b/cipher.h
index 383e3444..0f94fb20 100644
--- a/cipher.h
+++ b/cipher.h
@@ -11,25 +11,15 @@
  *
  */
 
-/* RCSID("$Id: cipher.h,v 1.11 2000/04/16 01:18:41 damien Exp $"); */
+/* RCSID("$Id: cipher.h,v 1.12 2000/04/16 02:31:50 damien Exp $"); */
 
 #ifndef CIPHER_H
 #define CIPHER_H
 
-#include "config.h"
-
-#ifdef HAVE_OPENSSL
 #include <openssl/des.h>
 #include <openssl/blowfish.h>
 #include <openssl/rc4.h>
 #include <openssl/cast.h>
-#endif
-#ifdef HAVE_SSL
-#include <ssl/des.h>
-#include <ssl/blowfish.h>
-#include <ssl/rc4.h>
-#include <ssl/cast.h>
-#endif
 
 /* Cipher types.  New types can be added, but old types should not be removed
    for compatibility.  The maximum allowed value is 31. */
-- 
cgit v1.2.3