- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / md-sha256.c

diff --git a/md-sha256.c b/md-sha256.c
index ff7f3815711fdc3d815b8af4d1344e14cc1ca996..8c1b3b92da9b33b3d32bed4ff5d2739e7b4efe9b 100644 (file)
--- a/md-sha256.c
+++ b/md-sha256.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: md-sha256.c,v 1.5 2006/08/03 03:34:42 deraadt Exp $ */
 /*
  * Copyright (c) 2005 Damien Miller <djm@openbsd.org>
  *
@@ -18,16 +19,21 @@
 
 #include "includes.h"
 
-#ifndef HAVE_EVP_SHA256
+#include <sys/types.h>
+#include <openssl/opensslv.h>
+
+#if !defined(HAVE_EVP_SHA256) && (OPENSSL_VERSION_NUMBER >= 0x00907000L)
 
 #include <string.h>
 #include <openssl/evp.h>
-#if defined(HAVE_SHA2_H) && defined(HAVE_SHA256_UPDATE)
-# include <sha2.h>
+#ifdef HAVE_SHA256_UPDATE
+# ifdef HAVE_SHA2_H
+#  include <sha2.h>
+# elif defined(HAVE_CRYPTO_SHA2_H)
+#  include <crypto/sha2.h>
+# endif
 #endif
 
-RCSID("$OpenBSD: md-sha256.c,v 1.1 2006/03/07 09:07:40 djm Exp $");
-
 const EVP_MD *evp_ssh_sha256(void);
 
 static int
@@ -76,5 +82,5 @@ evp_ssh_sha256(void)
        return (&ssh_sha256);
 }
 
-#endif /* HAVE_EVP_SHA256 */
+#endif /* !defined(HAVE_EVP_SHA256) && (OPENSSL_VERSION_NUMBER >= 0x00907000L) */