- (tim) [kex.c myproposal.h md-sha256.c openbsd-compat/sha2.c,h] Disable

[openssh.git] / cipher-aes.c

diff --git a/cipher-aes.c b/cipher-aes.c
index bbfbe72108784046cde8452a699b46b04d2de9f6..228ddb1044174990ce80e9b2f97aee4ef1134ee0 100644 (file)
--- a/cipher-aes.c
+++ b/cipher-aes.c
@@ -22,9 +22,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if OPENSSL_VERSION_NUMBER < 0x00907000L
 #include "includes.h"
-RCSID("$OpenBSD: cipher-aes.c,v 1.1 2003/05/15 03:08:29 markus Exp $");
+
+/* compatibility with old or broken OpenSSL versions */
+#include "openbsd-compat/openssl-compat.h"
+
+#ifdef USE_BUILTIN_RIJNDAEL
+RCSID("$OpenBSD: cipher-aes.c,v 1.2 2003/11/26 21:44:29 djm Exp $");
 
 #include <openssl/evp.h>
 #include "rijndael.h"
@@ -153,4 +157,4 @@ evp_rijndael(void)
 #endif
        return (&rijndal_cbc);
 }
-#endif
+#endif /* USE_BUILTIN_RIJNDAEL */