|
Packit |
6c0a39 |
/*
|
|
Packit |
6c0a39 |
* curve25519.c - Curve25519 ECDH functions for key exchange
|
|
Packit |
6c0a39 |
* curve25519-sha256@libssh.org and curve25519-sha256
|
|
Packit |
6c0a39 |
*
|
|
Packit |
6c0a39 |
* This file is part of the SSH Library
|
|
Packit |
6c0a39 |
*
|
|
Packit |
6c0a39 |
* Copyright (c) 2013 by Aris Adamantiadis <aris@badcode.be>
|
|
Packit |
6c0a39 |
*
|
|
Packit |
6c0a39 |
* The SSH Library is free software; you can redistribute it and/or modify
|
|
Packit |
6c0a39 |
* it under the terms of the GNU Lesser General Public License as published by
|
|
Packit |
6c0a39 |
* the Free Software Foundation, version 2.1 of the License.
|
|
Packit |
6c0a39 |
*
|
|
Packit |
6c0a39 |
* The SSH Library is distributed in the hope that it will be useful, but
|
|
Packit |
6c0a39 |
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
Packit |
6c0a39 |
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
|
|
Packit |
6c0a39 |
* License for more details.
|
|
Packit |
6c0a39 |
*
|
|
Packit |
6c0a39 |
* You should have received a copy of the GNU Lesser General Public License
|
|
Packit |
6c0a39 |
* along with the SSH Library; see the file COPYING. If not, write to
|
|
Packit |
6c0a39 |
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
Packit |
6c0a39 |
* MA 02111-1307, USA.
|
|
Packit |
6c0a39 |
*/
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
#include "config.h"
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
#include "libssh/curve25519.h"
|
|
Packit |
6c0a39 |
#ifdef HAVE_CURVE25519
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
#ifdef WITH_NACL
|
|
Packit |
6c0a39 |
#include "nacl/crypto_scalarmult_curve25519.h"
|
|
Packit |
6c0a39 |
#endif
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
#include "libssh/ssh2.h"
|
|
Packit |
6c0a39 |
#include "libssh/buffer.h"
|
|
Packit |
6c0a39 |
#include "libssh/priv.h"
|
|
Packit |
6c0a39 |
#include "libssh/session.h"
|
|
Packit |
6c0a39 |
#include "libssh/crypto.h"
|
|
Packit |
6c0a39 |
#include "libssh/dh.h"
|
|
Packit |
6c0a39 |
#include "libssh/pki.h"
|
|
Packit |
6c0a39 |
#include "libssh/bignum.h"
|
|
Packit |
6c0a39 |
|
|
Packit Service |
fcc0d2 |
#ifdef HAVE_OPENSSL_X25519
|
|
Packit Service |
fcc0d2 |
#include <openssl/err.h>
|
|
Packit Service |
fcc0d2 |
#endif
|
|
Packit Service |
fcc0d2 |
|
|
Packit |
6c0a39 |
static SSH_PACKET_CALLBACK(ssh_packet_client_curve25519_reply);
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
static ssh_packet_callback dh_client_callbacks[] = {
|
|
Packit |
6c0a39 |
ssh_packet_client_curve25519_reply
|
|
Packit |
6c0a39 |
};
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
static struct ssh_packet_callbacks_struct ssh_curve25519_client_callbacks = {
|
|
Packit |
6c0a39 |
.start = SSH2_MSG_KEX_ECDH_REPLY,
|
|
Packit |
6c0a39 |
.n_callbacks = 1,
|
|
Packit |
6c0a39 |
.callbacks = dh_client_callbacks,
|
|
Packit |
6c0a39 |
.user = NULL
|
|
Packit |
6c0a39 |
};
|
|
Packit |
6c0a39 |
|
|
Packit Service |
fcc0d2 |
static int ssh_curve25519_init(ssh_session session)
|
|
Packit Service |
fcc0d2 |
{
|
|
Packit Service |
fcc0d2 |
int rc;
|
|
Packit Service |
fcc0d2 |
#ifdef HAVE_OPENSSL_X25519
|
|
Packit Service |
fcc0d2 |
EVP_PKEY_CTX *pctx = NULL;
|
|
Packit Service |
fcc0d2 |
EVP_PKEY *pkey = NULL;
|
|
Packit Service |
fcc0d2 |
size_t pubkey_len = CURVE25519_PUBKEY_SIZE;
|
|
Packit Service |
fcc0d2 |
size_t pkey_len = CURVE25519_PRIVKEY_SIZE;
|
|
Packit Service |
fcc0d2 |
|
|
Packit Service |
fcc0d2 |
pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_X25519, NULL);
|
|
Packit Service |
fcc0d2 |
if (pctx == NULL) {
|
|
Packit Service |
fcc0d2 |
SSH_LOG(SSH_LOG_TRACE,
|
|
Packit Service |
fcc0d2 |
"Failed to initialize X25519 context: %s",
|
|
Packit Service |
fcc0d2 |
ERR_error_string(ERR_get_error(), NULL));
|
|
Packit Service |
fcc0d2 |
return SSH_ERROR;
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit Service |
fcc0d2 |
|
|
Packit Service |
fcc0d2 |
rc = EVP_PKEY_keygen_init(pctx);
|
|
Packit Service |
fcc0d2 |
if (rc != 1) {
|
|
Packit Service |
fcc0d2 |
SSH_LOG(SSH_LOG_TRACE,
|
|
Packit Service |
fcc0d2 |
"Failed to initialize X25519 keygen: %s",
|
|
Packit Service |
fcc0d2 |
ERR_error_string(ERR_get_error(), NULL));
|
|
Packit Service |
fcc0d2 |
EVP_PKEY_CTX_free(pctx);
|
|
Packit Service |
fcc0d2 |
return SSH_ERROR;
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit Service |
fcc0d2 |
|
|
Packit Service |
fcc0d2 |
rc = EVP_PKEY_keygen(pctx, &pkey);
|
|
Packit Service |
fcc0d2 |
EVP_PKEY_CTX_free(pctx);
|
|
Packit Service |
fcc0d2 |
if (rc != 1) {
|
|
Packit Service |
fcc0d2 |
SSH_LOG(SSH_LOG_TRACE,
|
|
Packit Service |
fcc0d2 |
"Failed to generate X25519 keys: %s",
|
|
Packit Service |
fcc0d2 |
ERR_error_string(ERR_get_error(), NULL));
|
|
Packit Service |
fcc0d2 |
return SSH_ERROR;
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit Service |
fcc0d2 |
|
|
Packit Service |
fcc0d2 |
if (session->server) {
|
|
Packit Service |
fcc0d2 |
rc = EVP_PKEY_get_raw_public_key(pkey,
|
|
Packit Service |
fcc0d2 |
session->next_crypto->curve25519_server_pubkey,
|
|
Packit Service |
fcc0d2 |
&pubkey_len);
|
|
Packit Service |
fcc0d2 |
} else {
|
|
Packit Service |
fcc0d2 |
rc = EVP_PKEY_get_raw_public_key(pkey,
|
|
Packit Service |
fcc0d2 |
session->next_crypto->curve25519_client_pubkey,
|
|
Packit Service |
fcc0d2 |
&pubkey_len);
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit Service |
fcc0d2 |
|
|
Packit Service |
fcc0d2 |
if (rc != 1) {
|
|
Packit Service |
fcc0d2 |
SSH_LOG(SSH_LOG_TRACE,
|
|
Packit Service |
fcc0d2 |
"Failed to get X25519 raw public key: %s",
|
|
Packit Service |
fcc0d2 |
ERR_error_string(ERR_get_error(), NULL));
|
|
Packit Service |
fcc0d2 |
EVP_PKEY_free(pkey);
|
|
Packit Service |
fcc0d2 |
return SSH_ERROR;
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit Service |
fcc0d2 |
|
|
Packit Service |
fcc0d2 |
rc = EVP_PKEY_get_raw_private_key(pkey,
|
|
Packit Service |
fcc0d2 |
session->next_crypto->curve25519_privkey,
|
|
Packit Service |
fcc0d2 |
&pkey_len);
|
|
Packit Service |
fcc0d2 |
if (rc != 1) {
|
|
Packit Service |
fcc0d2 |
SSH_LOG(SSH_LOG_TRACE,
|
|
Packit Service |
fcc0d2 |
"Failed to get X25519 raw private key: %s",
|
|
Packit Service |
fcc0d2 |
ERR_error_string(ERR_get_error(), NULL));
|
|
Packit Service |
fcc0d2 |
EVP_PKEY_free(pkey);
|
|
Packit Service |
fcc0d2 |
return SSH_ERROR;
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit Service |
fcc0d2 |
|
|
Packit Service |
fcc0d2 |
EVP_PKEY_free(pkey);
|
|
Packit Service |
fcc0d2 |
#else
|
|
Packit Service |
fcc0d2 |
rc = ssh_get_random(session->next_crypto->curve25519_privkey,
|
|
Packit Service |
fcc0d2 |
CURVE25519_PRIVKEY_SIZE, 1);
|
|
Packit Service |
fcc0d2 |
if (rc != 1) {
|
|
Packit Service |
fcc0d2 |
ssh_set_error(session, SSH_FATAL, "PRNG error");
|
|
Packit Service |
fcc0d2 |
return SSH_ERROR;
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit Service |
fcc0d2 |
|
|
Packit Service |
fcc0d2 |
if (session->server) {
|
|
Packit Service |
fcc0d2 |
crypto_scalarmult_base(session->next_crypto->curve25519_server_pubkey,
|
|
Packit Service |
fcc0d2 |
session->next_crypto->curve25519_privkey);
|
|
Packit Service |
fcc0d2 |
} else {
|
|
Packit Service |
fcc0d2 |
crypto_scalarmult_base(session->next_crypto->curve25519_client_pubkey,
|
|
Packit Service |
fcc0d2 |
session->next_crypto->curve25519_privkey);
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit Service |
fcc0d2 |
#endif /* HAVE_OPENSSL_X25519 */
|
|
Packit Service |
fcc0d2 |
|
|
Packit Service |
fcc0d2 |
return SSH_OK;
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit Service |
fcc0d2 |
|
|
Packit |
6c0a39 |
/** @internal
|
|
Packit |
6c0a39 |
* @brief Starts curve25519-sha256@libssh.org / curve25519-sha256 key exchange
|
|
Packit |
6c0a39 |
*/
|
|
Packit Service |
fcc0d2 |
int ssh_client_curve25519_init(ssh_session session)
|
|
Packit Service |
fcc0d2 |
{
|
|
Packit Service |
fcc0d2 |
int rc;
|
|
Packit |
6c0a39 |
|
|
Packit Service |
fcc0d2 |
rc = ssh_curve25519_init(session);
|
|
Packit Service |
fcc0d2 |
if (rc != SSH_OK) {
|
|
Packit Service |
fcc0d2 |
return rc;
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit |
6c0a39 |
|
|
Packit Service |
fcc0d2 |
rc = ssh_buffer_pack(session->out_buffer,
|
|
Packit Service |
fcc0d2 |
"bdP",
|
|
Packit Service |
fcc0d2 |
SSH2_MSG_KEX_ECDH_INIT,
|
|
Packit Service |
fcc0d2 |
CURVE25519_PUBKEY_SIZE,
|
|
Packit Service |
fcc0d2 |
(size_t)CURVE25519_PUBKEY_SIZE,
|
|
Packit Service |
fcc0d2 |
session->next_crypto->curve25519_client_pubkey);
|
|
Packit Service |
fcc0d2 |
if (rc != SSH_OK) {
|
|
Packit Service |
fcc0d2 |
ssh_set_error_oom(session);
|
|
Packit Service |
fcc0d2 |
return SSH_ERROR;
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit |
6c0a39 |
|
|
Packit Service |
fcc0d2 |
/* register the packet callbacks */
|
|
Packit Service |
fcc0d2 |
ssh_packet_set_callbacks(session, &ssh_curve25519_client_callbacks);
|
|
Packit Service |
fcc0d2 |
session->dh_handshake_state = DH_STATE_INIT_SENT;
|
|
Packit Service |
fcc0d2 |
rc = ssh_packet_send(session);
|
|
Packit Service |
fcc0d2 |
|
|
Packit Service |
fcc0d2 |
return rc;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit Service |
fcc0d2 |
static int ssh_curve25519_build_k(ssh_session session)
|
|
Packit Service |
fcc0d2 |
{
|
|
Packit Service |
fcc0d2 |
ssh_curve25519_pubkey k;
|
|
Packit Service |
fcc0d2 |
|
|
Packit Service |
fcc0d2 |
#ifdef HAVE_OPENSSL_X25519
|
|
Packit Service |
fcc0d2 |
EVP_PKEY_CTX *pctx = NULL;
|
|
Packit Service |
fcc0d2 |
EVP_PKEY *pkey = NULL, *pubkey = NULL;
|
|
Packit Service |
fcc0d2 |
size_t shared_key_len = sizeof(k);
|
|
Packit Service |
fcc0d2 |
int rc, ret = SSH_ERROR;
|
|
Packit Service |
fcc0d2 |
|
|
Packit Service |
fcc0d2 |
pkey = EVP_PKEY_new_raw_private_key(EVP_PKEY_X25519, NULL,
|
|
Packit Service |
fcc0d2 |
session->next_crypto->curve25519_privkey,
|
|
Packit Service |
fcc0d2 |
CURVE25519_PRIVKEY_SIZE);
|
|
Packit Service |
fcc0d2 |
if (pkey == NULL) {
|
|
Packit Service |
fcc0d2 |
SSH_LOG(SSH_LOG_TRACE,
|
|
Packit Service |
fcc0d2 |
"Failed to create X25519 EVP_PKEY: %s",
|
|
Packit Service |
fcc0d2 |
ERR_error_string(ERR_get_error(), NULL));
|
|
Packit Service |
fcc0d2 |
return SSH_ERROR;
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit |
6c0a39 |
|
|
Packit Service |
fcc0d2 |
pctx = EVP_PKEY_CTX_new(pkey, NULL);
|
|
Packit Service |
fcc0d2 |
if (pctx == NULL) {
|
|
Packit Service |
fcc0d2 |
SSH_LOG(SSH_LOG_TRACE,
|
|
Packit Service |
fcc0d2 |
"Failed to initialize X25519 context: %s",
|
|
Packit Service |
fcc0d2 |
ERR_error_string(ERR_get_error(), NULL));
|
|
Packit Service |
fcc0d2 |
goto out;
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit |
6c0a39 |
|
|
Packit Service |
fcc0d2 |
rc = EVP_PKEY_derive_init(pctx);
|
|
Packit Service |
fcc0d2 |
if (rc != 1) {
|
|
Packit Service |
fcc0d2 |
SSH_LOG(SSH_LOG_TRACE,
|
|
Packit Service |
fcc0d2 |
"Failed to initialize X25519 key derivation: %s",
|
|
Packit Service |
fcc0d2 |
ERR_error_string(ERR_get_error(), NULL));
|
|
Packit Service |
fcc0d2 |
goto out;
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit Service |
fcc0d2 |
|
|
Packit Service |
fcc0d2 |
if (session->server) {
|
|
Packit Service |
fcc0d2 |
pubkey = EVP_PKEY_new_raw_public_key(EVP_PKEY_X25519, NULL,
|
|
Packit Service |
fcc0d2 |
session->next_crypto->curve25519_client_pubkey,
|
|
Packit Service |
fcc0d2 |
CURVE25519_PUBKEY_SIZE);
|
|
Packit Service |
fcc0d2 |
} else {
|
|
Packit Service |
fcc0d2 |
pubkey = EVP_PKEY_new_raw_public_key(EVP_PKEY_X25519, NULL,
|
|
Packit Service |
fcc0d2 |
session->next_crypto->curve25519_server_pubkey,
|
|
Packit Service |
fcc0d2 |
CURVE25519_PUBKEY_SIZE);
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit Service |
fcc0d2 |
if (pubkey == NULL) {
|
|
Packit Service |
fcc0d2 |
SSH_LOG(SSH_LOG_TRACE,
|
|
Packit Service |
fcc0d2 |
"Failed to create X25519 public key EVP_PKEY: %s",
|
|
Packit Service |
fcc0d2 |
ERR_error_string(ERR_get_error(), NULL));
|
|
Packit Service |
fcc0d2 |
goto out;
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit Service |
fcc0d2 |
|
|
Packit Service |
fcc0d2 |
rc = EVP_PKEY_derive_set_peer(pctx, pubkey);
|
|
Packit Service |
fcc0d2 |
if (rc != 1) {
|
|
Packit Service |
fcc0d2 |
SSH_LOG(SSH_LOG_TRACE,
|
|
Packit Service |
fcc0d2 |
"Failed to set peer X25519 public key: %s",
|
|
Packit Service |
fcc0d2 |
ERR_error_string(ERR_get_error(), NULL));
|
|
Packit Service |
fcc0d2 |
goto out;
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit Service |
fcc0d2 |
|
|
Packit Service |
fcc0d2 |
rc = EVP_PKEY_derive(pctx, k, &shared_key_len);
|
|
Packit Service |
fcc0d2 |
if (rc != 1) {
|
|
Packit Service |
fcc0d2 |
SSH_LOG(SSH_LOG_TRACE,
|
|
Packit Service |
fcc0d2 |
"Failed to derive X25519 shared secret: %s",
|
|
Packit Service |
fcc0d2 |
ERR_error_string(ERR_get_error(), NULL));
|
|
Packit Service |
fcc0d2 |
goto out;
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit Service |
fcc0d2 |
ret = SSH_OK;
|
|
Packit Service |
fcc0d2 |
out:
|
|
Packit Service |
fcc0d2 |
EVP_PKEY_free(pkey);
|
|
Packit Service |
fcc0d2 |
EVP_PKEY_free(pubkey);
|
|
Packit Service |
fcc0d2 |
EVP_PKEY_CTX_free(pctx);
|
|
Packit Service |
fcc0d2 |
if (ret == SSH_ERROR) {
|
|
Packit Service |
fcc0d2 |
return ret;
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit Service |
fcc0d2 |
#else
|
|
Packit Service |
fcc0d2 |
if (session->server) {
|
|
Packit Service |
fcc0d2 |
crypto_scalarmult(k, session->next_crypto->curve25519_privkey,
|
|
Packit Service |
fcc0d2 |
session->next_crypto->curve25519_client_pubkey);
|
|
Packit Service |
fcc0d2 |
} else {
|
|
Packit Service |
fcc0d2 |
crypto_scalarmult(k, session->next_crypto->curve25519_privkey,
|
|
Packit Service |
fcc0d2 |
session->next_crypto->curve25519_server_pubkey);
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit Service |
fcc0d2 |
#endif /* HAVE_OPENSSL_X25519 */
|
|
Packit Service |
fcc0d2 |
|
|
Packit Service |
fcc0d2 |
bignum_bin2bn(k, CURVE25519_PUBKEY_SIZE, &session->next_crypto->shared_secret);
|
|
Packit Service |
fcc0d2 |
if (session->next_crypto->shared_secret == NULL) {
|
|
Packit Service |
fcc0d2 |
return SSH_ERROR;
|
|
Packit Service |
fcc0d2 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
#ifdef DEBUG_CRYPTO
|
|
Packit Service |
fcc0d2 |
ssh_log_hexdump("Session server cookie",
|
|
Packit |
6c0a39 |
session->next_crypto->server_kex.cookie, 16);
|
|
Packit Service |
fcc0d2 |
ssh_log_hexdump("Session client cookie",
|
|
Packit |
6c0a39 |
session->next_crypto->client_kex.cookie, 16);
|
|
Packit |
6c0a39 |
ssh_print_bignum("Shared secret key", session->next_crypto->shared_secret);
|
|
Packit |
6c0a39 |
#endif
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
return 0;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
/** @internal
|
|
Packit |
6c0a39 |
* @brief parses a SSH_MSG_KEX_ECDH_REPLY packet and sends back
|
|
Packit |
6c0a39 |
* a SSH_MSG_NEWKEYS
|
|
Packit |
6c0a39 |
*/
|
|
Packit |
6c0a39 |
static SSH_PACKET_CALLBACK(ssh_packet_client_curve25519_reply){
|
|
Packit |
6c0a39 |
ssh_string q_s_string = NULL;
|
|
Packit |
6c0a39 |
ssh_string pubkey_blob = NULL;
|
|
Packit |
6c0a39 |
ssh_string signature = NULL;
|
|
Packit |
6c0a39 |
int rc;
|
|
Packit |
6c0a39 |
(void)type;
|
|
Packit |
6c0a39 |
(void)user;
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
ssh_packet_remove_callbacks(session, &ssh_curve25519_client_callbacks);
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
pubkey_blob = ssh_buffer_get_ssh_string(packet);
|
|
Packit |
6c0a39 |
if (pubkey_blob == NULL) {
|
|
Packit |
6c0a39 |
ssh_set_error(session,SSH_FATAL, "No public key in packet");
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
rc = ssh_dh_import_next_pubkey_blob(session, pubkey_blob);
|
|
Packit Service |
fcc0d2 |
SSH_STRING_FREE(pubkey_blob);
|
|
Packit |
6c0a39 |
if (rc != 0) {
|
|
Packit |
6c0a39 |
ssh_set_error(session,
|
|
Packit |
6c0a39 |
SSH_FATAL,
|
|
Packit |
6c0a39 |
"Failed to import next public key");
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
q_s_string = ssh_buffer_get_ssh_string(packet);
|
|
Packit |
6c0a39 |
if (q_s_string == NULL) {
|
|
Packit |
6c0a39 |
ssh_set_error(session,SSH_FATAL, "No Q_S ECC point in packet");
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
if (ssh_string_len(q_s_string) != CURVE25519_PUBKEY_SIZE){
|
|
Packit |
6c0a39 |
ssh_set_error(session, SSH_FATAL, "Incorrect size for server Curve25519 public key: %d",
|
|
Packit |
6c0a39 |
(int)ssh_string_len(q_s_string));
|
|
Packit Service |
fcc0d2 |
SSH_STRING_FREE(q_s_string);
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
memcpy(session->next_crypto->curve25519_server_pubkey, ssh_string_data(q_s_string), CURVE25519_PUBKEY_SIZE);
|
|
Packit Service |
fcc0d2 |
SSH_STRING_FREE(q_s_string);
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
signature = ssh_buffer_get_ssh_string(packet);
|
|
Packit |
6c0a39 |
if (signature == NULL) {
|
|
Packit |
6c0a39 |
ssh_set_error(session, SSH_FATAL, "No signature in packet");
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
session->next_crypto->dh_server_signature = signature;
|
|
Packit |
6c0a39 |
signature=NULL; /* ownership changed */
|
|
Packit |
6c0a39 |
/* TODO: verify signature now instead of waiting for NEWKEYS */
|
|
Packit |
6c0a39 |
if (ssh_curve25519_build_k(session) < 0) {
|
|
Packit |
6c0a39 |
ssh_set_error(session, SSH_FATAL, "Cannot build k number");
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
/* Send the MSG_NEWKEYS */
|
|
Packit |
6c0a39 |
if (ssh_buffer_add_u8(session->out_buffer, SSH2_MSG_NEWKEYS) < 0) {
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
rc=ssh_packet_send(session);
|
|
Packit |
6c0a39 |
if (rc == SSH_ERROR) {
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
SSH_LOG(SSH_LOG_PROTOCOL, "SSH_MSG_NEWKEYS sent");
|
|
Packit |
6c0a39 |
session->dh_handshake_state = DH_STATE_NEWKEYS_SENT;
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
return SSH_PACKET_USED;
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
error:
|
|
Packit |
6c0a39 |
session->session_state=SSH_SESSION_STATE_ERROR;
|
|
Packit |
6c0a39 |
return SSH_PACKET_USED;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
#ifdef WITH_SERVER
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
static SSH_PACKET_CALLBACK(ssh_packet_server_curve25519_init);
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
static ssh_packet_callback dh_server_callbacks[]= {
|
|
Packit |
6c0a39 |
ssh_packet_server_curve25519_init
|
|
Packit |
6c0a39 |
};
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
static struct ssh_packet_callbacks_struct ssh_curve25519_server_callbacks = {
|
|
Packit |
6c0a39 |
.start = SSH2_MSG_KEX_ECDH_INIT,
|
|
Packit |
6c0a39 |
.n_callbacks = 1,
|
|
Packit |
6c0a39 |
.callbacks = dh_server_callbacks,
|
|
Packit |
6c0a39 |
.user = NULL
|
|
Packit |
6c0a39 |
};
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
/** @internal
|
|
Packit |
6c0a39 |
* @brief sets up the curve25519-sha256@libssh.org kex callbacks
|
|
Packit |
6c0a39 |
*/
|
|
Packit |
6c0a39 |
void ssh_server_curve25519_init(ssh_session session){
|
|
Packit |
6c0a39 |
/* register the packet callbacks */
|
|
Packit |
6c0a39 |
ssh_packet_set_callbacks(session, &ssh_curve25519_server_callbacks);
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
/** @brief Parse a SSH_MSG_KEXDH_INIT packet (server) and send a
|
|
Packit |
6c0a39 |
* SSH_MSG_KEXDH_REPLY
|
|
Packit |
6c0a39 |
*/
|
|
Packit |
6c0a39 |
static SSH_PACKET_CALLBACK(ssh_packet_server_curve25519_init){
|
|
Packit |
6c0a39 |
/* ECDH keys */
|
|
Packit |
6c0a39 |
ssh_string q_c_string;
|
|
Packit |
6c0a39 |
ssh_string q_s_string;
|
|
Packit |
6c0a39 |
ssh_string server_pubkey_blob = NULL;
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
/* SSH host keys (rsa,dsa,ecdsa) */
|
|
Packit |
6c0a39 |
ssh_key privkey;
|
|
Packit Service |
fcc0d2 |
enum ssh_digest_e digest = SSH_DIGEST_AUTO;
|
|
Packit |
6c0a39 |
ssh_string sig_blob = NULL;
|
|
Packit |
6c0a39 |
int rc;
|
|
Packit |
6c0a39 |
(void)type;
|
|
Packit |
6c0a39 |
(void)user;
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
ssh_packet_remove_callbacks(session, &ssh_curve25519_server_callbacks);
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
/* Extract the client pubkey from the init packet */
|
|
Packit |
6c0a39 |
q_c_string = ssh_buffer_get_ssh_string(packet);
|
|
Packit |
6c0a39 |
if (q_c_string == NULL) {
|
|
Packit |
6c0a39 |
ssh_set_error(session,SSH_FATAL, "No Q_C ECC point in packet");
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
if (ssh_string_len(q_c_string) != CURVE25519_PUBKEY_SIZE){
|
|
Packit |
6c0a39 |
ssh_set_error(session,
|
|
Packit |
6c0a39 |
SSH_FATAL,
|
|
Packit |
6c0a39 |
"Incorrect size for server Curve25519 public key: %zu",
|
|
Packit |
6c0a39 |
ssh_string_len(q_c_string));
|
|
Packit Service |
fcc0d2 |
SSH_STRING_FREE(q_c_string);
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
memcpy(session->next_crypto->curve25519_client_pubkey,
|
|
Packit Service |
fcc0d2 |
ssh_string_data(q_c_string), CURVE25519_PUBKEY_SIZE);
|
|
Packit Service |
fcc0d2 |
SSH_STRING_FREE(q_c_string);
|
|
Packit |
6c0a39 |
/* Build server's keypair */
|
|
Packit |
6c0a39 |
|
|
Packit Service |
fcc0d2 |
rc = ssh_curve25519_init(session);
|
|
Packit Service |
fcc0d2 |
if (rc != SSH_OK) {
|
|
Packit Service |
fcc0d2 |
ssh_set_error(session, SSH_FATAL, "Failed to generate curve25519 keys");
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
rc = ssh_buffer_add_u8(session->out_buffer, SSH2_MSG_KEX_ECDH_REPLY);
|
|
Packit |
6c0a39 |
if (rc < 0) {
|
|
Packit |
6c0a39 |
ssh_set_error_oom(session);
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
/* build k and session_id */
|
|
Packit |
6c0a39 |
rc = ssh_curve25519_build_k(session);
|
|
Packit |
6c0a39 |
if (rc < 0) {
|
|
Packit |
6c0a39 |
ssh_set_error(session, SSH_FATAL, "Cannot build k number");
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
/* privkey is not allocated */
|
|
Packit Service |
fcc0d2 |
rc = ssh_get_key_params(session, &privkey, &digest);
|
|
Packit |
6c0a39 |
if (rc == SSH_ERROR) {
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
rc = ssh_make_sessionid(session);
|
|
Packit |
6c0a39 |
if (rc != SSH_OK) {
|
|
Packit |
6c0a39 |
ssh_set_error(session, SSH_FATAL, "Could not create a session id");
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
rc = ssh_dh_get_next_server_publickey_blob(session, &server_pubkey_blob);
|
|
Packit |
6c0a39 |
if (rc != 0) {
|
|
Packit |
6c0a39 |
ssh_set_error(session, SSH_FATAL, "Could not export server public key");
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
/* add host's public key */
|
|
Packit |
6c0a39 |
rc = ssh_buffer_add_ssh_string(session->out_buffer,
|
|
Packit |
6c0a39 |
server_pubkey_blob);
|
|
Packit Service |
fcc0d2 |
SSH_STRING_FREE(server_pubkey_blob);
|
|
Packit |
6c0a39 |
if (rc < 0) {
|
|
Packit |
6c0a39 |
ssh_set_error_oom(session);
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
/* add ecdh public key */
|
|
Packit |
6c0a39 |
q_s_string = ssh_string_new(CURVE25519_PUBKEY_SIZE);
|
|
Packit |
6c0a39 |
if (q_s_string == NULL) {
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
ssh_string_fill(q_s_string,
|
|
Packit |
6c0a39 |
session->next_crypto->curve25519_server_pubkey,
|
|
Packit |
6c0a39 |
CURVE25519_PUBKEY_SIZE);
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
rc = ssh_buffer_add_ssh_string(session->out_buffer, q_s_string);
|
|
Packit Service |
fcc0d2 |
SSH_STRING_FREE(q_s_string);
|
|
Packit |
6c0a39 |
if (rc < 0) {
|
|
Packit |
6c0a39 |
ssh_set_error_oom(session);
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
/* add signature blob */
|
|
Packit Service |
fcc0d2 |
sig_blob = ssh_srv_pki_do_sign_sessionid(session, privkey, digest);
|
|
Packit |
6c0a39 |
if (sig_blob == NULL) {
|
|
Packit |
6c0a39 |
ssh_set_error(session, SSH_FATAL, "Could not sign the session id");
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
rc = ssh_buffer_add_ssh_string(session->out_buffer, sig_blob);
|
|
Packit Service |
fcc0d2 |
SSH_STRING_FREE(sig_blob);
|
|
Packit |
6c0a39 |
if (rc < 0) {
|
|
Packit |
6c0a39 |
ssh_set_error_oom(session);
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
SSH_LOG(SSH_LOG_PROTOCOL, "SSH_MSG_KEX_ECDH_REPLY sent");
|
|
Packit |
6c0a39 |
rc = ssh_packet_send(session);
|
|
Packit |
6c0a39 |
if (rc == SSH_ERROR) {
|
|
Packit |
6c0a39 |
return SSH_ERROR;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
/* Send the MSG_NEWKEYS */
|
|
Packit |
6c0a39 |
rc = ssh_buffer_add_u8(session->out_buffer, SSH2_MSG_NEWKEYS);
|
|
Packit |
6c0a39 |
if (rc < 0) {
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
session->dh_handshake_state = DH_STATE_NEWKEYS_SENT;
|
|
Packit |
6c0a39 |
rc = ssh_packet_send(session);
|
|
Packit |
6c0a39 |
if (rc == SSH_ERROR) {
|
|
Packit |
6c0a39 |
goto error;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
SSH_LOG(SSH_LOG_PROTOCOL, "SSH_MSG_NEWKEYS sent");
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
return SSH_PACKET_USED;
|
|
Packit |
6c0a39 |
error:
|
|
Packit |
6c0a39 |
ssh_buffer_reinit(session->out_buffer);
|
|
Packit |
6c0a39 |
session->session_state=SSH_SESSION_STATE_ERROR;
|
|
Packit |
6c0a39 |
return SSH_PACKET_USED;
|
|
Packit |
6c0a39 |
}
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
#endif /* WITH_SERVER */
|
|
Packit |
6c0a39 |
|
|
Packit |
6c0a39 |
#endif /* HAVE_CURVE25519 */
|