Updated includes.

Pan · Pan · commit 3c6b71b93473 · 2018-06-18T11:26:10.000+01:00
diff --git a/ssh/c_agent.pxd b/ssh/c_agent.pxd
@@ -16,7 +16,7 @@
 
 cimport c_ssh
 
-cdef extern from "libssh/include/agent.h" nogil:
+cdef extern from "libssh/agent.h" nogil:
     # Messages for the authentication agent connection.
     enum:
         SSH_AGENTC_REQUEST_RSA_IDENTITIES
diff --git a/ssh/c_auth.pxd b/ssh/c_auth.pxd
@@ -18,7 +18,7 @@
 
 from c_ssh cimport uint32_t
 
-cdef extern from "libssh/include/auth.h" nogil:
+cdef extern from "libssh/auth.h" nogil:
     struct ssh_kbdint_struct:
         uint32_t nprompts
         uint32_t nanswers
diff --git a/ssh/c_bind.pxd b/ssh/c_bind.pxd
@@ -18,7 +18,7 @@ cimport c_priv
 cimport c_session
 
 
-cdef extern from "libssh/include/bind.h" nogil:
+cdef extern from "libssh/bind.h" nogil:
     struct ssh_bind_struct:
         ssh_common_struct common
         ssh_bind_callbacks_struct *bind_callbacks
diff --git a/ssh/c_callbacks.pxd b/ssh/c_callbacks.pxd
@@ -17,7 +17,7 @@
 from c_ssh cimport ssh_session, ssh_channel, ssh_buffer, ssh_string, \
     uint32_t, uint8_t, ssh_key_struct, ssh_auth_callback, ssh_message
 
-cdef extern from "libssh/include/callbacks.h" nogil:
+cdef extern from "libssh/callbacks.h" nogil:
     ctypedef void (*ssh_callback_int) (int code, void *user)
     ctypedef int (*ssh_callback_data) (const void *data, size_t len, void *user)
     ctypedef void (*ssh_callback_int_int) (
diff --git a/ssh/c_channels.pxd b/ssh/c_channels.pxd
@@ -18,7 +18,7 @@ cimport c_ssh
 from c_ssh cimport uint32_t, ssh_channel, ssh_session, ssh_buffer, ssh_counter
 from c_misc cimport ssh_list
 
-cdef extern from "libssh/include/channels.h" nogil:
+cdef extern from "libssh/channels.h" nogil:
     enum ssh_channel_request_state_e:
         SSH_CHANNEL_REQ_STATE_NONE,
         SSH_CHANNEL_REQ_STATE_PENDING,
diff --git a/ssh/c_crypto.pxd b/ssh/c_crypto.pxd
@@ -17,7 +17,7 @@
 from c_ssh cimport ssh_string
 from c_wrapper cimport ssh_mac_e, ssh_hmac_e, ssh_des_e, ssh_hmac_struct
 
-cdef extern from "libssh/include/crypto.h" nogil:
+cdef extern from "libssh/crypto.h" nogil:
     enum:
         DIGEST_MAX_LEN
     enum ssh_key_exchange_e:
diff --git a/ssh/c_ed25519.pxd b/ssh/c_ed25519.pxd
@@ -16,7 +16,7 @@
 
 from c_ssh cimport uint8_t
 
-cdef extern from "libssh/include/ed25519.h" nogil:
+cdef extern from "libssh/ed25519.h" nogil:
     enum:
         ED25519_PK_LEN
         ED25519_SK_LEN
diff --git a/ssh/c_gssapi.pxd b/ssh/c_gssapi.pxd
@@ -19,7 +19,7 @@ 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/gssapi.h" nogil:
+cdef extern from "libssh/gssapi.h" nogil:
     enum:
         SSH_OID_TAG
     struct ssh_gssapi_struct:
diff --git a/ssh/c_kex.pxd b/ssh/c_kex.pxd
@@ -16,7 +16,7 @@
 
 from c_ssh cimport ssh_session, ssh_kex_types_e, uint32_t
 
-cdef extern from "libssh/include/kex.h" nogil:
+cdef extern from "libssh/kex.h" nogil:
     enum:
         SSH_KEX_METHODS
     struct ssh_kex_struct:
diff --git a/ssh/c_keys.pxd b/ssh/c_keys.pxd
@@ -16,7 +16,7 @@
 
 from c_ssh cimport ssh_session, ssh_string
 
-cdef extern from "libssh/include/keys.h" nogil:
+cdef extern from "libssh/keys.h" nogil:
     struct ssh_public_key_struct:
         int type
         const char *type_c
diff --git a/ssh/c_knownhosts.pxd b/ssh/c_knownhosts.pxd
@@ -16,5 +16,5 @@
 
 from c_ssh cimport ssh_session
 
-cdef extern from "libssh/include/knownhosts.h" nogil:
+cdef extern from "libssh/knownhosts.h" nogil:
     char **ssh_knownhosts_algorithms(ssh_session session)
diff --git a/ssh/c_legacy.pxd b/ssh/c_legacy.pxd
@@ -17,7 +17,7 @@
 from c_ssh cimport ssh_session, ssh_string, ssh_message, uint32_t, ssh_keytypes_e
 from c_keys cimport ssh_private_key_struct, ssh_public_key_struct
 
-cdef extern from "libssh/include/legacy.h" nogil:
+cdef extern from "libssh/legacy.h" nogil:
     ctypedef ssh_private_key_struct* ssh_private_key
     ctypedef ssh_public_key_struct* ssh_public_key
     int ssh_auth_list(ssh_session session)
diff --git a/ssh/c_messages.pxd b/ssh/c_messages.pxd
@@ -17,7 +17,7 @@
 from c_ssh cimport ssh_session, ssh_string, ssh_message, ssh_channel, uint32_t, uint16_t, \
     uint8_t, ssh_key_struct, ssh_buffer
 
-cdef extern from "libssh/include/messages.h" nogil:
+cdef extern from "libssh/messages.h" nogil:
     struct ssh_auth_request:
         char *username
         int method
diff --git a/ssh/c_misc.pxd b/ssh/c_misc.pxd
@@ -16,7 +16,7 @@
 
 from c_ssh cimport ssh_session
 
-cdef extern from "libssh/include/misc.h" nogil:
+cdef extern from "libssh/misc.h" nogil:
     char *ssh_get_user_home_dir()
     char *ssh_get_local_username()
     int ssh_file_readaccess_ok(const char *file)
diff --git a/ssh/c_options.pxd b/ssh/c_options.pxd
@@ -16,7 +16,7 @@
 
 from c_ssh cimport ssh_session, ssh_kex_types_e
 
-cdef extern from "libssh/include/options.h" nogil:
+cdef extern from "libssh/options.h" nogil:
     int ssh_config_parse_file(ssh_session session, const char *filename)
     int ssh_options_set_algo(ssh_session session, ssh_kex_types_e algo,
                              const char *list)
diff --git a/ssh/c_packet.pxd b/ssh/c_packet.pxd
@@ -18,7 +18,7 @@ from c_ssh cimport ssh_session, ssh_buffer, uint32_t, uint8_t
 from c_wrapper cimport ssh_hmac_e
 from c_callbacks cimport ssh_packet_callbacks
 
-cdef extern from "libssh/include/packet.h" nogil:
+cdef extern from "libssh/packet.h" nogil:
     struct ssh_socket_struct:
         pass
     struct packet_struct:
diff --git a/ssh/c_pki.pxd b/ssh/c_pki.pxd
@@ -22,7 +22,7 @@ from c_ed25519 cimport ed25519_pubkey, ed25519_privkey
 from c_priv cimport ssh_key
 from c_legacy cimport ssh_private_key, ssh_public_key
 
-cdef extern from "libssh/include/pki.h" nogil:
+cdef extern from "libssh/pki.h" nogil:
     enum:
         MAX_PUBKEY_SIZE
         MAX_PRIVKEY_SIZE
diff --git a/ssh/c_pki_priv.pxd b/ssh/c_pki_priv.pxd
@@ -18,7 +18,7 @@ from c_ssh cimport uint8_t, ssh_keytypes_e, ssh_string, ssh_auth_callback, \
     ssh_buffer, ssh_keycmp_e, ssh_session
 from c_pki cimport ssh_key_struct, ssh_signature
 
-cdef extern from "libssh/include/pki_priv.h" nogil:
+cdef extern from "libssh/pki_priv.h" nogil:
     ctypedef ssh_key_struct *ssh_key
     int bcrypt_pbkdf(const char *,
                      size_t passlen,
diff --git a/ssh/c_poll.pxd b/ssh/c_poll.pxd
@@ -17,7 +17,7 @@
 from c_ssh cimport ssh_session, ssh_buffer, ssh_string, uint32_t, uint8_t, ssh_event, socket_t
 from c_callbacks cimport ssh_packet_callbacks, ssh_packet_callbacks_struct
 
-cdef extern from "libssh/include/poll.h" nogil:
+cdef extern from "libssh/poll.h" nogil:
     ctypedef unsigned long int nfds_t
     void ssh_poll_init();
     void ssh_poll_cleanup();
diff --git a/ssh/c_priv.pxd b/ssh/c_priv.pxd
@@ -17,7 +17,7 @@
 from c_ssh cimport ssh_connector, ssh_event, ssh_buffer, ssh_session, \
     socket_t, ssh_key
 
-cdef extern from "libssh/include/priv.h" nogil:
+cdef extern from "libssh/priv.h" nogil:
     struct timeval:
         pass
     int gettimeofday(timeval *__p, void *__t)
diff --git a/ssh/c_scp.pxd b/ssh/c_scp.pxd
@@ -17,7 +17,7 @@
 from c_ssh cimport ssh_scp, ssh_scp_request_types, ssh_channel, uint64_t, \
     ssh_session
 
-cdef extern from "libssh/include/scp.h" nogil:
+cdef extern from "libssh/scp.h" nogil:
     enum ssh_scp_states:
         SSH_SCP_NEW,
         SSH_SCP_WRITE_INITED,
diff --git a/ssh/c_session.pxd b/ssh/c_session.pxd
@@ -29,7 +29,7 @@ from c_packet cimport PACKET
 from c_socket cimport ssh_socket_struct
 from c_priv cimport error_struct
 
-cdef extern from "libssh/include/session.h" nogil:
+cdef extern from "libssh/session.h" nogil:
     enum ssh_session_state_e:
         SSH_SESSION_STATE_NONE,
         SSH_SESSION_STATE_CONNECTING,
diff --git a/ssh/c_sftp.pxd b/ssh/c_sftp.pxd
@@ -17,7 +17,7 @@
 from c_ssh cimport uint64_t, uint32_t, uint8_t, ssh_string, ssh_buffer, \
     ssh_channel, ssh_session
 
-cdef extern from "libssh/include/sftp.h" nogil:
+cdef extern from "libssh/sftp.h" nogil:
     ctypedef sftp_attributes_struct* sftp_attributes
     ctypedef sftp_client_message_struct* sftp_client_message
     ctypedef sftp_dir_struct* sftp_dir
diff --git a/ssh/c_socket.pxd b/ssh/c_socket.pxd
@@ -19,7 +19,7 @@ from posix.select cimport fd_set
 from c_ssh cimport socket_t, ssh_session
 from c_callbacks cimport ssh_socket_callbacks
 
-cdef extern from "libssh/include/socket.h" nogil:
+cdef extern from "libssh/socket.h" nogil:
     struct ssh_poll_handle_struct:
         pass
     struct ssh_socket_struct:
diff --git a/ssh/c_ssh2.pxd b/ssh/c_ssh2.pxd
@@ -14,7 +14,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-130
 
-cdef extern from "libssh/include/ssh2.h" nogil:
+cdef extern from "libssh/ssh2.h" nogil:
     enum:
         SSH2_MSG_DISCONNECT
         SSH2_MSG_IGNORE
diff --git a/ssh/c_string.pxd b/ssh/c_string.pxd
@@ -16,7 +16,7 @@
 
 from c_ssh cimport uint32_t
 
-cdef extern from "libssh/include/string.h" nogil:
+cdef extern from "libssh/string.h" nogil:
     struct ssh_string_struct:
         uint32_t size;
         unsigned char data[1]
diff --git a/ssh/c_threads.pxd b/ssh/c_threads.pxd
@@ -14,7 +14,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-130
 
-cdef extern from "libssh/include/threads.h" nogil:
+cdef extern from "libssh/threads.h" nogil:
     int ssh_threads_init();
     void ssh_threads_finalize();
     const char *ssh_threads_get_type();
diff --git a/ssh/c_wrapper.pxd b/ssh/c_wrapper.pxd
@@ -17,7 +17,7 @@
 from c_ssh cimport ssh_session
 from c_crypto cimport ssh_cipher_struct, ssh_crypto_struct
 
-cdef extern from "libssh/include/wrapper.h" nogil:
+cdef extern from "libssh/wrapper.h" nogil:
     enum ssh_mac_e:
         SSH_MAC_SHA1,
         SSH_MAC_SHA256,
