summaryrefslogtreecommitdiffstats
path: root/openbsd-compat/openbsd-compat.h
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-06-17 13:15:20 +0200
committerDarren Tucker <dtucker@zip.com.au>2005-06-17 13:15:20 +0200
commitf0bd352429f26f99b7bdacd23baf46b39a9f600a (patch)
treec63da8cd98b4c07fe502aa0fe49b2178d76c7367 /openbsd-compat/openbsd-compat.h
parent - djm@cvs.openbsd.org 2005/06/17 02:44:33 (diff)
downloadopenssh-f0bd352429f26f99b7bdacd23baf46b39a9f600a.tar.xz
openssh-f0bd352429f26f99b7bdacd23baf46b39a9f600a.zip
- (dtucker) [cipher.c openbsd-compat/openbsd-compat.h
openbsd-compat/openssl-compat.c] only include openssl compat stuff where it's needed as it can cause conflicts elsewhere (eg xcrypt.c). Found by and ok tim@ ---------------------------------------------------------------------- automatically CVS: CVS: Committing in . CVS: CVS: Modified Files: ----------------------------------------------------------------------
Diffstat (limited to 'openbsd-compat/openbsd-compat.h')
-rw-r--r--openbsd-compat/openbsd-compat.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index f468d5aab..e66f5ec55 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -1,4 +1,4 @@
-/* $Id: openbsd-compat.h,v 1.28 2005/06/09 11:45:11 dtucker Exp $ */
+/* $Id: openbsd-compat.h,v 1.29 2005/06/17 11:15:21 dtucker Exp $ */
/*
* Copyright (c) 1999-2003 Damien Miller. All rights reserved.
@@ -168,9 +168,6 @@ char *shadow_pw(struct passwd *pw);
/* rfc2553 socket API replacements */
#include "fake-rfc2553.h"
-/* compatibility with old or broken OpenSSL versions */
-#include "openssl-compat.h"
-
/* Routines for a single OS platform */
#include "bsd-cray.h"
#include "bsd-cygwin_util.h"