diff options
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | kex.c | 8 | ||||
-rw-r--r-- | md-sha256.c | 86 |
3 files changed, 1 insertions, 95 deletions
diff --git a/Makefile.in b/Makefile.in index 5870e9e6e..e247c0de7 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -80,7 +80,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \ | |||
80 | canohost.o channels.o cipher.o cipher-aes.o cipher-aesctr.o \ | 80 | canohost.o channels.o cipher.o cipher-aes.o cipher-aesctr.o \ |
81 | cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \ | 81 | cipher-bf1.o cipher-ctr.o cipher-3des1.o cleanup.o \ |
82 | compat.o crc32.o deattack.o fatal.o hostfile.o \ | 82 | compat.o crc32.o deattack.o fatal.o hostfile.o \ |
83 | log.o match.o md-sha256.o moduli.o nchan.o packet.o opacket.o \ | 83 | log.o match.o moduli.o nchan.o packet.o opacket.o \ |
84 | readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \ | 84 | readpass.o rsa.o ttymodes.o xmalloc.o addrmatch.o \ |
85 | atomicio.o key.o dispatch.o mac.o uidswap.o uuencode.o misc.o utf8.o \ | 85 | atomicio.o key.o dispatch.o mac.o uidswap.o uuencode.o misc.o utf8.o \ |
86 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ | 86 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ |
@@ -54,14 +54,6 @@ | |||
54 | #include "sshbuf.h" | 54 | #include "sshbuf.h" |
55 | #include "digest.h" | 55 | #include "digest.h" |
56 | 56 | ||
57 | #if OPENSSL_VERSION_NUMBER >= 0x00907000L | ||
58 | # if defined(HAVE_EVP_SHA256) | ||
59 | # define evp_ssh_sha256 EVP_sha256 | ||
60 | # else | ||
61 | extern const EVP_MD *evp_ssh_sha256(void); | ||
62 | # endif | ||
63 | #endif | ||
64 | |||
65 | /* prototype */ | 57 | /* prototype */ |
66 | static int kex_choose_conf(struct ssh *); | 58 | static int kex_choose_conf(struct ssh *); |
67 | static int kex_input_newkeys(int, u_int32_t, void *); | 59 | static int kex_input_newkeys(int, u_int32_t, void *); |
diff --git a/md-sha256.c b/md-sha256.c deleted file mode 100644 index 8c1b3b92d..000000000 --- a/md-sha256.c +++ /dev/null | |||
@@ -1,86 +0,0 @@ | |||
1 | /* $OpenBSD: md-sha256.c,v 1.5 2006/08/03 03:34:42 deraadt Exp $ */ | ||
2 | /* | ||
3 | * Copyright (c) 2005 Damien Miller <djm@openbsd.org> | ||
4 | * | ||
5 | * Permission to use, copy, modify, and distribute this software for any | ||
6 | * purpose with or without fee is hereby granted, provided that the above | ||
7 | * copyright notice and this permission notice appear in all copies. | ||
8 | * | ||
9 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
10 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
11 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
12 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
13 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
14 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
16 | */ | ||
17 | |||
18 | /* EVP wrapper for SHA256 */ | ||
19 | |||
20 | #include "includes.h" | ||
21 | |||
22 | #include <sys/types.h> | ||
23 | #include <openssl/opensslv.h> | ||
24 | |||
25 | #if !defined(HAVE_EVP_SHA256) && (OPENSSL_VERSION_NUMBER >= 0x00907000L) | ||
26 | |||
27 | #include <string.h> | ||
28 | #include <openssl/evp.h> | ||
29 | #ifdef HAVE_SHA256_UPDATE | ||
30 | # ifdef HAVE_SHA2_H | ||
31 | # include <sha2.h> | ||
32 | # elif defined(HAVE_CRYPTO_SHA2_H) | ||
33 | # include <crypto/sha2.h> | ||
34 | # endif | ||
35 | #endif | ||
36 | |||
37 | const EVP_MD *evp_ssh_sha256(void); | ||
38 | |||
39 | static int | ||
40 | ssh_sha256_init(EVP_MD_CTX *ctxt) | ||
41 | { | ||
42 | SHA256_Init(ctxt->md_data); | ||
43 | return (1); | ||
44 | } | ||
45 | |||
46 | static int | ||
47 | ssh_sha256_update(EVP_MD_CTX *ctxt, const void *data, unsigned long len) | ||
48 | { | ||
49 | SHA256_Update(ctxt->md_data, data, len); | ||
50 | return (1); | ||
51 | } | ||
52 | |||
53 | static int | ||
54 | ssh_sha256_final(EVP_MD_CTX *ctxt, unsigned char *digest) | ||
55 | { | ||
56 | SHA256_Final(digest, ctxt->md_data); | ||
57 | return (1); | ||
58 | } | ||
59 | |||
60 | static int | ||
61 | ssh_sha256_cleanup(EVP_MD_CTX *ctxt) | ||
62 | { | ||
63 | memset(ctxt->md_data, 0, sizeof(SHA256_CTX)); | ||
64 | return (1); | ||
65 | } | ||
66 | |||
67 | const EVP_MD * | ||
68 | evp_ssh_sha256(void) | ||
69 | { | ||
70 | static EVP_MD ssh_sha256; | ||
71 | |||
72 | memset(&ssh_sha256, 0, sizeof(ssh_sha256)); | ||
73 | ssh_sha256.type = NID_undef; | ||
74 | ssh_sha256.md_size = SHA256_DIGEST_LENGTH; | ||
75 | ssh_sha256.init = ssh_sha256_init; | ||
76 | ssh_sha256.update = ssh_sha256_update; | ||
77 | ssh_sha256.final = ssh_sha256_final; | ||
78 | ssh_sha256.cleanup = ssh_sha256_cleanup; | ||
79 | ssh_sha256.block_size = SHA256_BLOCK_LENGTH; | ||
80 | ssh_sha256.ctx_size = sizeof(SHA256_CTX); | ||
81 | |||
82 | return (&ssh_sha256); | ||
83 | } | ||
84 | |||
85 | #endif /* !defined(HAVE_EVP_SHA256) && (OPENSSL_VERSION_NUMBER >= 0x00907000L) */ | ||
86 | |||