Added pki and ed25519 definitions. Updated setup.py.

Author: Pan

setup.py

@@ -23,17 +23,15 @@
 ON_WINDOWS = platform.system() == 'Windows'
 
 ext = 'pyx' if USING_CYTHON else 'c'
-sources = glob('ssh2/*.%s' % (ext,))
-_libs = ['ssh2'] if not ON_WINDOWS else [
-    'Ws2_32', 'libssh2', 'user32',
+sources = glob('ssh/*.%s' % (ext,))
+_libs = ['ssh'] if not ON_WINDOWS else [
+    'Ws2_32', 'libssh', 'user32',
     'libeay32MD', 'ssleay32MD',
     'zlibstatic',
 ]
 
 # _comp_args = ["-ggdb"]
 _comp_args = ["-O3"] if not ON_WINDOWS else None
-_embedded_lib = bool(int(os.environ.get('EMBEDDED_LIB', 1)))
-_have_agent_fwd = bool(int(os.environ.get('HAVE_AGENT_FWD', 1)))
 cython_directives = {'embedsignature': True,
                      'boundscheck': False,
                      'optimize.use_switch': True,
@@ -42,8 +40,7 @@
 cython_args = {
     'cython_directives': cython_directives,
     'cython_compile_time_env': {
-        'EMBEDDED_LIB': _embedded_lib,
-        'HAVE_AGENT_FWD': _have_agent_fwd,
+        '_WIN32': ON_WINDOWS,
     }} \
     if USING_CYTHON else {}
 

ssh/c_ed25519.pxd

@@ -0,0 +1,35 @@
+# This file is part of ssh-python.
+# Copyright (C) 2018 Panos Kittenis
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation, version 2.1.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-130
+
+from c_ssh cimport uint8_t
+
+cdef extern from "libssh/include/ed25519.h" nogil:
+    enum:
+        ED25519_PK_LEN
+        ED25519_SK_LEN
+        ED25519_SIG_LEN
+    ctypedef uint8_t ed25519_pubkey[ED25519_PK_LEN]
+    ctypedef uint8_t ed25519_privkey[ED25519_SK_LEN]
+    ctypedef uint8_t ed25519_signature[ED25519_SIG_LEN]
+    int crypto_sign_ed25519_keypair(ed25519_pubkey pk, ed25519_privkey sk)
+    int crypto_sign_ed25519(
+        unsigned char *sm,unsigned long long *smlen,
+        const unsigned char *m,unsigned long long mlen,
+        const ed25519_privkey sk)
+    int crypto_sign_ed25519_open(
+        unsigned char *m,unsigned long long *mlen,
+        const unsigned char *sm,unsigned long long smlen,
+        const ed25519_pubkey pk)

ssh/c_pki.pxd

@@ -0,0 +1,37 @@
+# This file is part of ssh-python.
+# Copyright (C) 2018 Panos Kittenis
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation, version 2.1.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-130
+
+from c_ssh cimport ssh_session, ssh_buffer, uint32_t, uint8_t, ssh_keytypes_e
+from c_wrapper cimport ssh_hmac_e
+from c_callbacks cimport ssh_packet_callbacks
+from c_ed25519 cimport ed25519_pubkey, ed25519_privkey
+
+cdef extern from "libssh/include/pki.h" nogil:
+    enum:
+        MAX_PUBKEY_SIZE
+        MAX_PRIVKEY_SIZE
+        SSH_KEY_FLAG_EMPTY
+        SSH_KEY_FLAG_PUBLIC
+        SSH_KEY_FLAG_PRIVATE
+    struct ssh_key_struct:
+        ssh_keytypes_e type
+        int flags
+        const char *type_c
+        int ecdsa_nid
+        ed25519_pubkey *ed25519_pubkey
+        ed25519_privkey *ed25519_privkey
+        void *cert
+        ssh_keytypes_e cert_type

ssh/ssh.pyx

@@ -30,3 +30,5 @@ cimport c_messages
 cimport c_options
 cimport c_callbacks
 cimport c_packet
+cimport c_ed25519
+cimport c_pki