2a01feabb3
Compatibility with existing OpenSSL versions is maintained. Upstream commits: 482d23bcac upstream: hold our collective noses and use the openssl-1.1.x 48f54b9d12 adapt -portable to OpenSSL 1.1x API 86e0a9f3d2 upstream: use only openssl-1.1.x API here too a3fd8074e2 upstream: missed a bit of openssl-1.0.x API in this unittest cce8cbe0ed Fix openssl-1.1 fallout for --without-openssl. Trivial conflicts in sshkey.c and test_sshkey.c were resolved. Connect libressl-api-compat.c to the build, and regenerate config.h Reviewed by: des Approved by: re (rgrimes) MFC after: 2 seeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17444
97 lines
3.3 KiB
C
97 lines
3.3 KiB
C
/* $OpenBSD: kexdh.c,v 1.26 2016/05/02 10:26:04 djm Exp $ */
|
|
/*
|
|
* Copyright (c) 2001 Markus Friedl. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "includes.h"
|
|
|
|
#ifdef WITH_OPENSSL
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <signal.h>
|
|
|
|
#include <openssl/evp.h>
|
|
|
|
#include "openbsd-compat/openssl-compat.h"
|
|
|
|
#include "ssh2.h"
|
|
#include "sshkey.h"
|
|
#include "cipher.h"
|
|
#include "kex.h"
|
|
#include "ssherr.h"
|
|
#include "sshbuf.h"
|
|
#include "digest.h"
|
|
|
|
int
|
|
kex_dh_hash(
|
|
int hash_alg,
|
|
const char *client_version_string,
|
|
const char *server_version_string,
|
|
const u_char *ckexinit, size_t ckexinitlen,
|
|
const u_char *skexinit, size_t skexinitlen,
|
|
const u_char *serverhostkeyblob, size_t sbloblen,
|
|
const BIGNUM *client_dh_pub,
|
|
const BIGNUM *server_dh_pub,
|
|
const BIGNUM *shared_secret,
|
|
u_char *hash, size_t *hashlen)
|
|
{
|
|
struct sshbuf *b;
|
|
int r;
|
|
|
|
if (*hashlen < ssh_digest_bytes(hash_alg))
|
|
return SSH_ERR_INVALID_ARGUMENT;
|
|
if ((b = sshbuf_new()) == NULL)
|
|
return SSH_ERR_ALLOC_FAIL;
|
|
if ((r = sshbuf_put_cstring(b, client_version_string)) != 0 ||
|
|
(r = sshbuf_put_cstring(b, server_version_string)) != 0 ||
|
|
/* kexinit messages: fake header: len+SSH2_MSG_KEXINIT */
|
|
(r = sshbuf_put_u32(b, ckexinitlen+1)) != 0 ||
|
|
(r = sshbuf_put_u8(b, SSH2_MSG_KEXINIT)) != 0 ||
|
|
(r = sshbuf_put(b, ckexinit, ckexinitlen)) != 0 ||
|
|
(r = sshbuf_put_u32(b, skexinitlen+1)) != 0 ||
|
|
(r = sshbuf_put_u8(b, SSH2_MSG_KEXINIT)) != 0 ||
|
|
(r = sshbuf_put(b, skexinit, skexinitlen)) != 0 ||
|
|
(r = sshbuf_put_string(b, serverhostkeyblob, sbloblen)) != 0 ||
|
|
(r = sshbuf_put_bignum2(b, client_dh_pub)) != 0 ||
|
|
(r = sshbuf_put_bignum2(b, server_dh_pub)) != 0 ||
|
|
(r = sshbuf_put_bignum2(b, shared_secret)) != 0) {
|
|
sshbuf_free(b);
|
|
return r;
|
|
}
|
|
#ifdef DEBUG_KEX
|
|
sshbuf_dump(b, stderr);
|
|
#endif
|
|
if (ssh_digest_buffer(hash_alg, b, hash, *hashlen) != 0) {
|
|
sshbuf_free(b);
|
|
return SSH_ERR_LIBCRYPTO_ERROR;
|
|
}
|
|
sshbuf_free(b);
|
|
*hashlen = ssh_digest_bytes(hash_alg);
|
|
#ifdef DEBUG_KEX
|
|
dump_digest("hash", hash, *hashlen);
|
|
#endif
|
|
return 0;
|
|
}
|
|
#endif /* WITH_OPENSSL */
|