Remove SHA256 EVP wrapper implementation.

All supported versions of OpenSSL should now have SHA256 so remove our
EVP wrapper implementaion.  ok djm@

diff --git a/Makefile.in b/Makefile.in
index 5870e9e6e6b95b885bfcb6e68b5c8ae272869387..e247c0de7313fe3de2fe7eb99fbf8f19136ade89 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -80,7 +80,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
        canohost.o channels.o cipher.o cipher-aes.o cipher-aesctr.o \
        cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \
        compat.o crc32.o deattack.o fatal.o hostfile.o \
-       log.o match.o md-sha256.o moduli.o nchan.o packet.o opacket.o \
+       log.o match.o moduli.o nchan.o packet.o opacket.o \
        readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \
        atomicio.o key.o dispatch.o mac.o uidswap.o uuencode.o misc.o utf8.o \
        monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \

diff --git a/kex.c b/kex.c
index cf4ac0dc574d138d8c42e26e8132dfad5b8a017c..98c0597a90eb7852b1bcacba6273ca93c0c46d38 100644 (file)
--- a/kex.c
+++ b/kex.c
@@ -54,14 +54,6 @@
 #include "sshbuf.h"
 #include "digest.h"
 
-#if OPENSSL_VERSION_NUMBER >= 0x00907000L
-# if defined(HAVE_EVP_SHA256)
-# define evp_ssh_sha256 EVP_sha256
-# else
-extern const EVP_MD *evp_ssh_sha256(void);
-# endif
-#endif
-
 /* prototype */
 static int kex_choose_conf(struct ssh *);
 static int kex_input_newkeys(int, u_int32_t, void *);

diff --git a/md-sha256.c b/md-sha256.c
deleted file mode 100644 (file)
index 8c1b3b9..0000000
--- a/md-sha256.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* $OpenBSD: md-sha256.c,v 1.5 2006/08/03 03:34:42 deraadt Exp $ */
-/*
- * Copyright (c) 2005 Damien Miller <djm@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* EVP wrapper for SHA256 */
-
-#include "includes.h"
-
-#include <sys/types.h>
-#include <openssl/opensslv.h>
-
-#if !defined(HAVE_EVP_SHA256) && (OPENSSL_VERSION_NUMBER >= 0x00907000L)
-
-#include <string.h>
-#include <openssl/evp.h>
-#ifdef HAVE_SHA256_UPDATE
-# ifdef HAVE_SHA2_H
-#  include <sha2.h>
-# elif defined(HAVE_CRYPTO_SHA2_H)
-#  include <crypto/sha2.h>
-# endif
-#endif
-
-const EVP_MD *evp_ssh_sha256(void);
-
-static int
-ssh_sha256_init(EVP_MD_CTX *ctxt)
-{
-       SHA256_Init(ctxt->md_data);
-       return (1);
-}
-
-static int
-ssh_sha256_update(EVP_MD_CTX *ctxt, const void *data, unsigned long len)
-{
-       SHA256_Update(ctxt->md_data, data, len);
-       return (1);
-}
-
-static int
-ssh_sha256_final(EVP_MD_CTX *ctxt, unsigned char *digest)
-{
-       SHA256_Final(digest, ctxt->md_data);
-       return (1);
-}
-
-static int
-ssh_sha256_cleanup(EVP_MD_CTX *ctxt)
-{
-       memset(ctxt->md_data, 0, sizeof(SHA256_CTX));
-       return (1);
-}
-
-const EVP_MD *
-evp_ssh_sha256(void)
-{
-       static EVP_MD ssh_sha256;
-
-       memset(&ssh_sha256, 0, sizeof(ssh_sha256));
-       ssh_sha256.type = NID_undef;
-       ssh_sha256.md_size = SHA256_DIGEST_LENGTH;
-       ssh_sha256.init = ssh_sha256_init;
-       ssh_sha256.update = ssh_sha256_update;
-       ssh_sha256.final = ssh_sha256_final;
-       ssh_sha256.cleanup = ssh_sha256_cleanup;
-       ssh_sha256.block_size = SHA256_BLOCK_LENGTH;
-       ssh_sha256.ctx_size = sizeof(SHA256_CTX);
-
-       return (&ssh_sha256);
-}
-
-#endif /* !defined(HAVE_EVP_SHA256) && (OPENSSL_VERSION_NUMBER >= 0x00907000L) */
-