--- /dev/null
+--- /dev/null
++++ b/tests/test_public_key_auth_succeeds_with_correct_ed25519_key.c
+@@ -0,0 +1,37 @@
++#include "session_fixture.h"
++
++#include <libssh2.h>
++
++#include <stdio.h>
++
++static const char *USERNAME = "libssh2"; /* configured in Dockerfile */
++static const char *KEY_FILE_PRIVATE = "key_ed25519";
++static const char *KEY_FILE_PUBLIC = "key_ed25519.pub"; /* configured in Dockerfile */
++
++int test(LIBSSH2_SESSION *session)
++{
++ int rc;
++ const char *userauth_list = NULL;
++
++ userauth_list = libssh2_userauth_list(session, USERNAME, strlen(USERNAME));
++ if(userauth_list == NULL) {
++ print_last_session_error("libssh2_userauth_list");
++ return 1;
++ }
++
++ if(strstr(userauth_list, "publickey") == NULL) {
++ fprintf(stderr, "'publickey' was expected in userauth list: %s\n",
++ userauth_list);
++ return 1;
++ }
++
++ rc = libssh2_userauth_publickey_fromfile_ex(
++ session, USERNAME, strlen(USERNAME), KEY_FILE_PUBLIC, KEY_FILE_PRIVATE,
++ NULL);
++ if(rc != 0) {
++ print_last_session_error("libssh2_userauth_publickey_fromfile_ex");
++ return 1;
++ }
++
++ return 0;
++}
+--- /dev/null
++++ b/tests/test_public_key_auth_succeeds_with_correct_encrypted_ed25519_key.c
+@@ -0,0 +1,38 @@
++#include "session_fixture.h"
++
++#include <libssh2.h>
++
++#include <stdio.h>
++
++static const char *USERNAME = "libssh2"; /* configured in Dockerfile */
++static const char *PASSWORD = "libssh2";
++static const char *KEY_FILE_PRIVATE = "key_ed25519_encrypted";
++static const char *KEY_FILE_PUBLIC = "key_ed25519_encrypted.pub"; /* configured in Dockerfile */
++
++int test(LIBSSH2_SESSION *session)
++{
++ int rc;
++ const char *userauth_list = NULL;
++
++ userauth_list = libssh2_userauth_list(session, USERNAME, strlen(USERNAME));
++ if(userauth_list == NULL) {
++ print_last_session_error("libssh2_userauth_list");
++ return 1;
++ }
++
++ if(strstr(userauth_list, "publickey") == NULL) {
++ fprintf(stderr, "'publickey' was expected in userauth list: %s\n",
++ userauth_list);
++ return 1;
++ }
++
++ rc = libssh2_userauth_publickey_fromfile_ex(
++ session, USERNAME, strlen(USERNAME), KEY_FILE_PUBLIC, KEY_FILE_PRIVATE,
++ PASSWORD);
++ if(rc != 0) {
++ print_last_session_error("libssh2_userauth_publickey_fromfile_ex");
++ return 1;
++ }
++
++ return 0;
++}
+--- /dev/null
++++ b/tests/test_public_key_auth_succeeds_with_correct_ed25519_key_from_mem.c
+@@ -0,0 +1,97 @@
++#include "session_fixture.h"
++
++#include <libssh2.h>
++
++#include <stdio.h>
++#include <stdlib.h>
++
++static const char *USERNAME = "libssh2"; /* configured in Dockerfile */
++static const char *KEY_FILE_ED25519_PRIVATE = "key_ed25519";
++
++int read_file(const char *path, char **buf, size_t *len);
++
++int test(LIBSSH2_SESSION *session)
++{
++ int rc;
++ FILE *fp = NULL;
++ char *buffer = NULL;
++ size_t len = 0;
++ const char *userauth_list = NULL;
++
++ userauth_list = libssh2_userauth_list(session, USERNAME, strlen(USERNAME));
++ if(userauth_list == NULL) {
++ print_last_session_error("libssh2_userauth_list");
++ return 1;
++ }
++
++ if(strstr(userauth_list, "publickey") == NULL) {
++ fprintf(stderr, "'publickey' was expected in userauth list: %s\n",
++ userauth_list);
++ return 1;
++ }
++
++ if(read_file(KEY_FILE_ED25519_PRIVATE, &buffer, &len)) {
++ fprintf(stderr, "Reading key file failed.");
++ return 1;
++ }
++
++ rc = libssh2_userauth_publickey_frommemory(session, USERNAME, strlen(USERNAME),
++ NULL, 0, buffer, len, NULL);
++
++ free(buffer);
++
++ if(rc != 0) {
++ print_last_session_error("libssh2_userauth_publickey_fromfile_ex");
++ return 1;
++ }
++
++ return 0;
++}
++
++int read_file(const char *path, char **out_buffer, size_t *out_len)
++{
++ int rc;
++ FILE *fp = NULL;
++ char *buffer = NULL;
++ size_t len = 0;
++
++ if(out_buffer == NULL || out_len == NULL || path == NULL) {
++ fprintf(stderr, "invalid params.");
++ return 1;
++ }
++
++ *out_buffer = NULL;
++ *out_len = 0;
++
++ fp = fopen(path, "r");
++
++ if(!fp) {
++ fprintf(stderr, "File could not be read.");
++ return 1;
++ }
++
++ fseek(fp, 0L, SEEK_END);
++ len = ftell(fp);
++ rewind(fp);
++
++ buffer = calloc(1, len + 1);
++ if(!buffer) {
++ fclose(fp);
++ fprintf(stderr, "Could not alloc memory.");
++ return 1;
++ }
++
++ if(1 != fread(buffer, len, 1, fp)) {
++ fclose(fp);
++ free(buffer);
++ fprintf(stderr, "Could not read file into memory.");
++ return 1;
++ }
++
++ fclose(fp);
++
++ *out_buffer = buffer;
++ *out_len = len;
++
++ return 0;
++}
--- /dev/null
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-multilib
+
+DESCRIPTION="Library implementing the SSH2 protocol"
+HOMEPAGE="https://www.libssh2.org"
+SRC_URI="https://www.${PN}.org/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="gcrypt libressl mbedtls zlib"
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+RESTRICT="test"
+
+RDEPEND="
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+ !gcrypt? (
+ mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+ !mbedtls? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+ )
+ )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+ ${RDEPEND}
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.8.0-mansyntax_sh.patch
+ "${FILESDIR}"/${PN}-1.9.0-missing.patch
+)
+
+multilib_src_configure() {
+ local crypto_backend=OpenSSL
+ if use gcrypt; then
+ crypto_backend=Libgcrypt
+ elif use mbedtls; then
+ crypto_backend=mbedTLS
+ fi
+
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DCRYPTO_BACKEND=${crypto_backend}
+ -DENABLE_ZLIB_COMPRESSION=$(usex zlib)
+ )
+ cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+}