Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh

3 files changed, 25 insertions, 24 deletions

diff --git a/include/libssh/crypto.h b/include/libssh/crypto.h
index d838f245..00bb1c97 100644
--- a/include/libssh/crypto.h
+++ b/include/libssh/crypto.h
@@ -27,6 +27,12 @@
 #define _CRYPTO_H_
 
 #include "config.h"
+
+#ifdef HAVE_LIBGCRYPT
+#include <gcrypt.h>
+#endif
+#include "libssh/wrapper.h"
+
 #ifdef cbc_encrypt
 #undef cbc_encrypt
 #endif
@@ -34,11 +40,6 @@
 #undef cbc_decrypt
 #endif
 
-#ifdef HAVE_LIBGCRYPT
-#include <gcrypt.h>
-#endif
-#include "libssh/wrapper.h"
-
 struct ssh_crypto_struct {
     bignum e,f,x,k,y;
     unsigned char session_id[SHA_DIGEST_LEN];
diff --git a/include/libssh/server.h b/include/libssh/server.h
index c9cf634e..a235ffa6 100644
--- a/include/libssh/server.h
+++ b/include/libssh/server.h
@@ -71,62 +71,62 @@ LIBSSH_API int ssh_bind_options_set(ssh_bind sshbind,
 /**
  * @brief Start listening to the socket.
  *
- * @param  ssh_bind     The ssh server bind to use.
+ * @param  ssh_bind_o     The ssh server bind to use.
  *
  * @return 0 on success, < 0 on error.
  */
-LIBSSH_API int ssh_bind_listen(ssh_bind ssh_bind);
+LIBSSH_API int ssh_bind_listen(ssh_bind ssh_bind_o);
 
 /**
  * @brief  Set the session to blocking/nonblocking mode.
  *
- * @param  ssh_bind     The ssh server bind to use.
+ * @param  ssh_bind_o     The ssh server bind to use.
  *
  * @param  blocking     Zero for nonblocking mode.
  */
-LIBSSH_API void ssh_bind_set_blocking(ssh_bind sshbind, int blocking);
+LIBSSH_API void ssh_bind_set_blocking(ssh_bind ssh_bind_o, int blocking);
 
 /**
  * @brief Recover the file descriptor from the session.
  *
- * @param  ssh_bind     The ssh server bind to get the fd from.
+ * @param  ssh_bind_o     The ssh server bind to get the fd from.
  *
  * @return The file descriptor.
  */
-LIBSSH_API socket_t ssh_bind_get_fd(ssh_bind ssh_bind);
+LIBSSH_API socket_t ssh_bind_get_fd(ssh_bind ssh_bind_o);
 
 /**
  * @brief Set the file descriptor for a session.
  *
- * @param  ssh_bind     The ssh server bind to set the fd.
+ * @param  ssh_bind_o     The ssh server bind to set the fd.
  *
  * @param  fd           The file descriptssh_bind B
  */
-LIBSSH_API void ssh_bind_set_fd(ssh_bind sshbind, socket_t fd);
+LIBSSH_API void ssh_bind_set_fd(ssh_bind ssh_bind_o, socket_t fd);
 
 /**
  * @brief Allow the file descriptor to accept new sessions.
  *
- * @param  ssh_bind     The ssh server bind to use.
+ * @param  ssh_bind_o     The ssh server bind to use.
  */
-LIBSSH_API void ssh_bind_fd_toaccept(ssh_bind ssh_bind);
+LIBSSH_API void ssh_bind_fd_toaccept(ssh_bind ssh_bind_o);
 
 /**
  * @brief Accept an incoming ssh connection and initialize the session.
  *
- * @param  ssh_bind     The ssh server bind to accept a connection.
+ * @param  ssh_bind_o     The ssh server bind to accept a connection.
  * @param  session			A preallocated ssh session
  * @see ssh_new
  * @return A newly allocated ssh session, NULL on error.
  */
-LIBSSH_API int ssh_bind_accept(ssh_bind ssh_bind, ssh_session session);
+LIBSSH_API int ssh_bind_accept(ssh_bind ssh_bind_o, ssh_session session);
 
 /**
  * @brief Free a ssh servers bind.
  *
- * @param  ssh_bind     The ssh server bind to free.
+ * @param  ssh_bind_o     The ssh server bind to free.
  */
-LIBSSH_API void ssh_bind_free(ssh_bind ssh_bind);
+LIBSSH_API void ssh_bind_free(ssh_bind ssh_bind_o);
 
 /**
  * @brief Exchange the banner and cryptographic keys.
diff --git a/include/libssh/sftp.h b/include/libssh/sftp.h
index 0293f29b..403d0c57 100644
--- a/include/libssh/sftp.h
+++ b/include/libssh/sftp.h
@@ -243,11 +243,11 @@ LIBSSH_API unsigned int sftp_extensions_get_count(sftp_session sftp);
  *
  * @param  sftp         The sftp session to use.
  *
- * @param  index        The index number of the extension name you want.
+ * @param  indexn        The index number of the extension name you want.
  *
  * @return              The name of the extension.
  */
-LIBSSH_API const char *sftp_extensions_get_name(sftp_session sftp, unsigned int index);
+LIBSSH_API const char *sftp_extensions_get_name(sftp_session sftp, unsigned int indexn);
 
 /**
  * @brief Get the data of the extension provided by the server.
@@ -256,11 +256,11 @@ LIBSSH_API const char *sftp_extensions_get_name(sftp_session sftp, unsigned int
  *
  * @param  sftp         The sftp session to use.
  *
- * @param  index        The index number of the extension data you want.
+ * @param  indexn        The index number of the extension data you want.
  *
  * @return              The data of the extension.
  */
-LIBSSH_API const char *sftp_extensions_get_data(sftp_session sftp, unsigned int index);
+LIBSSH_API const char *sftp_extensions_get_data(sftp_session sftp, unsigned int indexn);
 
 /**
  * @brief Check if the given extension is supported.
@@ -284,7 +284,7 @@ LIBSSH_API int sftp_extension_supported(sftp_session sftp, const char *name,
 
 /**
  * @brief Open a directory used to obtain directory entries.
- *
+ 
  * @param session       The sftp session handle to open the directory.
  * @param path          The path of the directory to open.
  *