Ensure repo is update to date with upstream.

Author: Sibras

CMakeLists.txt

@@ -110,19 +110,6 @@ install(
 )
 endif (UNIX)
 
-    if (LIBSSH_THREADS)
-        configure_file(libssh_threads.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libssh_threads.pc)
-        install(
-          FILES
-            ${CMAKE_CURRENT_BINARY_DIR}/libssh_threads.pc
-          DESTINATION
-            ${LIB_INSTALL_DIR}/pkgconfig
-          COMPONENT
-            pkgconfig
-        )
-    endif (LIBSSH_THREADS)
-endif (CMAKE_GENERATOR MATCHES "Makefiles")
-
 # cmake config files
 set(LIBSSH_LIBRARY_NAME ${CMAKE_SHARED_LIBRARY_PREFIX}ssh${CMAKE_SHARED_LIBRARY_SUFFIX})
 

include/libssh/socket.h

@@ -64,7 +64,6 @@ int ssh_socket_pollcallback(struct ssh_poll_handle_struct *p, socket_t fd, int r
 struct ssh_poll_handle_struct * ssh_socket_get_poll_handle_in(ssh_socket s);
 struct ssh_poll_handle_struct * ssh_socket_get_poll_handle_out(ssh_socket s);
 
-void ssh_socket_set_connecting(ssh_socket s, socket_t fd);
 int ssh_socket_connect(ssh_socket s, const char *host, int port, const char *bind_addr);
 
 #endif /* SOCKET_H_ */

src/buffer.c

@@ -674,24 +674,6 @@ int ssh_buffer_validate_length(struct ssh_buffer_struct *buffer, size_t len)
     return SSH_OK;
 }
 
-/**
- * @brief Valdiates that the given length can be obtained from the buffer.
- *
- * @param[in]  buffer  The buffer to read from.
- *
- * @param[in]  len     The length to be checked.
- *
- * @return             SSH_OK if the length is valid, SSH_ERROR otherwise.
- */
-int ssh_buffer_validate_length(struct ssh_buffer_struct *buffer, size_t len)
-{
-    if (buffer->pos + len < len || buffer->pos + len > buffer->used) {
-        return SSH_ERROR;
-    }
-
-    return SSH_OK;
-}
-
 /**
  * @internal
  *

src/channels.c

@@ -938,11 +938,6 @@ int ssh_channel_open_forward(ssh_channel channel, const char *remotehost,
       return rc;
   }
 
-  if(remotehost == NULL || sourcehost == NULL) {
-      ssh_set_error_invalid(session);
-      return rc;
-  }
-
   payload = ssh_buffer_new();
   if (payload == NULL) {
     ssh_set_error_oom(session);

src/curve25519_ref.c

@@ -836,7 +836,6 @@ static int generate_one_key(ssh_string k,
 int ssh_generate_session_keys(ssh_session session) {
   ssh_string k_string = NULL;
   struct ssh_crypto_struct *crypto = session->next_crypto;
-  unsigned char *tmp;
   int rc = -1;
 
   k_string = ssh_make_bignum_string(crypto->k);

src/dh.c

@@ -131,8 +131,6 @@ unsigned char *ssh_packet_encrypt(ssh_session session, void *data, uint32_t len)
 
   assert(len);
 
-  assert(len);
-
   if (!session->current_crypto) {
     return NULL; /* nothing to do here */
   }