Skip to content

libssh: upgrade to the 0.9.5 release #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vapier wants to merge 1 commit into
base: master
Choose a base branch
from
Open

libssh: upgrade to the 0.9.5 release #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,11 @@ new_http_archive(
build_file = "external_builds/BUILD.glibc_compat",
)

new_git_repository(
new_http_archive(
name = "libssh",
remote = "https://github.com/rpwoodbu/libssh.git",
commit = "cdd4f3e3efb8758a53ebf34ac7b34d74d217158d", # branch = "mosh-chrome-patches"
url = "https://www.libssh.org/files/0.9/libssh-0.9.5.tar.xz",
sha256 = "acffef2da98e761fc1fd9c4fddde0f3af60ab44c4f5af05cd1b2d60a3fa08718",
strip_prefix = "libssh-0.9.5",
build_file = "external_builds/BUILD.libssh",
)

Expand Down
116 changes: 107 additions & 9 deletions external_builds/BUILD.libssh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,88 @@ config_setting(

cc_library(
name = "libssh",
srcs = glob(
include = ["src/**/*.c"],
exclude = ["src/gssapi.c"],
),
# Built from src/CMakeLists.txt.
srcs = [
# Main code.
"src/agent.c",
"src/auth.c",
"src/base64.c",
"src/bignum.c",
"src/buffer.c",
"src/callbacks.c",
"src/channels.c",
"src/client.c",
"src/config.c",
"src/connect.c",
"src/connector.c",
"src/curve25519.c",
"src/dh.c",
"src/ecdh.c",
"src/error.c",
"src/getpass.c",
"src/init.c",
"src/kdf.c",
"src/kex.c",
"src/known_hosts.c",
"src/knownhosts.c",
"src/legacy.c",
"src/log.c",
"src/match.c",
"src/messages.c",
"src/misc.c",
"src/options.c",
"src/packet.c",
"src/packet_cb.c",
"src/packet_crypt.c",
"src/pcap.c",
"src/pki.c",
"src/pki_container_openssh.c",
"src/poll.c",
"src/session.c",
"src/scp.c",
"src/socket.c",
"src/string.c",
"src/threads.c",
"src/wrapper.c",
"src/external/bcrypt_pbkdf.c",
"src/external/blowfish.c",
"src/external/chacha.c",
"src/external/poly1305.c",
"src/chachapoly.c",
"src/config_parser.c",
"src/token.c",
"src/pki_ed25519_common.c",

# Threads.
"src/threads/noop.c",
"src/threads/pthread.c",

# OpenSSL.
"src/threads/libcrypto.c",
"src/pki_crypto.c",
"src/ecdh_crypto.c",
"src/libcrypto.c",
"src/dh_crypto.c",
"src/libcrypto-compat.c",

# OpenSSL w/out ED25519.
"src/pki_ed25519.c",
"src/external/ed25519.c",
"src/external/fe25519.c",
"src/external/ge25519.c",
"src/external/sc25519.c",

"src/external/curve25519_ref.c",

# GEX.
"src/dh-gex.c",

# Zlib.
"src/gzip.c",
],
hdrs = glob([
"include/libssh/*.h",
"src/*.h",
"src/**/*.data",
]),
includes = ["include"],
Expand Down Expand Up @@ -44,6 +120,7 @@ cc_library(
"-DWITH_EXAMPLES=OFF",
"-Wno-char-subscripts",
"-Wno-implicit-function-declaration",
"-Wno-deprecated-declarations",
],
visibility = ["//visibility:public"],
)
Expand All @@ -54,7 +131,6 @@ genrule(
cmd = """
cat > $@ << EOF
#define PACKAGE "libssh"
#define VERSION "0.7.1"
#define HAVE_ARPA_INET_H 1
#define HAVE_SYS_TIME_H 1
#define HAVE_TERMIOS_H 1
Expand All @@ -65,8 +141,14 @@ genrule(
#define HAVE_OPENSSL_ECDH_H 1
#define HAVE_OPENSSL_EC_H 1
#define HAVE_OPENSSL_ECDSA_H 1
#define HAVE_PTHREAD_H 1
#define HAVE_OPENSSL_ECC 1
#define HAVE_OPENSSL_EVP_AES_CTR 1
#define HAVE_OPENSSL_EVP_AES_CBC 1
#define HAVE_OPENSSL_EVP_AES_GCM 1
#define HAVE_OPENSSL_CRYPTO_THREADID_SET_CALLBACK 1
#define HAVE_OPENSSL_CRYPTO_CTR128_ENCRYPT 1
#define HAVE_OPENSSL_EVP_CIPHER_CTX_NEW 1
#define HAVE_PTHREAD_H 1
#define HAVE_ECC 1
#define HAVE_SNPRINTF 1
#define HAVE_VSNPRINTF 1
Expand All @@ -83,17 +165,33 @@ genrule(
#define HAVE_GCC_NARG_MACRO 1
#define HAVE_COMPILER__FUNC__ 1
#define HAVE_COMPILER__FUNCTION__ 1
#define WITH_SFTP 1
#define WITH_SERVER 1
#define WITH_GEX 1
#define WITH_PCAP 1
#define DEBUG_CALLTRACE 1
#define GLOBAL_CLIENT_CONFIG "/etc/ssh/ssh_config"
#define GLOBAL_BIND_CONFIG "/etc/ssh/libssh_server_config"
EOF
""",
)

genrule(
name = "version_file",
srcs = ["include/libssh/libssh_version.h.cmake"],
outs = ["include/libssh/libssh_version.h"],
cmd = """
sed -e 's|@libssh_VERSION_MAJOR@|0|' \
-e 's|@libssh_VERSION_MINOR@|9|' \
-e 's|@libssh_VERSION_PATCH@|5|' \
$(SRCS) > $(OUTS)
""",
)

cc_library(
name = "config_lib",
hdrs = [":config_file"],
hdrs = [
":config_file",
":version_file",
],
)

cc_library(
Expand Down
69 changes: 35 additions & 34 deletions mosh_nacl/ssh.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,20 +83,11 @@ bool KeyboardInteractive::Answer(const char* answer) {

Session::Session(const string& host, int port, const string& user)
: s_(ssh_new()), user_(user) {
ssh_init();

SetOption(SSH_OPTIONS_HOST, host);
SetOption(SSH_OPTIONS_PORT, port);
SetOption(SSH_OPTIONS_USER, user);

// libssh 0.7.1 seems to be unable to verify ed25519 host keys, and causes
// the connection to hosts with such a key to fail. This works around the
// issue by removing ed25519 from the list of host keys libssh will prefer.
// This list is from libssh's HOSTKEYS (kex.c), with ssh-ed25519 removed.
//
// TODO(rpwoodbu): Eliminate this workaround once ed25519 host key
// verification is fixed.
SetOption(SSH_OPTIONS_HOSTKEYS,
"ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,"
"ssh-rsa,ssh-dss");
}

Session::~Session() {
Expand Down Expand Up @@ -128,7 +119,7 @@ void Session::Disconnect() {
Key& Session::GetPublicKey() {
if (connected_ && key_ == nullptr) {
key_ = make_unique<Key>();
ssh_get_publickey(s_, &key_->key_);
ssh_get_server_publickey(s_, &key_->key_);
}
return *key_;
}
Expand Down Expand Up @@ -223,26 +214,32 @@ KeyType::KeyType(KeyTypeEnum type) {
case ED25519:
type_ = SSH_KEYTYPE_ED25519;
break;
case DSS_CERT00:
type_ = SSH_KEYTYPE_DSS_CERT00;
break;
case RSA_CERT00:
type_ = SSH_KEYTYPE_RSA_CERT00;
break;
case DSS_CERT01:
type_ = SSH_KEYTYPE_DSS_CERT01;
break;
case RSA_CERT01:
type_ = SSH_KEYTYPE_RSA_CERT01;
break;
case ECDSA_SHA2_NISTP256_CERT01:
type_ = SSH_KEYTYPE_ECDSA_SHA2_NISTP256_CERT01;
case ECDSA_P256:
type_ = SSH_KEYTYPE_ECDSA_P256;
break;
case ECDSA_P384:
type_ = SSH_KEYTYPE_ECDSA_P384;
break;
case ECDSA_P521:
type_ = SSH_KEYTYPE_ECDSA_P521;
break;
case ECDSA_P256_CERT01:
type_ = SSH_KEYTYPE_ECDSA_P256_CERT01;
break;
case ECDSA_P384_CERT01:
type_ = SSH_KEYTYPE_ECDSA_P384_CERT01;
break;
case ECDSA_SHA2_NISTP384_CERT01:
type_ = SSH_KEYTYPE_ECDSA_SHA2_NISTP384_CERT01;
case ECDSA_P521_CERT01:
type_ = SSH_KEYTYPE_ECDSA_P521_CERT01;
break;
case ECDSA_SHA2_NISTP521_CERT01:
type_ = SSH_KEYTYPE_ECDSA_SHA2_NISTP521_CERT01;
case ED25519_CERT01:
type_ = SSH_KEYTYPE_ED25519_CERT01;
break;

case UNKNOWN: // Fallthrough.
Expand All @@ -264,20 +261,24 @@ KeyType::KeyTypeEnum KeyType::type() const {
return ECDSA;
case SSH_KEYTYPE_ED25519:
return ED25519;
case SSH_KEYTYPE_DSS_CERT00:
return DSS_CERT00;
case SSH_KEYTYPE_RSA_CERT00:
return RSA_CERT00;
case SSH_KEYTYPE_DSS_CERT01:
return DSS_CERT01;
case SSH_KEYTYPE_RSA_CERT01:
return RSA_CERT01;
case SSH_KEYTYPE_ECDSA_SHA2_NISTP256_CERT01:
return ECDSA_SHA2_NISTP256_CERT01;
case SSH_KEYTYPE_ECDSA_SHA2_NISTP384_CERT01:
return ECDSA_SHA2_NISTP384_CERT01;
case SSH_KEYTYPE_ECDSA_SHA2_NISTP521_CERT01:
return ECDSA_SHA2_NISTP521_CERT01;
case SSH_KEYTYPE_ECDSA_P256:
return ECDSA_P256;
case SSH_KEYTYPE_ECDSA_P384:
return ECDSA_P384;
case SSH_KEYTYPE_ECDSA_P521:
return ECDSA_P521;
case SSH_KEYTYPE_ECDSA_P256_CERT01:
return ECDSA_P256_CERT01;
case SSH_KEYTYPE_ECDSA_P384_CERT01:
return ECDSA_P384_CERT01;
case SSH_KEYTYPE_ECDSA_P521_CERT01:
return ECDSA_P521_CERT01;
case SSH_KEYTYPE_ED25519_CERT01:
return ED25519_CERT01;
case SSH_KEYTYPE_UNKNOWN:
return UNKNOWN;
}
Expand Down
16 changes: 10 additions & 6 deletions mosh_nacl/ssh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,13 @@ class Session : public ResultCode {
void Disconnect();

// Determines if the connected server is known. Analog to
// ssh_is_server_known().
// ssh_session_is_known_server().
bool ServerKnown() {
return ParseCode(ssh_is_server_known(s_), SSH_SERVER_KNOWN_OK);
return ParseCode(ssh_session_is_known_server(s_), SSH_SERVER_KNOWN_OK);
}

// Returns the public key as a Key. Ownership is retained, thus is valid only
// for the lifetime of Session. Analog to ssh_get_publickey().
// for the lifetime of Session. Analog to ssh_get_server_publickey().
Key& GetPublicKey();

// Get a list of authentication types available. On error, or if the server
Expand Down Expand Up @@ -228,9 +228,13 @@ class KeyType {
RSA_CERT00,
DSS_CERT01,
RSA_CERT01,
ECDSA_SHA2_NISTP256_CERT01,
ECDSA_SHA2_NISTP384_CERT01,
ECDSA_SHA2_NISTP521_CERT01,
ECDSA_P256,
ECDSA_P384,
ECDSA_P521,
ECDSA_P256_CERT01,
ECDSA_P384_CERT01,
ECDSA_P521_CERT01,
ED25519_CERT01,
};

KeyType() = default;
Expand Down