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

   sha256 when openssl < 0.9.7. Patch from djm@. Corrections/testing by me.

1 files changed, 13 insertions, 1 deletions

diff --git a/myproposal.h b/myproposal.h
index cc94a8ed2..43c540209 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -23,11 +23,23 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#define KEX_DEFAULT_KEX         \
+
+#include <openssl/opensslv.h>
+
+/* Old OpenSSL doesn't support what we need for DHGEX-sha256 */
+#if OPENSSL_VERSION_NUMBER < 0x00907000L
+# define KEX_DEFAULT_KEX                \
+        "diffie-hellman-group-exchange-sha1," \
+        "diffie-hellman-group14-sha1," \
+        "diffie-hellman-group1-sha1"
+#else
+# define KEX_DEFAULT_KEX                \
         "diffie-hellman-group-exchange-sha256," \
         "diffie-hellman-group-exchange-sha1," \
         "diffie-hellman-group14-sha1," \
         "diffie-hellman-group1-sha1"
+#endif
+
 #define KEX_DEFAULT_PK_ALG      "ssh-rsa,ssh-dss"
 #define KEX_DEFAULT_ENCRYPT \
         "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \