321 changed files with 8518 additions and 31963 deletions
--- a/.gitignore
+++ b/.gitignore
@ -24,6 +24,7 @@ ltmain.sh
 missing
 ssh2_sample
 libssh2-*.tar.gz
+INSTALL
 install-sh
 *.o
 *.lo
@ -31,5 +32,3 @@ install-sh
 mkinstalldirs
 tags
 libssh2.pc
-TAGS
-*~
--- a/.travis.yml
+++ b/.travis.yml
@ -1,75 +0,0 @@
-# Copyright (c) 2014 Alexander Lamaison <alexander.lamaison@gmail.com>
-#
-# Redistribution and use in source and binary forms,
-# with or without modification, are permitted provided
-# that the following conditions are met:
-#
-#   Redistributions of source code must retain the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer.
-#
-#   Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the following
-#   disclaimer in the documentation and/or other materials
-#   provided with the distribution.
-#
-#   Neither the name of the copyright holder nor the names
-#   of any other contributors may be used to endorse or
-#   promote products derived from this software without
-#   specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-# OF SUCH DAMAGE.
-
-language: c
-
-compiler:
-  - gcc
-  - clang
-
-env:
-  matrix:
-   - ADDRESS_SIZE=64 CRYPTO_BACKEND=OpenSSL BUILD_SHARED_LIBS=OFF ENABLE_ZLIB_COMPRESSION=OFF
-   - ADDRESS_SIZE=64 CRYPTO_BACKEND=OpenSSL BUILD_SHARED_LIBS=ON ENABLE_ZLIB_COMPRESSION=OFF
-   - ADDRESS_SIZE=64 CRYPTO_BACKEND=OpenSSL BUILD_SHARED_LIBS=OFF ENABLE_ZLIB_COMPRESSION=ON
-   - ADDRESS_SIZE=64 CRYPTO_BACKEND=OpenSSL BUILD_SHARED_LIBS=ON ENABLE_ZLIB_COMPRESSION=ON
-   - ADDRESS_SIZE=64 CRYPTO_BACKEND=Libgcrypt BUILD_SHARED_LIBS=OFF ENABLE_ZLIB_COMPRESSION=OFF
-   - ADDRESS_SIZE=64 CRYPTO_BACKEND=Libgcrypt BUILD_SHARED_LIBS=ON ENABLE_ZLIB_COMPRESSION=OFF
-   - ADDRESS_SIZE=64 CRYPTO_BACKEND=Libgcrypt BUILD_SHARED_LIBS=OFF ENABLE_ZLIB_COMPRESSION=ON
-   - ADDRESS_SIZE=64 CRYPTO_BACKEND=Libgcrypt BUILD_SHARED_LIBS=ON ENABLE_ZLIB_COMPRESSION=ON
-   - ADDRESS_SIZE=32 CRYPTO_BACKEND=OpenSSL BUILD_SHARED_LIBS=OFF ENABLE_ZLIB_COMPRESSION=OFF
-   - ADDRESS_SIZE=32 CRYPTO_BACKEND=OpenSSL BUILD_SHARED_LIBS=ON ENABLE_ZLIB_COMPRESSION=OFF
-   - ADDRESS_SIZE=32 CRYPTO_BACKEND=OpenSSL BUILD_SHARED_LIBS=OFF ENABLE_ZLIB_COMPRESSION=ON
-   - ADDRESS_SIZE=32 CRYPTO_BACKEND=OpenSSL BUILD_SHARED_LIBS=ON ENABLE_ZLIB_COMPRESSION=ON
-   - ADDRESS_SIZE=32 CRYPTO_BACKEND=Libgcrypt BUILD_SHARED_LIBS=OFF ENABLE_ZLIB_COMPRESSION=OFF
-   - ADDRESS_SIZE=32 CRYPTO_BACKEND=Libgcrypt BUILD_SHARED_LIBS=ON ENABLE_ZLIB_COMPRESSION=OFF
-   - ADDRESS_SIZE=32 CRYPTO_BACKEND=Libgcrypt BUILD_SHARED_LIBS=OFF ENABLE_ZLIB_COMPRESSION=ON
-   - ADDRESS_SIZE=32 CRYPTO_BACKEND=Libgcrypt BUILD_SHARED_LIBS=ON ENABLE_ZLIB_COMPRESSION=ON
-
-before_install:
-  - sudo add-apt-repository --yes ppa:kalakris/cmake
-  - sudo apt-get update
-  - sudo apt-get -y install cmake
-  - if [ $ADDRESS_SIZE = '64' ]; then sudo apt-get install -y libgcrypt11-dev libssl-dev zlib1g-dev; fi
-  - if [ $ADDRESS_SIZE = '32' ]; then sudo apt-get install -y linux-libc-dev linux-libc-dev:i386; fi
-  - if [ $ADDRESS_SIZE = '32' ]; then sudo apt-get install -y gcc-multilib libgcrypt11-dev:i386 libssl-dev:i386 zlib1g-dev:i386; fi
-  - if [ $ADDRESS_SIZE = '32' ]; then export TOOLCHAIN_OPTION="-DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-Linux-32.cmake"; fi
-
-install:
-  - mkdir bin
-  - cd bin
-
-script:
-  - cmake $TOOLCHAIN_OPTION -DCRYPTO_BACKEND=$CRYPTO_BACKEND -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS -DENABLE_ZLIB_COMPRESSION=$ENABLE_ZLIB_COMPRESSION .. && cmake --build . && CTEST_OUTPUT_ON_FAILURE=1 cmake --build . --target test && cmake --build . --target package
--- a/docs/AUTHORS
+++ b/docs/AUTHORS
@ -6,57 +6,31 @@
 Adam Gobiowski
 Alexander Holyapin
 Alexander Lamaison
-Alfred Gebert
 Ben Kibbey
 Bjorn Stenborg
 Carlo Bramini
-Cristian Rodríguez
-Daiki Ueno
 Dan Casey
 Dan Fandrich
 Daniel Stenberg
-Dave Hayden
-Dave McCaldon
 David J Sullivan
 David Robins
-Dmitry Smirnov
-Douglas Masterson
 Edink Kadribasic
 Erik Brossler
 Francois Dupoux
-Gellule Xg
-Grubsky Grigory
 Guenter Knauf
 Heiner Steven
-Henrik Nordstrom
 James Housleys
-Jasmeet Bagga
 Jean-Louis Charton
-Jernej Kovacic
-Joey Degges
-John Little
-Jose Baars
 Jussi Mononen
-Kamil Dudka
-Lars Nordin
 Mark McPherson
-Mark Smith
 Markus Moeller
-Matt Lilley
-Matthew Booth
-Maxime Larocque
 Mike Protts
 Mikhail Gusarov
 Neil Gierman
 Olivier Hervieu
-Paul Howarth
-Paul Querna
 Paul Veldkamp
-Peter Krempa
 Peter O'Gorman
 Peter Stuge
-Pierre Joye
-Rafael Kitover
 Romain Bondue
 Sara Golemon
 Satish Mittal
@ -64,16 +38,10 @@ Sean Peterson
 Selcuk Gueney
 Simon Hart
 Simon Josefsson
-Sofian Brabez
 Steven Ayre
-Steven Dake
 Steven Van Ingelgem
-TJ Saunders
-Tommy Lindgren
 Tor Arntsen
 Vincent Jaulin
-Vincent Torri
 Vlad Grachov
 Wez Furlong
 Yang Tse
-Zl Liu
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,101 +0,0 @@
-# Copyright (c) 2014, 2015  Alexander Lamaison <alexander.lamaison@gmail.com>
-#
-# Redistribution and use in source and binary forms,
-# with or without modification, are permitted provided
-# that the following conditions are met:
-#
-#   Redistributions of source code must retain the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer.
-#
-#   Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the following
-#   disclaimer in the documentation and/or other materials
-#   provided with the distribution.
-#
-#   Neither the name of the copyright holder nor the names
-#   of any other contributors may be used to endorse or
-#   promote products derived from this software without
-#   specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-# OF SUCH DAMAGE.
-
-cmake_minimum_required(VERSION 2.8.11)
-
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-
-project(libssh2 C)
-set(PROJECT_URL "https://www.libssh2.org/")
-set(PROJECT_DESCRIPTION "The SSH library")
-
-option(BUILD_SHARED_LIBS "Build Shared Libraries" OFF)
-
-# Parse version
-
-file(READ ${CMAKE_CURRENT_SOURCE_DIR}/include/libssh2.h _HEADER_CONTENTS)
-string(
-  REGEX REPLACE ".*#define LIBSSH2_VERSION[ \t]+\"([^\"]+)\".*" "\\1"
-  LIBSSH2_VERSION "${_HEADER_CONTENTS}")
-string(
-  REGEX REPLACE ".*#define LIBSSH2_VERSION_MAJOR[ \t]+([0-9]+).*" "\\1"
-  LIBSSH2_VERSION_MAJOR "${_HEADER_CONTENTS}")
-string(
-  REGEX REPLACE ".*#define LIBSSH2_VERSION_MINOR[ \t]+([0-9]+).*" "\\1"
-  LIBSSH2_VERSION_MINOR "${_HEADER_CONTENTS}")
-string(
-  REGEX REPLACE ".*#define LIBSSH2_VERSION_PATCH[ \t]+([0-9]+).*" "\\1"
-  LIBSSH2_VERSION_PATCH "${_HEADER_CONTENTS}")
-
-if(NOT LIBSSH2_VERSION OR
-   NOT LIBSSH2_VERSION_MAJOR MATCHES "^[0-9]+$" OR
-   NOT LIBSSH2_VERSION_MINOR MATCHES "^[0-9]+$" OR
-   NOT LIBSSH2_VERSION_PATCH MATCHES "^[0-9]+$")
-  message(
-    FATAL_ERROR
-    "Unable to parse version from"
-    "${CMAKE_CURRENT_SOURCE_DIR}/include/libssh2.h")
-endif()
-
-include(GNUInstallDirs)
-install(
-  FILES docs/AUTHORS COPYING docs/HACKING README RELEASE-NOTES NEWS
-  DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
-include(max_warnings)
-include(FeatureSummary)
-
-add_subdirectory(src)
-
-option(BUILD_EXAMPLES "Build libssh2 examples" ON)
-if(BUILD_EXAMPLES)
-  add_subdirectory(example)
-endif()
-
-option(BUILD_TESTING "Build libssh2 test suite" ON)
-if(BUILD_TESTING)
-  enable_testing()
-  add_subdirectory(tests)
-endif()
-
-add_subdirectory(docs)
-
-feature_summary(WHAT ALL)
-
-set(CPACK_PACKAGE_VERSION_MAJOR ${LIBSSH2_VERSION_MAJOR})
-set(CPACK_PACKAGE_VERSION_MINOR ${LIBSSH2_VERSION_MINOR})
-set(CPACK_PACKAGE_VERSION_PATCH ${LIBSSH2_VERSION_PATCH})
-set(CPACK_PACKAGE_VERSION ${LIBSSH2_VERSION})
-include(CPack)
--- a/4
+++ b/4
@ -1,8 +1,6 @@
 /* Copyright (c) 2004-2007 Sara Golemon <sarag@libssh2.org>
- * Copyright (c) 2005,2006 Mikhail Gusarov <dottedmag@dottedmag.net>
 * Copyright (c) 2006-2007 The Written Word, Inc.
- * Copyright (c) 2007 Eli Fant <elifantu@mail.ru>
- * Copyright (c) 2009-2014 Daniel Stenberg
+ * Copyright (c) 2009 Daniel Stenberg
 * Copyright (C) 2008, 2009 Simon Josefsson
 * All rights reserved.
 *
--- a/docs/HACKING
+++ b/docs/HACKING
--- a/Makefile.OpenSSL.inc
+++ b/Makefile.OpenSSL.inc
@ -1,2 +0,0 @@
-CRYPTO_CSOURCES = openssl.c
-CRYPTO_HHEADERS = openssl.h
--- a/Makefile.WinCNG.inc
+++ b/Makefile.WinCNG.inc
@ -1,2 +0,0 @@
-CRYPTO_CSOURCES = wincng.c
-CRYPTO_HHEADERS = wincng.h
--- a/Makefile.am
+++ b/Makefile.am
@ -1,9 +1,6 @@
 AUTOMAKE_OPTIONS = foreign nostdinc

-SUBDIRS = src tests docs
-if BUILD_EXAMPLES
-SUBDIRS += example
-endif
+SUBDIRS = src example tests docs

 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libssh2.pc
@ -14,38 +11,23 @@ include_HEADERS =			\
 	include/libssh2_sftp.h

 NETWAREFILES =  nw/keepscreen.c \
-	nw/nwlib.c \
-	nw/GNUmakefile \
-	nw/test/GNUmakefile
+ nw/Makefile \
+ nw/Makefile.netware \
+ nw/nwlib.c \
+ nw/test/Makefile.netware

 DSP = win32/libssh2.dsp
 VCPROJ = win32/libssh2.vcproj

 DISTCLEANFILES = $(DSP)

-VMSFILES = vms/libssh2_make_example.dcl vms/libssh2_make_help.dcl	\
-vms/libssh2_make_kit.dcl vms/libssh2_make_lib.dcl vms/man2help.c	\
-vms/readme.vms vms/libssh2_config.h
+WIN32FILES = win32/Makefile.win32 win32/libssh2.dsw     \
+win32/config.mk win32/Makefile win32/test/Makefile.win32 \
+win32/libssh2_config.h win32/tests.dsp win32/rules.mk $(DSP) \
+win32/msvcproj.head win32/msvcproj.foot

-WIN32FILES = win32/GNUmakefile win32/test/GNUmakefile		\
-win32/libssh2_config.h win32/config.mk win32/rules.mk		\
-win32/Makefile.Watcom win32/libssh2.dsw win32/tests.dsp $(DSP)	\
-win32/msvcproj.head win32/msvcproj.foot win32/libssh2.rc
-
-OS400FILES = os400/README400 os400/initscript.sh os400/make.sh		\
-os400/make-src.sh os400/make-rpg.sh os400/make-include.sh		\
-os400/os400sys.c os400/ccsid.c						\
-os400/libssh2_config.h os400/macros.h os400/libssh2_ccsid.h		\
-os400/include/alloca.h os400/include/sys/socket.h os400/include/stdio.h	\
-os400/libssh2rpg/libssh2.rpgle.in					\
-os400/libssh2rpg/libssh2_ccsid.rpgle.in					\
-os400/libssh2rpg/libssh2_publickey.rpgle				\
-os400/libssh2rpg/libssh2_sftp.rpgle					\
-Makefile.os400qc3.inc
-
-EXTRA_DIST = $(WIN32FILES) buildconf $(NETWAREFILES) get_ver.awk \
- maketgz NMakefile RELEASE-NOTES libssh2.pc.in $(VMSFILES) config.rpath \
- CMakeLists.txt cmake $(OS400FILES)
+EXTRA_DIST = $(WIN32FILES) buildconf $(NETWAREFILES) get_ver.awk HACKING \
+ maketgz NMakefile TODO RELEASE-NOTES libssh2.pc.in

 ACLOCAL_AMFLAGS = -I m4

@ -87,9 +69,6 @@ gen-coverage:
 coverage: init-coverage build-coverage gen-coverage

 # DSP/VCPROJ generation adapted from libcurl
-# only OpenSSL and WinCNG are supported with this build system
-CRYPTO_CSOURCES = openssl.c wincng.c
-CRYPTO_HHEADERS = openssl.h wincng.h
 # Makefile.inc provides the CSOURCES and HHEADERS defines
 include Makefile.inc

--- a/Makefile.inc
+++ b/Makefile.inc
@ -1,6 +1,5 @@
 CSOURCES = channel.c comp.c crypt.c hostkey.c kex.c mac.c misc.c \
 packet.c publickey.c scp.c session.c sftp.c userauth.c transport.c \
- version.c knownhost.c agent.c $(CRYPTO_CSOURCES) pem.c keepalive.c global.c
+ version.c knownhost.c agent.c openssl.c libgcrypt.c pem.c

-HHEADERS = libssh2_priv.h $(CRYPTO_HHEADERS) transport.h channel.h comp.h \
- mac.h misc.h packet.h userauth.h session.h sftp.h crypto.h
+HHEADERS = libssh2_priv.h openssl.h libgcrypt.h transport.h channel.h comp.h mac.h misc.h
--- a/Makefile.libgcrypt.inc
+++ b/Makefile.libgcrypt.inc
@ -1,2 +0,0 @@
-CRYPTO_CSOURCES = libgcrypt.c
-CRYPTO_HHEADERS = libgcrypt.h
--- a/Makefile.os400qc3.inc
+++ b/Makefile.os400qc3.inc
@ -1,2 +0,0 @@
-CRYPTO_CSOURCES = os400qc3.c
-CRYPTO_HHEADERS = os400qc3.h
--- a/693
+++ b/693
@ -1,3 +1,692 @@
-The old NEWS file.
+Version 1.2.4 (February 13, 2010)

-NEWS is now generated from git and put into the release tarballs.
+ o Resolve compile issues on Solaris x64 and UltraSPARC
+ o Allow compiling with OpenSSL when AES isn't available
+ o Fix Tru64 socklen_t compile issue with example/direct_tcpip.c
+
+Version 1.2.3 (February 3, 2010)
+
+ o Added libssh2_trace_sethandler()
+ o Added the direct_tcpip.c example
+ o Fixed memory leak in userauth_publickey
+ o Added support for authentication via SSH-Agent.  By Daiki Ueno.
+
+ o Respond to unknown SSH_MSG_GLOBAL_REQUEST/SSH_MSG_CHANNEL_REQUEST
+   with SSH_MSG_REQUEST_FAILURE/SSH_MSG_CHANNEL_FAILURE in order to
+   make (at least) OpenSSH server keepalive work.  Before OpenSSH
+   servers (configured with a positive ClientAliveInterval) would
+   terminate connections against libssh2 clients because libssh2 did
+   not respond properly to the request.  By Simon Josefsson.
+
+Version 1.2.2 (November 16, 2009)
+
+* This release includes the following changes:
+
+  o Fix crash when server sends an invalid SSH_MSG_IGNORE message.
+    Reported by Bob Alexander <balexander@expressor-software.com> in
+    <http://thread.gmane.org/gmane.network.ssh.libssh2.devel/2530>.
+    By Simon Josefsson.
+
+  o Support for the "aes128-ctr", "aes192-ctr", "aes256-ctr" ciphers
+    as per RFC 4344 for libgcrypt and OpenSSL.  They are now the
+    preferred ciphers.  By Simon Josefsson.
+
+  o Support for the "arcfour128" cipher as per RFC 4345 for libgcrypt
+    and OpenSSL.  It is preferred over the normal "arcfour" cipher
+    which is somewhat broken.  By Simon Josefsson.
+
+  o Add support for GCC visibility features.  By Cristian Rodríguez.
+
+  o Fix libssh2_channel_forward_accept.  By Juzna.
+
+  o Generate Win32 files correctly.   By Peter Stuge.
+
+  o Fix permission issue in ssh2 self test.  By Dan Fandrich.
+
+  o Use memmove instead of memcpy in one place which copies
+    overlapping memory areas.
+
+  o Cleanup hard coding of cipher modes in libgcrypt backend.  By Simon.
+
+  o Added man page for libssh2_knownhost_free.  By Daniel.
+
+Version 1.2.1 (September 28, 2009)
+
+* This release includes the following changes:
+
+  o generate and install libssh2.pc
+
+  ... and the following bugfixes:
+
+  o proper return codes returned from several functions
+  o return EAGAIN internal cleanup
+  o added knownhost.c to windows makefiles
+  o pass private-key to OpenSSL as a filename with BIO_new_file().
+  o make libssh2_scp_send/recv do blocking mode correctly
+  o libssh2_channel_wait_closed() could hang
+  o libssh2_channel_read_ex() must return 0 when closed
+  o added gettimeofday() function for win32 for the debug trace outputs
+  o transport layer bug causing invalid -39 (LIBSSH2_ERROR_BAD_USE) errors
+  o scp examples now loop correctly over libssh2_channel_write()
+
+* (August 29 2009) Daniel Stenberg:
+
+ - I fixed all code to use the recently added dedicated linked list functions
+   instead of doing the same stuff spread out all over.
+
+ - I also fixed a few cases where local variables where used to keep memory
+   but was used to keep state for re-invokes due to non-blocking situations
+   which would lead to segfaults.
+
+Version 1.2 (August 10, 2009)
+-----------------------------
+
+* (August 02 2009) Alexander Lamaison:
+
+ - changed _libssh2_rsa_new_private and _libssh2_rsa_new_private so that they
+   no longer use the OpenSSL functions that take a FILE* argument.  Passing
+   CRT-created objects across a DLL boundary causes crashes on Windows of the
+   DLL and the client aren't linked to the exact same verison of the CRT. Now
+   we pass the keys as strings to avoid this issue.
+
+* (May 29 2009) Daniel Stenberg:
+
+ - Updated the knownhost API and there are now 9 functions, and all of them
+   have man pages. The libssh2.h now defines HAVE_LIBSSH2_KNOWNHOST_API to
+   ease things for applications to check for the correct release before trying
+   to use it.
+
+* (May 23 2009) Daniel Stenberg:
+
+ - Anonymous bug report #2795816 revealed that doing subsequent
+   libssh2_sftp_init() calls on the same session failed.
+
+* (May 20 2009) Daniel Stenberg:
+
+  - made libssh2_sftp_write() properly deal with huge/any sized input buffers.
+
+  - fixed libssh2_channel_write_ex() to return the correct return code, and
+    deal with sending off huge buffers better
+
+* (May 7 2009) Daniel Stenberg:
+
+  - linked list code. I got a bit tired of the fact that we don't have any
+    generic linked-list functions within libssh2 so I wrote up the first embryo
+    for one that I use for this new functionality. The plan would then be to
+    move all existing code that uses linked lists to use this new set.
+
+  - base64 encode. I had to add a base64 encoding function which was missing
+    in the code base so it helps to "bloat" my patch.
+
+  - The knownhost API is currently:
+
+    _init() - init a bundle of known hosts
+    _add()  - add a known host
+    _del()  - delete a known host
+    _free() - free an entire bundle of known hosts
+    _check() - check if a host+key is present in the bundle
+
+    The convenience function:
+
+    _parsefile() - reads a ~/.ssh/known_hosts file and add all entries to the
+                   given bundle
+
+   - there's no docs other than some comments in the code/headers yet
+
+  - the patch includes changes to example/simple/ssh2_exec.c that makes use of
+    a few of these functions. Using that I've verified that the functions in
+    fact can verify my localhost's key agains my ~/.ssh/known_hosts file
+
+* (Apr 30 2009) Daniel Stenberg:
+
+  Markus posted a bug report about a bad 0-return from libssh2_channel_read:
+  http://libssh2.haxx.se/mail/libssh2-devel-archive-2009-04/0076.shtml
+
+  And it was indeed a bad loop that terminated too early due to a receveived
+  close packet.
+
+* (Apr 14 2009) Daniel Stenberg:
+
+  libssh2_poll() and libssh2_poll_channel_read() are now considered and
+  documented deprecated and they will be removed at next soname bump. It also
+  saves us from fixing some rather quirky bugs in libssh2_poll()...
+
+
+Version 1.1 (April 2, 2009)
+---------------------------
+
+- (Mar 28 2009) Daniel Stenberg:
+
+  Jean-Louis Charton found a memory leak in
+  libssh2_userauth_hostbased_fromfile_ex()
+
+- (Mar 25 2009) Daniel Stenberg:
+
+   * Renamed the functions in src/transport.c to be _libssh2_transport_ prefixed
+     and introduced a transport.h header.
+
+   * Fixed the blocking mode to only change behavior not the actual underlying
+     socket mode so we now always work with non-blocking sockets. This also
+     introduces a new rule of thumb in libssh2 code: we don't call the
+     external function calls internally. We use the internal (non-blocking)
+     ones!
+
+   * libssh2_channel_receive_window_adjust2 was added and
+     libssh2_channel_receive_window_adjust is now deprecated
+
+   * Introduced "local" header files with prototypes etc for different parts
+     instead of cramming everything into libssh2_priv.h. channel.h is the
+     first.
+
+- (Mar 19 2009) Daniel Stenberg: based on a patch by "E L" we now use errno
+  properly after recv() and send() calls (that internally are now known as
+  _libssh2_recv() and _libssh2_send()) so that the API and more works fine on
+  windows too!
+
+- (Mar 17 2009) Simon Josefsson:
+
+  Added a Libtool -export-symbols-regex flag to reduce the number of
+  exported symbols in shared libraries.  Reported by Mikhail Gusarov.
+
+- (Mar 16 2009) Daniel Stenberg:
+
+  I renamed a few man pages to match the exact name of the functions they
+  describe. I also added template versions for the 13 functions that
+  previously lacked man pages. While these don't contain any docs just yet, it
+  will now be easier to add the info as the foundation is there!
+
+- (Mar 15 2009) Daniel Stenberg:
+
+  * libssh2_channel_read_ex() was simplified and enhanced. It now adjusts the
+    window less frequent and uses much larger window that now allows MUCH
+    faster transfers.
+
+  * SCP send/recv now allow file names with whitespaces etc, thanks to a patch
+    by Heiner Steven
+
+- (Mar 13 2009) Daniel Stenberg: Cleanups, that do seem to have boosted SFTP
+  download performance up to 300% in some tests:
+
+  * cut off "_ex" from several internal function names
+
+  * corrected some log outputs
+
+  * simplified libssh2_channel_read_ex() and made it much faster in the process
+
+  * cut out {{{ and }}} comments that were incorrect anyway
+
+  * fixed sftp_packet_ask() to return the correct packet by using memcmp() and
+    not strncmp()
+
+  * fixed mkdir()'s wait for packet to use the correct request_id - it
+    semi-worked previously because strncmp() in sftp_packet_ask() made it
+    match far too easily.
+
+  * took away the polling functionality from sftp_packet_ask() since it wasn't
+    used
+
+- (Mar 7 2009) Olivier Hervieu pointed out a flaw in the
+  libssh2_channel_x11_req_ex() function that made it produce a crappy random
+  chunk of data. Peter Stuge improved the fix to not do out-of-boundary
+  writes. I (Daniel Stenberg) replaced the snprintf() with a plain sprintf()
+  since the size argument wasn't adding anything anyway.
+
+- (Feb 23 2009) Added libssh2_version()
+
+- (Feb 20 2009) libssh2_channel_direct_tcpip_ex() bug #1902169 fixed, which
+  caused it to fail when called a second time.
+
+- (Feb 12 2009) Romain Bondue extended Markus Moeller fix from Feb 8, based on
+  a previous (uncommitted) patch by Erik Brossler. It improves
+  libssh2_channel_write_ex in blocking situations when the socket is set non-
+  blocking.
+
+- (Feb 8 2009) Markus Moeller fixed a flaw in libssh2_channel_write_ex() that
+  would occur on EAGAIN situations.
+
+Version 1.0 (December 26 2008)
+------------------------------
+
+- (Dec 20 2008) Based on Alexander Lamaison's patch, there's now a new
+  function called libssh2_sftp_tell64() that returns the 64 bit file offset,
+  as the existing libssh2_sftp_tell() only returns a size_t.
+
+- (Dec 18 2008) Markus Moeller fixed the issue also reported by Alexander
+  Lamaison which caused SFTP reads with large buffers to fail.
+
+- Several flaws were fixed that prevented at least SFTP to work reliably
+
+- Vlad Grachov brought the new function called
+  libssh2_session_block_directions() which returns a bitmask for what
+  directions the connection blocks. It is to be used applications that use
+  non-blocking sockets and when a libssh2 function returns
+  LIBSSH2_ERROR_EAGAIN this function can be used to figure out in which
+  direction the socket would block and thus it can wait for the socket to
+  again be ready for communication in that direction before it calls libssh2
+  again.
+
+- Vincent Jaulin brought the new libssh2_channel_request_pty_size_ex()
+  function.
+
+- Carlo Bramini fixed the build for msys+mingw. Bug #1943976.
+
+- Neil Gierman provided improved Visual Studio 2008 code in bug #1946268
+
+- Bug #1862727 fixed libssh2_poll() to work on windows (by defining
+  HAVE_SELECT).
+
+- Based on bug #1815692, we introduce libssh2_sftp_seek64() that allows
+  seeking beyond the 2GB margin even on 32bit machines.
+
+- Based on a patch in bug #1878059 by Steven Ayre libssh2 now parses >2GB file
+  sizes when downloading SCP files.
+
+- Bug #2064371 pointed out that the SSH2 banner may not use dash
+  ('-'). Reported by Bjorn Stenborg.
+
+- Sean Peterson fixed a key re-exchange bug:
+  http://daniel.haxx.se/projects/libssh2/mail/libssh2-devel-archive-2008-06/0002.shtml
+
+- Mike Protts filed the bug report #1908724 that identified and fixed a problem
+  with SFTP stat on files >4GB in size. Previously it used 32bit math only.
+
+- Removed a stderr debug message that was accidentally left in (bug #1863153)
+
+- OpenSSL and libz detection changed to make cross-compiling to Mingw
+  work.  See README for parameters to use if the auto-detection does
+  not work for you.  From Simon Josefsson.
+
+- Simon Josefsson added a self-test that uses libssh2 to connect to a
+  local sshd (only enabled if if OpenSSH is installed).
+
+Version 0.18 (November 11 2007)
+-------------------------------
+
+- Various changes that improve non-blocking operations and prevent stalls.
+  Especially noticable on Windows since libssh2 just didn't work properly
+  non-blocking on Windows before.
+
+- Peter O'Gorman reported how a SCP transfer would hang for him, and it was
+  fairly easy reproducable. One bug was in the transport layer, ignoring to
+  read more data while there was data left even though it couldn't decrypt the
+  data that was left due to it being too little... The other bug was in the
+  channel layer, where the libssh2_channel_receive_window_adjust() function
+  missed to set the state variables at times and thus this function would
+  misbehave on repeated invokes.
+
+- Changed the signature of libssh2_channel_setenv_ex to add const to the
+  "varname" parameter (Dan Fandrich)
+
+- Satish Mittal and David J Sullivan fixed an infinit recv() loop in
+  libssh2_banner_receive()
+
+Version 0.17 (August 6 2007)
+----------------------------
+Changes since previous version include:
+
+   o Re-indented the source code with this GNU indent setup:
+
+      --braces-on-if-line
+      --braces-after-struct-decl-line
+      --space-after-cast
+      --line-length 79
+      --comment-line-length 79
+      --cuddle-else
+      --no-tabs
+      --tab-size 8
+      --indent-level 4
+      --no-space-after-for
+      --space-after-if
+      --space-after-while
+      --no-space-after-function-call-names
+
+Version 0.16 (August 6 2007)
+----------------------------
+Changes since previous version include:
+
+   o CRLF stripping fix for PEM reading
+   o libssh2_scp_recv() error message fix
+   o added HACKING as an initial attempt to describe our source code format
+   o new public defines in include/libssh2.h to allow applictions to figure out
+     version number etc
+   o new script (maketgz) to build releases with
+   o updated files for building with MSVC and mingw
+   o keyboard-interactive would always fail due to claimed memory problem
+   o a few minor memory leaks fixed
+   o libssh2_poll() no longer relies on C99 features
+   o AIX 4 and 5 now supports non-blocking sockets
+   o large file magic checks in configure
+   o LIBSSH2_APINO was removed from the public header file
+
+This release would not have been possible without these friendly contributors:
+
+   James Housley, Simon Josefsson, Dan Fandrich, Guenter Knauf and I too did
+   some poking. (Sorry if I forgot anyone I should've mentioned here.)
+
+Of course we would have nothing without the great work by Sara Golemon that
+we're extending and building upon.
+
+Version 0.15 (June 15 2007)
+---------------------------
+  Added libssh2_sftp_readdir_ex() and updated LIBSSH2_APINO to
+  200706151200 (James Housley)
+
+  Converted all of the libssh2 code to be able to work in non-blocking
+  mode.  This included some public API changes, listed below (James Housley)
+    Changed function return values:
+     int libssh2_session_free()
+     int libssh2_publickey_shutdown()
+     ssize_t libssh2_channel_read_ex()
+     ssize_t libssh2_channel_write_ex()
+
+    Added functions:
+     libssh2_session_last_errno(), libssh2_channel_handle_extended_data2(),
+     libssh2_channel_wait_closed(), libssh2_channel_wait_eof(),
+     libssh2_session_set_blocking()
+
+    Removed functions:
+     libssh2_channel_readnb_ex(), libssh2_channel_writenb_ex(),
+     libssh2_sftp_readnb(), libssh2_sftp_writenb(),
+     libssh2_sftp_mkdirnb_ex()
+
+  Added the following functions for non-blocking operations: (Daniel Stenberg)
+   libssh2_channel_readnb_ex()
+   libssh2_channel_writenb_ex()
+   libssh2_sftp_readnb()
+   libssh2_sftp_writenb()
+
+  Size parameter changed from 'int' to 'unsigned int' in several
+  public APIs.
+
+  Added (a few) man pages in docs/. (Daniel Stenberg)
+
+  Maximum SSH packet size is now some 35000 bytes.
+
+  Private include files are now in src/ and only public headers are in
+  include/.  (Daniel Stenberg)
+
+  Automake and libtool are being used (increased portability). (Daniel
+  Stenberg)
+
+  Fixed OpenSSL detection using pkg-config. (Daniel Stenberg)
+
+  Simple self test added to tests/. (Simon Josefsson)
+
+  Libgcrypt can now be used instead of OpenSSL if you specify
+  --with-libgcrypt.  (Simon Josefsson)
+
+  Fixed a memory leak in the packet handling, and better handle out of
+  memory situations. (Dan Fandrich)
+
+  Made libssh2 build with OpenSSL 0.9.6. (Dan Fandrich)
+
+  Improved portability to Solaris related to -lsocket and
+  -lnsl. (Simon Josefsson)
+
+  Clean up of README, INSTALL, NEWS, added ChangeLog. (Simon
+  Josefsson)
+
+  Improve debugging code.  Avoids many #ifdef's.
+
+  Improved session closing to avoid potentially truncated files on
+  OpenSSH servers (Dan Fandrich)
+
+  Made some function parameters in the API const (Dan Fandrich)
+
+Version 0.14
+------------
+
+  Plug leaks in EVP cipher init/shutdown. (Selcuk Gueney)
+
+  Allow socket_fd == 0 in libssh2_session_startup(). (puudeli)
+
+  Swap ordering of packet_add/packet-inspection to avoid inspect after
+  free. (Selcuk)
+
+  Swap KEX_INIT ordering, send our KEX_INIT first.
+
+  Add check for oportunistic KEX_INIT packets.  Burn bad guess if necessary.
+
+  Fix OpenSSL detection using pkg-config. (Dan Casey)
+
+Version 0.13
+------------
+
+  Fixed channel not being marked closed when CHANNEL_CLOSE package cannot be
+  sent. (David Robins)
+
+  Fixed payload packet allocation bug when invalid packet length
+  received. (David Robins)
+
+  Fixed `make install' target for MacOSX.
+
+  Add terminating NULL character to readlink()/realpath() results.
+
+  BugFix#1436593: Apply build options for HPUX targets.
+
+Version 0.12
+------------
+
+  Added support for publickey subsytem (not the same as publickey auth).
+
+  Fix x11_req.  Multiple packet_len issues and error handling logic.
+    (Thanks Simon Hart)
+
+  Fix generation of 'e' portion of Diffie-Hellman keyset.
+
+  Use appropriate order for BN_rand() rather than fixed group1-specific value.
+
+  Re-fixed libssh2_sftp_rename_ex()
+
+  Transport had right packet_len, but sftp layer still had extra 4 bytes.
+
+  Fixed build with newer OpenSSL headers.
+
+  Added extern "C" declarations to libssh2_sftp.h for C++ compatability.
+
+Version 0.11
+------------
+
+  Added libssh2_chnnale_get_exit_status() -- Mikhail
+
+  Added libssh2_channel_wait_closed() -- Mikhail
+
+  Added libssh2_userauth_keyboard_interactive_ex() -- Mikhail
+
+  Added libssh2_channel_receive_window_adjust() to be able to increase the
+  size of the receive window.
+
+  Added queueing for small window_adjust packets to avoid unnecessary packet
+  conversation.
+
+  Fixed libssh2_sftp_rename_ex() to only send flags parameter if version >= 5
+  negotiated (not currently possible, but will be and might as well keep the
+  API consistent).
+
+Version 0.10
+------------
+
+  Added developer debugging hooks.  See --enable-debug-* options to ./configure
+
+  Ignore extended data in the SFTP layer.  With no other mechanism to deal
+  with that data it'd just fill up and get stuck.
+
+  (Re)Fixed channel_write() to provide an opportunity for window space to
+  become available again.
+
+  (Re)Fixed SFTP INIT to send the correct SFTP packet length.
+
+  Fixed segfault when client and host can't agree on a hostkey/crypt/mac/comp
+  method. (Thanks puudeli)
+
+  Fixed major issue with sftp packet buffering mechanism.  Using wrong
+  blocking semantics. (No puudeli, YOU the man)
+
+  Reduced busy-looping of libssh2_sftp_packet_requirev.
+
+Version 0.9
+-----------
+
+  Changed blocking_read to only block as much as necessary and not an
+  arbitrary length of time. (Thanks Felix)
+
+  Fixed SFTP INIT/VERSION to exclude request_id and send correct maximum
+  version number.
+
+  Fixed SFTP to be properly BC with version 1 and 2 servers.
+
+  Fixed libssh2_poll() to recognized closed sessions/channels.
+
+  Fixed libssh2_channel_write_ex() to fully block when set to blocking mode.
+  Return actual bytes written as well.  (Thanks deadem)
+
+  Added tests for -lm and -lsocket and add them when necessary.
+
+  Added libssh2_channel_window_read_ex() and libssh2_channel_window_write_ex()
+  for examining the ssh transport windowing states.
+
+Version 0.8
+-----------
+
+  Fix potential segfault in compression/decompression.
+
+  Fix compatability with older versions of OpenSSL
+
+  Swapped order of none,zlib compression modes to prefer no compression by
+  default.
+
+  Added sys/uio.h for platforms (FBSD) which need it in order to define struct
+  iovec.
+
+  Added libssh2_poll() to check status of sockets/channels/listeners.
+
+  Removed unnecessary inclusion of stdio.h (holdover from debugging)
+
+Version 0.7
+-----------
+
+  Added libssh2_userauth_hostbased_fromfile_ex() for authenticating from hostkey.
+
+  Added configure recognition for MacOSX (Darwin) (Thanks Gabe)
+
+  Fixed extended data identification in libssh2_channel_read().
+
+  Fixed window adjust code.  Hadn't acknowledged adjustments correctly.
+
+  Removed initial_window_size requirement for sending window adjust packet.
+
+
+Version 0.6
+-----------
+
+  Added LIBSSH2_FLAG_SIGPIPE to enable/disable SIGPIPE generated by
+  send()/recv() calls. Default off.
+
+  Added libssh2_session_flag() to set optional session flags.
+
+  Collapsed exchanging_keys/newkeys/authenticated flags into single state
+  attribute.
+
+  Fix zlib compression issue when internal buffer state misses partial sync.
+
+  Fix segfault when libssh2_session_methods() is called prior to
+  session_startup().
+
+  Fixed client to server channel windowing.  Pervent send queue overruns.
+
+  Swapped banner send/receive order (send first, then wait for response).
+
+Version 0.5
+-----------
+
+  *** BC Break ***
+  Reimplemented libssh2_session_methods() to match
+  libssh2_session_method_pref() style
+
+  Fixed libssh2_attr2bin() (effects any setstat style call).
+
+  Fixed authenticating with encrypted private key.
+
+  Fixed authenticating via ssh-dss public key.
+
+  Fixed KEX_INIT cookie and packet padding to use actual random data
+
+  Added DESTDIR support to makefiles (Adam Go³êbiowski -- I hope that
+  character set translates right)
+
+  Added libssh2_channel_forward_listen_ex(), libssh2_channel_forward_cancel(),
+  and libssh2_channel_forward_accept().
+
+  Added ./configure option '--disable-gex-new' to allow using the older
+  group-exchange format
+
+  Added MAC methods hmac-md5 and hmac-md5-96.
+
+Version 0.4
+-----------
+
+  Fixed crash when trying to free sftp_dirhandle data from a filehandle struct.
+
+  Fixed leak in sftp_open_ex(), handle->handle not freed in handle_close().
+
+  Fixed leak in sftp_symlink_ex(), result for READLINK and REALPATH not freed unless there was an error.
+
+  Added libssh2_banner_set(), specify an arbitrary banner to send on introduction.
+
+Version 0.3
+-----------
+
+  Fixed libssh2_channel_read_ex().  Packet loop initialized BEFORE transport polled for new packets (should have been after).
+
+  Fixed blocking issues in scp_send()/scp_recv().
+
+  Fixed degree of indirection in macerror callback.
+
+  Changed packet read mechanism to use a fixed buffer and avoid unnecessary alloc/free calls. (especially while non-block looping)
+
+  Added channel close callback.
+
+  Added SFTP support (Using its own header file: libssh2_sftp.h)
+
+Version 0.2
+-----------
+
+  Changed extended data ignorance mechanism:
+    libssh2_channel_ignore_extended_data() changed to libssh2_channel_handle_extended_data()
+    Macro introduced for backward compatability during beta phase.
+    *** THE LIBSSH2_CHANNEL_IGNORE_EXTENDED_DATA() MACRO WILL BE REMOVED PRIOR TO 1.0 RELEASE ***
+    libssh2_channel_handle_extended_data() may be passed one of three "ignore_mode" constants
+      LIBSSH2_CHANNEL_EXTENDED_DATA_NONE       Default behavior, queue ED packets and return them with read_ex
+      LIBSSH2_CHANNEL_EXTENDED_DATA_IGNORE     Equivalent to libssh2_channel_ignore_extended_data()
+                                               IGNORE will implicitly flush the extended data stream(s)
+      LIBSSH2_CHANNEL_EXTENDED_DATA_MERGE      Calls to channel_read() will check both the standard data stream
+                                               and the extended data stream(s) for the first available packet
+
+  Changed libssh2_session_disconnect_ex() to return an error code when alloc fails
+
+  Added libssh2_channel_flush_ex() and basic macros: ..._flush() ..._flush_stderr()
+    flush_ex accepts either the streamid (0 for standard data, 1 for stderr) or one of the two following constants:
+      LIBSSH2_CHANNEL_FLUSH_ALL                Flush all streams
+      LIBSSH2_CHANNEL_FLUSH_EXTENDED_DATA      Flush all streams EXCEPT the standard data stream
+
+  Added libssh2_session_callback_set() for setting ignore/debug/disconnect/macerror callbacks
+
+  Added libssh2_session_method_pref() to selectively set methods and method preferences.
+
+  Added libssh2_session_methods() to determine what methods were negotiated.
+
+  Added libssh2_session_abstract() for retreiving &session->abstract
+
+  Added libssh2_session_last_error() for retreiving error codes/messages
+
+Version 0.1
+-----------
+
+  Initial Release:
+    KEX methods: diffie-hellman-group14-sha1, diffie-hellman-group-exchange-sha1, diffie-hellman-group1-sha1
+    Hostkey methods: ssh-rsa, ssh-dss
+    Cipher methods: aes256-cbc, rijndael-cbc@lysator.liu.se, aes192-cbc, aes128-cbc, blowfish-cbc, arcfour, cast128-cbc, 3des-cbc, none*
+    Compression methods: zlib, none
+    MAC methods: hmac-sha1, hmac-sha1-96, hmac-ripemd160, hmac-ripemd160@openssh.com none*
+    *Cipher/MAC "none" is disabled by default for security purposes,
+     Use --enable-crypt-none and/or --enable-mac-none with ./configure to enable
--- a/30
+++ b/30
@ -1,33 +1,19 @@
 !include "win32/config.mk"

-!if "$(WITH_WINCNG)" == "1"
-!include "Makefile.WinCNG.inc"
-!else
-!include "Makefile.OpenSSL.inc"
-!endif
-!include "Makefile.inc"
-
-OBJECTS=$(CSOURCES:.c=.obj)
-
 # SUBDIRS=src example
 SUBDIRS=src

-all-sub: win32\objects.mk
+all-sub:
 	-for %D in ($(SUBDIRS)) do $(MAKE) /nologo /f %D/NMakefile BUILD=$(BUILD) SUBDIR=%D all-sub

 clean: 
-	-rmdir 2>NUL /s/q $(TARGET)
-	-del 2>NUL win32\objects.mk
+	-rmdir /s/q $(TARGET)

-real-clean vclean: clean
-	-del 2>NUL libssh2.dll
-	-del 2>NUL libssh2.exp
-	-del 2>NUL libssh2.ilk
-	-del 2>NUL libssh2.lib
-	-del 2>NUL *.pdb
+real-clean: clean
+	-del libssh2.dll
+	-del libssh2.exp
+	-del libssh2.ilk
+	-del libssh2.lib
+	-del *.pdb

-win32\objects.mk: Makefile.inc
-	@echo OBJECTS = \>$@
-	@for %O in ($(OBJECTS)) do @echo $$(INTDIR)\%O \>>$@
-	@echo $$(EOL)>>$@

--- a/90
+++ b/90
@ -8,12 +8,90 @@ Web site: http://www.libssh2.org/

 Mailing list: http://cool.haxx.se/mailman/listinfo/libssh2-devel

-License: see COPYING
+Generic installation instructions are in INSTALL.  Some ./configure
+options deserve additional comments:

-Source code: https://github.com/libssh2/libssh2
+	* --enable-crypt-none

-Web site source code: https://github.com/libssh2/www
+		The SSH2 Transport allows for unencrypted data
+		transmission using the "none" cipher.  Because this is
+		such a huge security hole, it is typically disabled on
+		SSH2 implementations and is disabled in libssh2 by
+		default as well.

-Installation instructions are in:
- - docs/INSTALL_CMAKE for CMake
- - docs/INSTALL_AUTOTOOLS for Autotools
+		Enabling this option will allow for "none" as a
+		negotiable method, however it still requires that the
+		method be advertized by the remote end and that no
+		more-preferable methods are available.
+
+	* --enable-mac-none
+
+		The SSH2 Transport also allows implementations to
+		forego a message authentication code.  While this is
+		less of a security risk than using a "none" cipher, it
+		is still not recommended as disabling MAC hashes
+		removes a layer of security.
+
+		Enabling this option will allow for "none" as a
+		negotiable method, however it still requires that the
+		method be advertized by the remote end and that no
+		more-preferable methods are available.
+
+	* --disable-gex-new
+
+		The diffie-hellman-group-exchange-sha1 (dh-gex) key
+		exchange method originally defined an exchange
+		negotiation using packet type 30 to request a
+		generation pair based on a single target value.  Later
+		refinement of dh-gex provided for range and target
+		values.  By default libssh2 will use the newer range
+		method.
+
+		If you experience trouble connecting to an old SSH
+		server using dh-gex, try this option to fallback on
+		the older more reliable method.
+
+  	* --with-libgcrypt
+  	* --without-libgcrypt
+	* --with-libgcrypt-prefix=DIR
+
+		libssh2 can use the Libgcrypt library
+		(http://www.gnupg.org/) for cryptographic operations.
+		Either Libgcrypt or OpenSSL is required.
+
+		Configure will attempt to locate Libgcrypt
+		automatically.
+
+ 		If your installation of Libgcrypt is in another
+		location, specify it using --with-libgcrypt-prefix.
+
+	* --with-openssl
+	* --without-openssl
+	* --with-libssl-prefix=[DIR]
+
+		libssh2 can use the OpenSSL library
+		(http://www.openssl.org) for cryptographic operations.
+		Either Libgcrypt or OpenSSL is required.
+
+		Configure will attempt to locate OpenSSL in the
+		default location.
+
+		If your installation of OpenSSL is in another
+		location, specify it using --with-libssl-prefix.
+
+	* --with-libz
+	* --without-libz
+	* --with-libz-prefix=[DIR]
+
+		If present, libssh2 will attempt to use the zlib
+		(http://www.zlib.org) for payload compression, however
+		zlib is not required.
+
+		If your installation of Libz is in another location,
+		specify it using --with-libz-prefix.
+
+	* --enable-debug
+
+		Will make the build use more pedantic and strict compiler
+		options as well as enable the libssh2_trace() function (for
+		showing debug traces).
--- a/54
+++ b/54
@ -1,56 +1,18 @@
-libssh2 1.7.0
+libssh2 1.2.4

 This release includes the following changes:

- o libssh2_session_set_last_error: Add function
- o mac: Add support for HMAC-SHA-256 and HMAC-SHA-512
- o WinCNG: support for SHA256/512 HMAC
- o kex: Added diffie-hellman-group-exchange-sha256 support
- o OS/400 crypto library QC3 support
-
-This release includes the following security advisory:
-
- o diffie_hellman_sha256: convert bytes to bits
-   CVE-2016-0787: http://www.libssh2.org/adv_20160223.html
+ o 

 This release includes the following bugfixes:

- o SFTP: Increase speed and datasize in SFTP read
- o openssl: make libssh2_sha1 return error code
- o openssl: fix memleak in _libssh2_dsa_sha1_verify()
- o cmake: include CMake files in the release tarballs
- o Fix builds with Visual Studio 2015
- o hostkey.c: Fix compiling error when OPENSSL_NO_MD5 is defined
- o GNUmakefile: add support for LIBSSH2_LDFLAG_EXTRAS
- o GNUmakefile: add -m64 CFLAGS when targeting mingw64
- o kex: free server host key before allocating it (again)
- o SCP: add libssh2_scp_recv2 to support large (> 2GB) files on windows
- o channel: Detect bad usage of libssh2_channel_process_startup
- o userauth: Fix off by one error when reading public key file
- o kex: removed dupe entry from libssh2_kex_methods
- o _libssh2_error: Support allocating the error message
- o hostkey: fix invalid memory access if libssh2_dsa_new fails
- o hostkey: align code path of ssh_rsa_init to ssh_dss_init
- o libssh2.pc.in: fix the output of pkg-config --libs
- o wincng: fixed possible memory leak in _libssh2_wincng_hash
- o wincng: fixed _libssh2_wincng_hash_final return value
- o add OpenSSL 1.1.0-pre2 compatibility
- o agent_disconnect_unix: unset the agent fd after closing it
- o sftp: stop reading when buffer is full
- o sftp: Send at least one read request before reading
- o sftp: Don't return EAGAIN if data was written to buffer
- o sftp: Check read packet file offset
- o configure: build "silent" if possible
- o openssl: add OpenSSL 1.1.0-pre3-dev compatibility
- o GNUmakefile: list system libs after user libs
- 
+ o Resolve compile issues on Solaris x64 and UltraSPARC
+ o Allow compiling with OpenSSL when AES isn't available
+ o Fix Tru64 socklen_t compile issue with example/direct_tcpip.c
+
 This release would not have looked like this without help, code, reports and
 advice from friends like these:

-  Alexander Lamaison, Andreas Schneider, brian m. carlson, Daniel Stenberg,
-  David Byron, Jakob Egger, Kamil Dudka, Marc Hoersken, Mizunashi Mana,
-  Patrick Monnerat, Paul Howarth, Salvador Fandino, Salvador Fandiño,
-  Salvador Fandiño, Viktor Szakats, Will Cosgrove,
-  (16 contributors)
-
+ Dan Fandrich, Dave McCaldon, Peter Stuge
+ 
        Thanks! (and sorry if I forgot to mention someone)
--- a/44
+++ b/44
@ -0,0 +1,44 @@
+Things TODO
+===========
+
+* make sure the windowing code adapts better to slow situations so that it
+  doesn't then use as much memory as today
+
+* Introduce a 'libssh2_socket_t' type for sockets in internal code
+
+* Provide a libssh2_scp_send() API for files larger than 4GB (32bit size)
+
+* Add more info to the man pages.
+
+* Decrease the number of mallocs. Everywhere.
+
+* Use SO_NOSIGPIPE for Mac OS/BSD systems where MSG_NOSIGNAL doesn't exist/work
+
+* Extend the test suite to actually test lots of aspects of libssh2
+
+* Fix all compiler warnings (some can't be done without API changes)
+
+* Expose error messages sent by the server
+
+At next SONAME bump
+===================
+
+* stop using #defined macros as part of the official API. The macros should
+  either be turned into real functions or discarded from the API.
+
+* fix the parts of the API where object pointers and function pointers are
+  mixed like libssh2_session_callback_set()
+
+* remove the following functions from the API/ABI
+
+  libssh2_base64_decode()
+  libssh2_session_flag()
+  libssh2_channel_handle_extended_data()
+  libssh2_channel_receive_window_adjust()
+  libssh2_poll()
+  libssh2_poll_channel_read()
+
+* Rename a few function:
+
+  libssh2_hostkey_hash => libssh2_session_hostkey_hash
+  libssh2_banner_set => libssh2_session_banner_set
--- a/appveyor.yml
+++ b/appveyor.yml
@ -1,84 +0,0 @@
-# Copyright (c) 2014, Ruslan Baratov
-# Copyright (c) 2014, 2016 Alexander Lamaison
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
-#
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-os: Visual Studio 2015
-
-environment:
-  matrix:
-    - GENERATOR: "Visual Studio 14 2015"
-      BUILD_SHARED_LIBS: ON
-
-    - GENERATOR: "Visual Studio 14 2015"
-      BUILD_SHARED_LIBS: OFF
-
-    - GENERATOR: "Visual Studio 12 2013"
-      BUILD_SHARED_LIBS: ON
-
-    - GENERATOR: "Visual Studio 12 2013"
-      BUILD_SHARED_LIBS: OFF
-
-    - GENERATOR: "Visual Studio 11 2012"
-      BUILD_SHARED_LIBS: ON
-
-    - GENERATOR: "Visual Studio 11 2012"
-      BUILD_SHARED_LIBS: OFF
-
-    - GENERATOR: "Visual Studio 10 2010"
-      BUILD_SHARED_LIBS: ON
-
-    - GENERATOR: "Visual Studio 10 2010"
-      BUILD_SHARED_LIBS: OFF
-
-    - GENERATOR: "Visual Studio 9 2008"
-      BUILD_SHARED_LIBS: ON
-
-    - GENERATOR: "Visual Studio 9 2008"
-      BUILD_SHARED_LIBS: OFF
-
-platform:
-  - x86
-  - x64
-
-configuration:
-# - Debug
-  - Release
-
-matrix:
-  allow_failures:
-    - GENERATOR: "Visual Studio 9 2008"
-      platform: x64
-
-build_script:
-  - ps: if($env:PLATFORM -eq "x64") { $env:CMAKE_GEN_SUFFIX=" Win64" }
-  - cmake "-G%GENERATOR%%CMAKE_GEN_SUFFIX%" -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -H. -B_builds
-  - cmake --build _builds --config "%CONFIGURATION%"
-
-test_script:
-  - ps: cd _builds
-  - ctest -VV -C "%CONFIGURATION%" -E ssh2 --output-on-failure
-
-on_failure:
-  - ps: if (Test-Path _builds/CMakeFiles/CMakeOutput.log) { cat _builds/CMakeFiles/CMakeOutput.log }
-  - ps: if (Test-Path _builds/CMakeFiles/CMakeError.log) { cat _builds/CMakeFiles/CMakeError.log }
--- a/15
+++ b/15
@ -2,15 +2,20 @@

 LIBTOOLIZE="libtoolize"

-if [ "x`which $LIBTOOLIZE`" = "x" ]; then
-    LIBTOOLIZE="glibtoolize"
+if [ "x`which $LIBTOOLIZE`" == "x" ];
+then
+  LIBTOOLIZE="glibtoolize";
 fi

-if [ "x`which $LIBTOOLIZE`" = "x" ]; then
-    echo "Neither libtoolize nor glibtoolize could be found!"
-    exit 1
+if [ "x`which $LIBTOOLIZE`" == "x" ];
+then
+  echo "Neither libtoolize nor glibtoolize could be found!";
+  exit 1
 fi

+
+
+
 ${LIBTOOLIZE} --copy --automake --force
 ${ACLOCAL:-aclocal} -I m4 $ACLOCAL_FLAGS
 ${AUTOHEADER:-autoheader}
--- a/cmake/CheckFunctionExistsMayNeedLibrary.cmake
+++ b/cmake/CheckFunctionExistsMayNeedLibrary.cmake
@ -1,81 +0,0 @@
-# Copyright (c) 2014 Alexander Lamaison <alexander.lamaison@gmail.com>
-#
-# Redistribution and use in source and binary forms,
-# with or without modification, are permitted provided
-# that the following conditions are met:
-#
-#   Redistributions of source code must retain the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer.
-#
-#   Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the following
-#   disclaimer in the documentation and/or other materials
-#   provided with the distribution.
-#
-#   Neither the name of the copyright holder nor the names
-#   of any other contributors may be used to endorse or
-#   promote products derived from this software without
-#   specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-# OF SUCH DAMAGE.
-
-
-# - check_function_exists_maybe_need_library(<function> <var> [lib1 ... libn])
-#
-# Check if function is available for linking, first without extra libraries, and
-# then, if not found that way, linking in each optional library as well.  This
-# function is similar to autotools AC_SEARCH_LIBS.
-#
-# If the function if found, this will define <var>.
-#
-# If the function was only found by linking in an additional library, this
-# will define NEED_LIB_LIBX, where LIBX is the one of lib1 to libn that
-# makes the function available, in uppercase.
-#
-# The following variables may be set before calling this macro to
-# modify the way the check is run:
-#
-#  CMAKE_REQUIRED_FLAGS = string of compile command line flags
-#  CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
-#  CMAKE_REQUIRED_INCLUDES = list of include directories
-#  CMAKE_REQUIRED_LIBRARIES = list of libraries to link
-#
-
-include(CheckFunctionExists)
-include(CheckLibraryExists)
-
-function(check_function_exists_may_need_library function variable)
-
-  check_function_exists(${function} ${variable})
-
-  if(NOT ${variable})
-    foreach(lib ${ARGN})
-      string(TOUPPER ${lib} UP_LIB)
-      # Use new variable to prevent cache from previous step shortcircuiting
-      # new test
-      check_library_exists(${lib} ${function} "" HAVE_${function}_IN_${lib})
-      if(HAVE_${function}_IN_${lib})
-	set(${variable} 1 CACHE INTERNAL
-	  "Function ${function} found in library ${lib}")
-	set(NEED_LIB_${UP_LIB} 1 CACHE INTERNAL
-	  "Need to link ${lib}")
-	break()
-      endif()
-    endforeach()
-  endif()
-
-endfunction()
--- a/cmake/CheckNonblockingSocketSupport.cmake
+++ b/cmake/CheckNonblockingSocketSupport.cmake
@ -1,119 +0,0 @@
-include(CheckCSourceCompiles)
-
-# - check_nonblocking_socket_support()
-#
-# Check for how to set a socket to non-blocking state. There seems to exist
-# four known different ways, with the one used almost everywhere being POSIX
-# and XPG3, while the other different ways for different systems (old BSD,
-# Windows and Amiga).
-#
-# One of the following variables will be set indicating the supported
-# method (if any):
-#   HAVE_O_NONBLOCK
-#   HAVE_FIONBIO
-#   HAVE_IOCTLSOCKET
-#   HAVE_IOCTLSOCKET_CASE
-#   HAVE_SO_NONBLOCK
-#   HAVE_DISABLED_NONBLOCKING
-#
-# The following variables may be set before calling this macro to
-# modify the way the check is run:
-#
-#  CMAKE_REQUIRED_FLAGS = string of compile command line flags
-#  CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
-#  CMAKE_REQUIRED_INCLUDES = list of include directories
-#  CMAKE_REQUIRED_LIBRARIES = list of libraries to link
-#
-macro(check_nonblocking_socket_support)
-  # There are two known platforms (AIX 3.x and SunOS 4.1.x) where the
-  # O_NONBLOCK define is found but does not work.
-  check_c_source_compiles("
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#if defined(sun) || defined(__sun__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-# if defined(__SVR4) || defined(__srv4__)
-#  define PLATFORM_SOLARIS
-# else
-#  define PLATFORM_SUNOS4
-# endif
-#endif
-#if (defined(_AIX) || defined(__xlC__)) && !defined(_AIX41)
-# define PLATFORM_AIX_V3
-#endif
-
-#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__)
-#error \"O_NONBLOCK does not work on this platform\"
-#endif
-
-int main()
-{
-    int socket;
-    int flags = fcntl(socket, F_SETFL, flags | O_NONBLOCK);
-}"
-  HAVE_O_NONBLOCK)
-
-  if(NOT HAVE_O_NONBLOCK)
-    check_c_source_compiles("/* FIONBIO test (old-style unix) */
-#include <unistd.h>
-#include <stropts.h>
-
-int main()
-{
-    int socket;
-    int flags = ioctl(socket, FIONBIO, &flags);
-}"
-    HAVE_FIONBIO)
-
-    if(NOT HAVE_FIONBIO)
-      check_c_source_compiles("/* ioctlsocket test (Windows) */
-#undef inline
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
-#include <windows.h>
-#include <winsock2.h>
-
-int main()
-{
-    SOCKET sd;
-    unsigned long flags = 0;
-    sd = socket(0, 0, 0);
-    ioctlsocket(sd, FIONBIO, &flags);
-}"
-      HAVE_IOCTLSOCKET)
-
-      if(NOT HAVE_IOCTLSOCKET)
-	check_c_source_compiles("/* IoctlSocket test (Amiga?) */
-#include <sys/ioctl.h>
-
-int main()
-{
-    int socket;
-    int flags = IoctlSocket(socket, FIONBIO, (long)1);
-}"
-        HAVE_IOCTLSOCKET_CASE)
-
-        if(NOT HAVE_IOCTLSOCKET_CASE)
-	  check_c_source_compiles("/* SO_NONBLOCK test (BeOS) */
-#include <socket.h>
-
-int main()
-{
-    long b = 1;
-    int socket;
-    int flags = setsockopt(socket, SOL_SOCKET, SO_NONBLOCK, &b, sizeof(b));
-}"
-          HAVE_SO_NONBLOCK)
-
-	  if(NOT HAVE_SO_NONBLOCK)
-	    # No non-blocking socket method found
-	    set(HAVE_DISABLED_NONBLOCKING 1)
-	  endif()
-	endif()
-      endif()
-    endif()
-  endif()
-endmacro()
--- a/cmake/CopyRuntimeDependencies.cmake
+++ b/cmake/CopyRuntimeDependencies.cmake
@ -1,72 +0,0 @@
-# Copyright (c) 2014 Alexander Lamaison <alexander.lamaison@gmail.com>
-#
-# Redistribution and use in source and binary forms,
-# with or without modification, are permitted provided
-# that the following conditions are met:
-#
-#   Redistributions of source code must retain the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer.
-#
-#   Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the following
-#   disclaimer in the documentation and/or other materials
-#   provided with the distribution.
-#
-#   Neither the name of the copyright holder nor the names
-#   of any other contributors may be used to endorse or
-#   promote products derived from this software without
-#   specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-# OF SUCH DAMAGE.
-
-include(CMakeParseArguments)
-
-function(ADD_TARGET_TO_COPY_DEPENDENCIES)
-  set(options)
-  set(oneValueArgs TARGET)
-  set(multiValueArgs DEPENDENCIES BEFORE_TARGETS)
-  cmake_parse_arguments(COPY
-    "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-  if(NOT COPY_DEPENDENCIES)
-    return()
-  endif()
-
-  # Using a custom target to drive custom commands stops multiple
-  # parallel builds trying to kick off the commands at the same time
-  add_custom_target(${COPY_TARGET})
-
-  foreach(target ${COPY_BEFORE_TARGETS})
-    add_dependencies(${target} ${COPY_TARGET})
-  endforeach()
-
-  foreach(dependency ${COPY_DEPENDENCIES})
-
-    add_custom_command(
-      TARGET ${COPY_TARGET}
-      DEPENDS ${dependency}
-      # Make directory first otherwise file is copied in place of
-      # directory instead of into it
-      COMMAND ${CMAKE_COMMAND}
-      ARGS -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
-      COMMAND ${CMAKE_COMMAND}
-      ARGS -E copy ${dependency} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
-      VERBATIM)
-
-  endforeach()
-
-endfunction()
--- a/cmake/FindLibgcrypt.cmake
+++ b/cmake/FindLibgcrypt.cmake
@ -1,53 +0,0 @@
-# Copyright (c) 2014 Alexander Lamaison <alexander.lamaison@gmail.com>
-#
-# Redistribution and use in source and binary forms,
-# with or without modification, are permitted provided
-# that the following conditions are met:
-#
-#   Redistributions of source code must retain the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer.
-#
-#   Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the following
-#   disclaimer in the documentation and/or other materials
-#   provided with the distribution.
-#
-#   Neither the name of the copyright holder nor the names
-#   of any other contributors may be used to endorse or
-#   promote products derived from this software without
-#   specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-# OF SUCH DAMAGE.
-
-# - Try to find Libgcrypt
-# This will define all or none of:
-#  LIBGCRYPT_FOUND - if Libgcrypt headers and library was found
-#  LIBGCRYPT_INCLUDE_DIRS - The Libgcrypt include directories
-#  LIBGCRYPT_LIBRARIES - The libraries needed to use Libgcrypt
-
-find_path(LIBGCRYPT_INCLUDE_DIR gcrypt.h)
-
-find_library(LIBGCRYPT_LIBRARY NAMES gcrypt libgcrypt)
-
-set(LIBGCRYPT_LIBRARIES ${LIBGCRYPT_LIBRARY})
-set(LIBGCRYPT_INCLUDE_DIRS ${LIBGCRYPT_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Libgcrypt DEFAULT_MSG
-                                  LIBGCRYPT_LIBRARY LIBGCRYPT_INCLUDE_DIR)
-
-mark_as_advanced(LIBGCRYPT_INCLUDE_DIR LIBGCRYPT_LIBRARY)
--- a/cmake/SocketLibraries.cmake
+++ b/cmake/SocketLibraries.cmake
@ -1,64 +0,0 @@
-# Copyright (c) 2014 Alexander Lamaison <alexander.lamaison@gmail.com>
-#
-# Redistribution and use in source and binary forms,
-# with or without modification, are permitted provided
-# that the following conditions are met:
-#
-#   Redistributions of source code must retain the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer.
-#
-#   Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the following
-#   disclaimer in the documentation and/or other materials
-#   provided with the distribution.
-#
-#   Neither the name of the copyright holder nor the names
-#   of any other contributors may be used to endorse or
-#   promote products derived from this software without
-#   specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-# OF SUCH DAMAGE.
-
-# Some systems have their socket functions in a library.
-# (Solaris -lsocket/-lnsl, Windows -lws2_32).  This macro appends those
-# libraries to the given list
-macro(append_needed_socket_libraries LIBRARIES_LIST)
-  if(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND CMAKE_SIZEOF_VOID_P EQUAL 4)
-    # x86 Windows uses STDCALL for these functions, so their names are mangled,
-    # meaning the platform checks don't work. Hardcoding these until we get
-    # a better solution.
-    set(HAVE_SOCKET 1)
-    set(HAVE_SELECT 1)
-    set(HAVE_INET_ADDR 1)
-    set(NEED_LIB_WS2_32 1)
-  else()
-    check_function_exists_may_need_library(socket HAVE_SOCKET socket ws2_32)
-    check_function_exists_may_need_library(select HAVE_SELECT ws2_32)
-    check_function_exists_may_need_library(inet_addr HAVE_INET_ADDR nsl ws2_32)
-  endif()
-
-  if(NEED_LIB_SOCKET)
-    list(APPEND ${LIBRARIES_LIST} socket)
-  endif()
-  if(NEED_LIB_NSL)
-    list(APPEND ${LIBRARIES_LIST} nsl)
-  endif()
-  if(NEED_LIB_WS2_32)
-    list(APPEND ${LIBRARIES_LIST} ws2_32)
-  endif()
-
-endmacro()
--- a/cmake/Toolchain-Linux-32.cmake
+++ b/cmake/Toolchain-Linux-32.cmake
@ -1,42 +0,0 @@
-# Copyright (c) 2014 Alexander Lamaison <alexander.lamaison@gmail.com>
-#
-# Redistribution and use in source and binary forms,
-# with or without modification, are permitted provided
-# that the following conditions are met:
-#
-#   Redistributions of source code must retain the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer.
-#
-#   Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the following
-#   disclaimer in the documentation and/or other materials
-#   provided with the distribution.
-#
-#   Neither the name of the copyright holder nor the names
-#   of any other contributors may be used to endorse or
-#   promote products derived from this software without
-#   specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-# OF SUCH DAMAGE.
-
-# Cross-compile 32-bit binary on 64-bit linux host
-set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_VERSION 1)
-set(CMAKE_SYSTEM_PROCESSOR "i386")
-
-set(CMAKE_CXX_COMPILER_ARG1 "-m32")
-set(CMAKE_C_COMPILER_ARG1 "-m32")
--- a/cmake/max_warnings.cmake
+++ b/cmake/max_warnings.cmake
@ -1,23 +0,0 @@
-if(MSVC)
-  # Use the highest warning level for visual studio.
-  if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-    string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-  else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
-  endif()
-  if(CMAKE_C_FLAGS MATCHES "/W[0-4]")
-    string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-  else()
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
-  endif()
-
-  # Disable broken warnings
-  add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
-elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-  if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-  endif()
-  if(NOT CMAKE_C_FLAGS MATCHES "-Wall")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-  endif()
-endif()
--- a/configure.ac
+++ b/configure.ac
@ -2,9 +2,8 @@
 AC_INIT(libssh2, [-], libssh2-devel@cool.haxx.se)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src])
-AC_CONFIG_HEADERS([src/libssh2_config.h example/libssh2_config.h])
+AM_CONFIG_HEADER([src/libssh2_config.h example/libssh2_config.h])
 AM_MAINTAINER_MODE
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

 dnl SED is needed by some of the tools
 AC_PATH_PROG( SED, sed, sed-was-not-found-by-configure,
@ -16,14 +15,12 @@ if test "x$SED" = "xsed-was-not-found-by-configure"; then
 fi

 dnl figure out the libssh2 version
-LIBSSH2VER=`$SED -ne 's/^#define LIBSSH2_VERSION *"\(.*\)"/\1/p' ${srcdir}/include/libssh2.h`
-AM_INIT_AUTOMAKE
+VERSION=`$SED -ne 's/^#define LIBSSH2_VERSION *"\(.*\)"/\1/p' ${srcdir}/include/libssh2.h`
+AM_INIT_AUTOMAKE(libssh2,$VERSION)
 AC_MSG_CHECKING([libssh2 version])
-AC_MSG_RESULT($LIBSSH2VER)
+AC_MSG_RESULT($VERSION)

-AC_SUBST(LIBSSH2VER)
-
-AB_VERSION=$LIBSSH2VER
+AB_VERSION=$VERSION

 AB_INIT

@ -33,7 +30,7 @@ AB_INIT
 AC_CANONICAL_HOST
 case "$host" in
    *-mingw*)
-    CFLAGS="$CFLAGS -DLIBSSH2_WIN32"
+    CFLAGS="$CFLAGS -DLIBSSH2_WIN32 -DWINSOCK_VERSION=0x0200"
    LIBS="$LIBS -lws2_32"
    ;;
 	*-cygwin)
@ -84,111 +81,47 @@ dnl check for how to do large files
 AC_SYS_LARGEFILE

 # Configure parameters
+AC_ARG_WITH(libgcrypt,
+  AC_HELP_STRING([--with-libgcrypt],[Use Libgcrypt for crypto]),
+  use_libgcrypt=$withval,use_libgcrypt=auto)
 AC_ARG_WITH(openssl,
  AC_HELP_STRING([--with-openssl],[Use OpenSSL for crypto]),
  use_openssl=$withval,use_openssl=auto)
-AC_ARG_WITH(libgcrypt,
-  AC_HELP_STRING([--with-libgcrypt],[Use libgcrypt for crypto]),
-  use_libgcrypt=$withval,use_libgcrypt=auto)
-AC_ARG_WITH(wincng,
-  AC_HELP_STRING([--with-wincng],[Use Windows CNG for crypto]),
-  use_wincng=$withval,use_wincng=auto)
 AC_ARG_WITH(libz,
-  AC_HELP_STRING([--with-libz],[Use zlib for compression]),
+  AC_HELP_STRING([--with-libz],[Use Libz for compression]),
  use_libz=$withval,use_libz=auto)

-found_crypto=none
-support_clear_memory=no
-
-# Look for OpenSSL
-if test "$found_crypto" = "none" && test "$use_openssl" != "no"; then
+# Look for OpenSSL (default)
+if test "$use_openssl" != "no" && test "$use_libgcrypt" != "yes"; then
  AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [#include <openssl/ssl.h>])
 fi
-if test "$ac_cv_libssl" = "yes"; then
-  AC_DEFINE(LIBSSH2_OPENSSL, 1, [Use OpenSSL])
-  LIBSREQUIRED=libssl,libcrypto
-
-  # Not all OpenSSL have AES-CTR functions.
-  save_LIBS="$LIBS"
-  LIBS="$LIBS $LIBSSL"
-  AC_CHECK_FUNCS(EVP_aes_128_ctr)
-  LIBS="$save_LIBS"
-
-  found_crypto="OpenSSL (AES-CTR: ${ac_cv_func_EVP_aes_128_ctr:-N/A})"
-fi
-AM_CONDITIONAL(OPENSSL, test "$ac_cv_libssl" = "yes")

 # Look for libgcrypt
-if test "$found_crypto" = "none" && test "$use_libgcrypt" != "no"; then
+if test "$ac_cv_libssl" != "yes" && test "$use_libgcrypt" != "no"; then
  AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>])
 fi
+
+if test "$ac_cv_libssl" != "yes" && test "$ac_cv_libgcrypt" != "yes"; then
+  AC_MSG_ERROR([cannot find OpenSSL or Libgcrypt,
+try --with-libssl-prefix=PATH or --with-libgcrypt-prefix=PATH])
+fi
+
 if test "$ac_cv_libgcrypt" = "yes"; then
  AC_DEFINE(LIBSSH2_LIBGCRYPT, 1, [Use libgcrypt])
-  LIBSREQUIRED= # libgcrypt doesn't provide a .pc file. sad face.
-  LIBS="$LIBS -lgcrypt"
-  found_crypto=libgcrypt
 fi
 AM_CONDITIONAL(LIBGCRYPT, test "$ac_cv_libgcrypt" = "yes")

-# Look for Windows Cryptography API: Next Generation
-if test "$found_crypto" = "none" && test "$use_wincng" != "no"; then
-  AC_LIB_HAVE_LINKFLAGS([bcrypt], [], [
-    #include <windows.h>
-    #include <bcrypt.h>
-  ])
-  AC_LIB_HAVE_LINKFLAGS([crypt32], [], [
-    #include <windows.h>
-    #include <wincrypt.h>
-  ])
-  AC_CHECK_HEADERS([ntdef.h ntstatus.h], [], [], [
-    #include <windows.h>
-  ])
-  AC_CHECK_DECLS([SecureZeroMemory], [], [], [
-    #include <windows.h>
-  ])
-fi
-if test "$ac_cv_libbcrypt" = "yes"; then
-  AC_DEFINE(LIBSSH2_WINCNG, 1, [Use Windows CNG])
-  LIBSREQUIRED= # wincng doesn't provide a .pc file. sad face.
-  LIBS="$LIBS -lbcrypt"
-  if test "$ac_cv_libcrypt32" = "yes"; then
-    LIBS="$LIBS -lcrypt32"
-  fi
-  found_crypto="Windows Cryptography API: Next Generation"
-  if test "$ac_cv_have_decl_SecureZeroMemory" = "yes"; then
-    support_clear_memory=yes
-  fi
-fi
-AM_CONDITIONAL(WINCNG, test "$ac_cv_libbcrypt" = "yes")
-
-AM_CONDITIONAL(OS400QC3, false)
-
-# Check if crypto library was found
-if test "$found_crypto" = "none"; then
-  AC_MSG_ERROR([No crypto library found!
-Try --with-libssl-prefix=PATH
- or --with-libgcrypt-prefix=PATH
- or --with-wincng on Windows\
-])
-fi
-
 # Look for Libz
 if test "$use_libz" != "no"; then
  AC_LIB_HAVE_LINKFLAGS([z], [], [#include <zlib.h>])
  if test "$ac_cv_libz" != yes; then
-    AC_MSG_NOTICE([Cannot find zlib, disabling compression])
+    AC_MSG_NOTICE([Cannot find libz, disabling compression])
    AC_MSG_NOTICE([Try --with-libz-prefix=PATH if you know you have it])
  else
    AC_DEFINE(LIBSSH2_HAVE_ZLIB, 1, [Compile in zlib support])
-    if test "${LIBSREQUIRED}" != ""; then
-      LIBSREQUIRED="${LIBSREQUIRED},"
-    fi
-    LIBSREQUIRED="${LIBSREQUIRED}zlib"
  fi
 fi

-AC_SUBST(LIBSREQUIRED)
-
 #
 # Optional Settings
 #
@ -207,30 +140,6 @@ if test "$GEX_NEW" != "no"; then
  AC_DEFINE(LIBSSH2_DH_GEX_NEW, 1, [Enable newer diffie-hellman-group-exchange-sha1 syntax])
 fi

-AC_ARG_ENABLE(clear-memory,
-  AC_HELP_STRING([--disable-clear-memory],[Disable clearing of memory before being freed]),
-  [CLEAR_MEMORY=$enableval])
-if test "$CLEAR_MEMORY" != "no"; then
-  if test "$support_clear_memory" = "yes"; then
-    AC_DEFINE(LIBSSH2_CLEAR_MEMORY, 1, [Enable clearing of memory before being freed])
-    enable_clear_memory=yes
-  else
-    if test "$CLEAR_MEMORY" = "yes"; then
-      AC_MSG_ERROR([secure clearing/zeroing of memory is not supported by the selected crypto backend])
-    else
-      AC_MSG_WARN([secure clearing/zeroing of memory is not supported by the selected crypto backend])
-    fi
-    enable_clear_memory=unsupported
-  fi
-else
-  if test "$support_clear_memory" = "yes"; then
-    enable_clear_memory=no
-  else
-    AC_MSG_WARN([secure clearing/zeroing of memory is not supported by the selected crypto backend])
-    enable_clear_memory=unsupported
-  fi
-fi
-
 dnl ************************************************************
 dnl option to switch on compiler debug options
 dnl
@ -238,12 +147,12 @@ AC_MSG_CHECKING([whether to enable pedantic and debug compiler options])
 AC_ARG_ENABLE(debug,
 AC_HELP_STRING([--enable-debug],[Enable pedantic and debug options])
 AC_HELP_STRING([--disable-debug],[Disable debug options]),
-[ case "$enable_debug" in
+[ case "$enableval" in
  no)
       AC_MSG_RESULT(no)
       ;;
  *)   AC_MSG_RESULT(yes)
-    enable_debug=yes
+
    CPPFLAGS="$CPPFLAGS -DLIBSSH2DEBUG"
    CFLAGS="$CFLAGS -g"

@ -253,7 +162,6 @@ AC_HELP_STRING([--disable-debug],[Disable debug options]),
       ;;
  esac
 ],
-       enable_debug=no
       AC_MSG_RESULT(no)
 )

@ -296,29 +204,12 @@ AC_HELP_STRING([--disable-hidden-symbols],[Leave all symbols with default visibi
       AC_MSG_RESULT(no)
 )

-# Build example applications?
-AC_MSG_CHECKING([whether to build example applications])
-AC_ARG_ENABLE([examples-build],
-AC_HELP_STRING([--enable-examples-build], [Build example applications (this is the default)])
-AC_HELP_STRING([--disable-examples-build], [Do not build example applications]),
-[case "$enableval" in
-  no | false)
-    build_examples='no'
-    ;;
-  *)
-    build_examples='yes'
-    ;;
-esac], [build_examples='yes'])
-AC_MSG_RESULT($build_examples)
-AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$build_examples" != "xno"])
-
 # Checks for header files.
 # AC_HEADER_STDC
 AC_CHECK_HEADERS([errno.h fcntl.h stdio.h stdlib.h unistd.h sys/uio.h])
 AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
 AC_CHECK_HEADERS([arpa/inet.h netinet/in.h])
-AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
-AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+AC_CHECK_HEADERS([sys/un.h])

 case $host in
  *-*-cygwin* | *-*-cegcc*)
@ -329,25 +220,7 @@ case $host in
    ;;
 esac

-case $host in
-  *darwin*|*interix*)
-    dnl poll() does not work on these platforms
-    dnl Interix: "does provide poll(), but the implementing developer must
-    dnl have been in a bad mood, because poll() only works on the /proc
-    dnl filesystem here"
-    dnl Mac OS X's poll has funny behaviors, like:
-    dnl not being able to do poll on no fildescriptors (10.3?)
-    dnl not being able to poll on some files (like anything in /dev)
-    dnl not having reliable timeout support
-    dnl inconsistent return of POLLHUP where other implementations give POLLIN
-    AC_MSG_NOTICE([poll use is disabled on this platform])
-    ;;
-  *)
-    AC_CHECK_FUNCS(poll)
-    ;;
-esac
-
-AC_CHECK_FUNCS(gettimeofday select strtoll)
+AC_CHECK_FUNCS(poll gettimeofday select strtoll)

 dnl Check for select() into ws2_32 for Msys/Mingw
 if test "$ac_cv_func_select" != "yes"; then
@ -386,19 +259,3 @@ AC_CONFIG_FILES([Makefile
                 docs/Makefile
                 libssh2.pc])
 AC_OUTPUT
-
-AC_MSG_NOTICE([summary of build options:
-
-  version:          ${LIBSSH2VER}
-  Host type:        ${host}
-  Install prefix:   ${prefix}
-  Compiler:         ${CC}
-  Compiler flags:   ${CFLAGS}
-  Library types:    Shared=${enable_shared}, Static=${enable_static}
-  Crypto library:   ${found_crypto}
-  Clear memory:     $enable_clear_memory
-  Debug build:      $enable_debug
-  Build examples:   $build_examples
-  Path to sshd:     $ac_cv_path_SSHD (only for self-tests)
-  zlib compression: $ac_cv_libz
-])
--- a/docs/BINDINGS
+++ b/docs/BINDINGS
@ -1,29 +0,0 @@
-
-Creative people have written bindings or interfaces for various environments
-and programming languages. Using one of these bindings allows you to take
-advantage of libssh2 directly from within your favourite language.
-
-The bindings listed below are not part of the libssh2 distribution archives,
-but must be downloaded and installed separately.
-
-Cocoa/Objective-C
-  https://github.com/karelia/libssh2_sftp-Cocoa-wrapper
-
-Haskell
-  FFI bindings - http://hackage.haskell.org/package/libssh2
-
-Perl
-  Net::SSH2 - http://search.cpan.org/~rkitover/Net-SSH2-0.45/lib/Net/SSH2.pm
-
-PHP
-  ssh2 - http://pecl.php.net/package/ssh2 
-
-Python
-  pylibssh2 - http://www.wallix.org/pylibssh2-project/
-
-Python-ctypes
-
-  PySsh2 - https://github.com/gellule/PySsh2
-
-Ruby
-  libssh2-ruby - https://github.com/mitchellh/libssh2-ruby
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@ -1,206 +0,0 @@
-# Copyright (c) 2014 Alexander Lamaison <alexander.lamaison@gmail.com>
-#
-# Redistribution and use in source and binary forms,
-# with or without modification, are permitted provided
-# that the following conditions are met:
-#
-#   Redistributions of source code must retain the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer.
-#
-#   Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the following
-#   disclaimer in the documentation and/or other materials
-#   provided with the distribution.
-#
-#   Neither the name of the copyright holder nor the names
-#   of any other contributors may be used to endorse or
-#   promote products derived from this software without
-#   specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-# CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-# OF SUCH DAMAGE.
-
-set(MAN_PAGES
-  libssh2_agent_connect.3
-  libssh2_agent_disconnect.3
-  libssh2_agent_free.3
-  libssh2_agent_get_identity.3
-  libssh2_agent_init.3
-  libssh2_agent_list_identities.3
-  libssh2_agent_userauth.3
-  libssh2_banner_set.3
-  libssh2_base64_decode.3
-  libssh2_channel_close.3
-  libssh2_channel_direct_tcpip.3
-  libssh2_channel_direct_tcpip_ex.3
-  libssh2_channel_eof.3
-  libssh2_channel_exec.3
-  libssh2_channel_flush.3
-  libssh2_channel_flush_ex.3
-  libssh2_channel_flush_stderr.3
-  libssh2_channel_forward_accept.3
-  libssh2_channel_forward_cancel.3
-  libssh2_channel_forward_listen.3
-  libssh2_channel_forward_listen_ex.3
-  libssh2_channel_free.3
-  libssh2_channel_get_exit_signal.3
-  libssh2_channel_get_exit_status.3
-  libssh2_channel_handle_extended_data.3
-  libssh2_channel_handle_extended_data2.3
-  libssh2_channel_ignore_extended_data.3
-  libssh2_channel_open_ex.3
-  libssh2_channel_open_session.3
-  libssh2_channel_process_startup.3
-  libssh2_channel_read.3
-  libssh2_channel_read_ex.3
-  libssh2_channel_read_stderr.3
-  libssh2_channel_receive_window_adjust.3
-  libssh2_channel_receive_window_adjust2.3
-  libssh2_channel_request_pty.3
-  libssh2_channel_request_pty_ex.3
-  libssh2_channel_request_pty_size.3
-  libssh2_channel_request_pty_size_ex.3
-  libssh2_channel_send_eof.3
-  libssh2_channel_set_blocking.3
-  libssh2_channel_setenv.3
-  libssh2_channel_setenv_ex.3
-  libssh2_channel_shell.3
-  libssh2_channel_subsystem.3
-  libssh2_channel_wait_closed.3
-  libssh2_channel_wait_eof.3
-  libssh2_channel_window_read.3
-  libssh2_channel_window_read_ex.3
-  libssh2_channel_window_write.3
-  libssh2_channel_window_write_ex.3
-  libssh2_channel_write.3
-  libssh2_channel_write_ex.3
-  libssh2_channel_write_stderr.3
-  libssh2_channel_x11_req.3
-  libssh2_channel_x11_req_ex.3
-  libssh2_exit.3
-  libssh2_free.3
-  libssh2_hostkey_hash.3
-  libssh2_init.3
-  libssh2_keepalive_config.3
-  libssh2_keepalive_send.3
-  libssh2_knownhost_add.3
-  libssh2_knownhost_addc.3
-  libssh2_knownhost_check.3
-  libssh2_knownhost_checkp.3
-  libssh2_knownhost_del.3
-  libssh2_knownhost_free.3
-  libssh2_knownhost_get.3
-  libssh2_knownhost_init.3
-  libssh2_knownhost_readfile.3
-  libssh2_knownhost_readline.3
-  libssh2_knownhost_writefile.3
-  libssh2_knownhost_writeline.3
-  libssh2_poll.3
-  libssh2_poll_channel_read.3
-  libssh2_publickey_add.3
-  libssh2_publickey_add_ex.3
-  libssh2_publickey_init.3
-  libssh2_publickey_list_fetch.3
-  libssh2_publickey_list_free.3
-  libssh2_publickey_remove.3
-  libssh2_publickey_remove_ex.3
-  libssh2_publickey_shutdown.3
-  libssh2_scp_recv.3
-  libssh2_scp_recv2.3
-  libssh2_scp_send.3
-  libssh2_scp_send64.3
-  libssh2_scp_send_ex.3
-  libssh2_session_abstract.3
-  libssh2_session_banner_get.3
-  libssh2_session_banner_set.3
-  libssh2_session_block_directions.3
-  libssh2_session_callback_set.3
-  libssh2_session_disconnect.3
-  libssh2_session_disconnect_ex.3
-  libssh2_session_flag.3
-  libssh2_session_free.3
-  libssh2_session_get_blocking.3
-  libssh2_session_get_timeout.3
-  libssh2_session_hostkey.3
-  libssh2_session_init.3
-  libssh2_session_init_ex.3
-  libssh2_session_last_errno.3
-  libssh2_session_last_error.3
-  libssh2_session_set_last_error.3
-  libssh2_session_method_pref.3
-  libssh2_session_methods.3
-  libssh2_session_set_blocking.3
-  libssh2_session_set_timeout.3
-  libssh2_session_startup.3
-  libssh2_session_supported_algs.3
-  libssh2_sftp_close.3
-  libssh2_sftp_close_handle.3
-  libssh2_sftp_closedir.3
-  libssh2_sftp_fsetstat.3
-  libssh2_sftp_fstat.3
-  libssh2_sftp_fstat_ex.3
-  libssh2_sftp_fstatvfs.3
-  libssh2_sftp_fsync.3
-  libssh2_sftp_get_channel.3
-  libssh2_sftp_init.3
-  libssh2_sftp_last_error.3
-  libssh2_sftp_lstat.3
-  libssh2_sftp_mkdir.3
-  libssh2_sftp_mkdir_ex.3
-  libssh2_sftp_open.3
-  libssh2_sftp_open_ex.3
-  libssh2_sftp_opendir.3
-  libssh2_sftp_read.3
-  libssh2_sftp_readdir.3
-  libssh2_sftp_readdir_ex.3
-  libssh2_sftp_readlink.3
-  libssh2_sftp_realpath.3
-  libssh2_sftp_rename.3
-  libssh2_sftp_rename_ex.3
-  libssh2_sftp_rewind.3
-  libssh2_sftp_rmdir.3
-  libssh2_sftp_rmdir_ex.3
-  libssh2_sftp_seek.3
-  libssh2_sftp_seek64.3
-  libssh2_sftp_setstat.3
-  libssh2_sftp_shutdown.3
-  libssh2_sftp_stat.3
-  libssh2_sftp_stat_ex.3
-  libssh2_sftp_statvfs.3
-  libssh2_sftp_symlink.3
-  libssh2_sftp_symlink_ex.3
-  libssh2_sftp_tell.3
-  libssh2_sftp_tell64.3
-  libssh2_sftp_unlink.3
-  libssh2_sftp_unlink_ex.3
-  libssh2_sftp_write.3
-  libssh2_trace.3
-  libssh2_trace_sethandler.3
-  libssh2_userauth_authenticated.3
-  libssh2_userauth_hostbased_fromfile.3
-  libssh2_userauth_hostbased_fromfile_ex.3
-  libssh2_userauth_keyboard_interactive.3
-  libssh2_userauth_keyboard_interactive_ex.3
-  libssh2_userauth_list.3
-  libssh2_userauth_password.3
-  libssh2_userauth_password_ex.3
-  libssh2_userauth_publickey.3
-  libssh2_userauth_publickey_fromfile.3
-  libssh2_userauth_publickey_fromfile_ex.3
-  libssh2_version.3)
-
-include(GNUInstallDirs)
-install(FILES ${MAN_PAGES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man3)
--- a/docs/HACKING.CRYPTO
+++ b/docs/HACKING.CRYPTO
@ -1,593 +0,0 @@
-	Definitions needed to implement a specific crypto library
-
-This document offers some hints about implementing a new crypto library
-interface.
-
-A crypto library interface consists of at least a header file, defining
-entities referenced from the libssh2 core modules.
-Real code implementation (if needed), is left at the implementor's choice.
-
-This document lists the entities that must/may be defined in the header file.
-
-Procedures listed as "void" may indeed have a result type: the void indication
-indicates the libssh2 core modules never use the function result.
-
-
-1) Crypto library initialization/termination.
-
-void libssh2_crypto_init(void);
-Initializes the crypto library. May be an empty macro if not needed.
-
-void libssh2_crypto_exit(void);
-Terminates the crypto library use. May be an empty macro if not needed.
-
-
-2) HMAC
-
-libssh2_hmac_ctx
-Type of an HMAC computation context. Generally a struct.
-Used for all hash algorithms.
-
-void libssh2_hmac_ctx_init(libssh2_hmac_ctx ctx);
-Initializes the HMAC computation context ctx.
-Called before setting-up the hash algorithm.
-Note: if the ctx parameter is modified by the underlying code,
-this procedure must be implemented as a macro to map ctx --> &ctx.
-
-void libssh2_hmac_update(libssh2_hmac_ctx ctx,
-	                 const unsigned char *data,
-	                 int datalen);
-Continue computation of an HMAC on datalen bytes at data using context ctx.
-Note: if the ctx parameter is modified by the underlying code,
-this procedure must be implemented as a macro to map ctx --> &ctx.
-
-void libssh2_hmac_final(libssh2_hmac_ctx ctx,
-	                unsigned char output[]);
-Get the computed HMAC from context ctx into the output buffer. The
-minimum data buffer size depends on the HMAC hash algorithm.
-Note: if the ctx parameter is modified by the underlying code,
-this procedure must be implemented as a macro to map ctx --> &ctx.
-
-void libssh2_hmac_cleanup(libssh2_hmac_ctx *ctx);
-Releases the HMAC computation context at ctx.
-
-
-3) Hash algorithms.
-
-3.1) SHA-1
-Must always be implemented.
-
-SHA_DIGEST_LENGTH
-#define to 20, the SHA-1 digest length.
-
-libssh2_sha1_ctx
-Type of an SHA1 computation context. Generally a struct.
-
-int libssh2_sha1_init(libssh2_sha1_ctx *x);
-Initializes the SHA-1 computation context at x.
-Returns 1 for success and 0 for failure
-
-void libssh2_sha1_update(libssh2_sha1_ctx ctx,
-	                 const unsigned char *data,
-	                 size_t len);
-Continue computation of SHA-1 on len bytes at data using context ctx.
-Note: if the ctx parameter is modified by the underlying code,
-this procedure must be implemented as a macro to map ctx --> &ctx.
-
-void libssh2_sha1_final(libssh2_sha1_ctx ctx,
-                        unsigned char output[SHA1_DIGEST_LEN]);
-Get the computed SHA-1 signature from context ctx and store it into the
-output buffer.
-Release the context.
-Note: if the ctx parameter is modified by the underlying code,
-this procedure must be implemented as a macro to map ctx --> &ctx.
-
-void libssh2_hmac_sha1_init(libssh2_hmac_ctx *ctx,
-	                    const void *key,
-	                    int keylen);
-Setup the HMAC computation context ctx for an HMAC-SHA-1 computation using the
-keylen-byte key. Is invoked just after libssh2_hmac_ctx_init().
-
-3.2) SHA-256
-Must always be implemented.
-
-SHA256_DIGEST_LENGTH
-#define to 32, the SHA-256 digest length.
-
-libssh2_sha256_ctx
-Type of an SHA-256 computation context. Generally a struct.
-
-int libssh2_sha256_init(libssh2_sha256_ctx *x);
-Initializes the SHA-256 computation context at x.
-Returns 1 for success and 0 for failure
-
-void libssh2_sha256_update(libssh2_sha256_ctx ctx,
-	                   const unsigned char *data,
-	                   size_t len);
-Continue computation of SHA-256 on len bytes at data using context ctx.
-Note: if the ctx parameter is modified by the underlying code,
-this procedure must be implemented as a macro to map ctx --> &ctx.
-
-void libssh2_sha256_final(libssh2_sha256_ctx ctx,
-	                  unsigned char output[SHA256_DIGEST_LENGTH]);
-Gets the computed SHA-256 signature from context ctx into the output buffer.
-Release the context.
-Note: if the ctx parameter is modified by the underlying code,
-this procedure must be implemented as a macro to map ctx --> &ctx.
-
-int libssh2_sha256(const unsigned char *message,
-                   unsigned long len,
-                   unsigned char output[SHA256_DIGEST_LENGTH]);
-Computes the SHA-256 signature over the given message of length len and
-store the result into the output buffer.
-Return 1 if error, else 0.
-Note: Seems unused in current code, but defined in each crypto library backend.
-
-LIBSSH2_HMAC_SHA256
-#define as 1 if the crypto library supports HMAC-SHA-256, else 0.
-If defined as 0, the rest of this section can be omitted.
-
-void libssh2_hmac_sha256_init(libssh2_hmac_ctx *ctx,
-	                      const void *key,
-	                      int keylen);
-Setup the HMAC computation context ctx for an HMAC-256 computation using the
-keylen-byte key. Is invoked just after libssh2_hmac_ctx_init().
-
-3.3) SHA-512
-LIBSSH2_HMAC_SHA512
-#define as 1 if the crypto library supports HMAC-SHA-512, else 0.
-If defined as 0, the rest of this section can be omitted.
-
-SHA512_DIGEST_LENGTH
-#define to 64, the SHA-512 digest length.
-
-void libssh2_hmac_sha512_init(libssh2_hmac_ctx *ctx,
-	                      const void *key,
-	                      int keylen);
-Setup the HMAC computation context ctx for an HMAC-512 computation using the
-keylen-byte key. Is invoked just after libssh2_hmac_ctx_init().
-
-3.4) MD5
-LIBSSH2_MD5
-#define to 1 if the crypto library supports MD5, else 0.
-If defined as 0, the rest of this section can be omitted.
-
-MD5_DIGEST_LENGTH
-#define to 16, the MD5 digest length.
-
-libssh2_md5_ctx
-Type of an MD5 computation context. Generally a struct.
-
-int libssh2_md5_init(libssh2_md5_ctx *x);
-Initializes the MD5 computation context at x.
-Returns 1 for success and 0 for failure
-
-void libssh2_md5_update(libssh2_md5_ctx ctx,
-	                const unsigned char *data,
-	                size_t len);
-Continues computation of MD5 on len bytes at data using context ctx.
-Returns 1 for success and 0 for failure.
-Note: if the ctx parameter is modified by the underlying code,
-this procedure must be implemented as a macro to map ctx --> &ctx.
-
-void libssh2_md5_final(libssh2_md5_ctx ctx,
-	               unsigned char output[MD5_DIGEST_LENGTH]);
-Gets the computed MD5 signature from context ctx into the output buffer.
-Release the context.
-Note: if the ctx parameter is modified by the underlying code,
-this procedure must be implemented as a macro to map ctx --> &ctx.
-
-void libssh2_hmac_md5_init(libssh2_hmac_ctx *ctx,
-	                   const void *key,
-	                   int keylen);
-Setup the HMAC computation context ctx for an HMAC-MD5 computation using the
-keylen-byte key. Is invoked just after libssh2_hmac_ctx_init().
-
-3.5) RIPEMD-160
-LIBSSH2_HMAC_RIPEMD
-#define as 1 if the crypto library supports HMAC-RIPEMD-160, else 0.
-If defined as 0, the rest of this section can be omitted.
-
-void libssh2_hmac_ripemd160_init(libssh2_hmac_ctx *ctx,
-	                         const void *key,
-	                         int keylen);
-Setup the HMAC computation context ctx for an HMAC-RIPEMD-160 computation using
-the keylen-byte key. Is invoked just after libssh2_hmac_ctx_init().
-Returns 1 for success and 0 for failure.
-
-
-4) Bidirectional Key ciphers.
-
-_libssh2_cipher_ctx
-Type of a cipher computation context.
-
-_libssh2_cipher_type(name);
-Macro defining name as storage identifying a cipher algorithm for
-the crypto library interface. No trailing semicolon.
-
-int _libssh2_cipher_init(_libssh2_cipher_ctx *h,
-                         _libssh2_cipher_type(algo),
-                         unsigned char *iv,
-                         unsigned char *secret,
-                         int encrypt);
-Creates a cipher context for the given algorithm with the initialization vector
-iv and the secret key secret. Prepare for encryption or decryption depending on
-encrypt.
-Return 0 if OK, else -1.
-This procedure is already prototyped in crypto.h.
-
-int _libssh2_cipher_crypt(_libssh2_cipher_ctx *ctx,
-                          _libssh2_cipher_type(algo),
-                          int encrypt,
-                          unsigned char *block,
-                          size_t blocksize);
-Encrypt or decrypt in-place data at (block, blocksize) using the given
-context and/or algorithm.
-Return 0 if OK, else -1.
-This procedure is already prototyped in crypto.h.
-
-void _libssh2_cipher_dtor(_libssh2_cipher_ctx *ctx);
-Release cipher context at ctx.
-
-4.1) AES
-4.1.1) AES in CBC block mode.
-LIBSSH2_AES
-#define as 1 if the crypto library supports AES in CBC mode, else 0.
-If defined as 0, the rest of this section can be omitted.
-
-_libssh2_cipher_aes128
-AES-128-CBC algorithm identifier initializer.
-#define with constant value of type _libssh2_cipher_type().
-
-_libssh2_cipher_aes192
-AES-192-CBC algorithm identifier initializer.
-#define with constant value of type _libssh2_cipher_type().
-
-_libssh2_cipher_aes256
-AES-256-CBC algorithm identifier initializer.
-#define with constant value of type _libssh2_cipher_type().
-
-4.1.2) AES in CTR block mode.
-LIBSSH2_AES_CTR
-#define as 1 if the crypto library supports AES in CTR mode, else 0.
-If defined as 0, the rest of this section can be omitted.
-
-void _libssh2_init_aes_ctr(void);
-Initialize static AES CTR ciphers.
-This procedure is already prototyped in crypto.h.
-
-_libssh2_cipher_aes128ctr
-AES-128-CTR algorithm identifier initializer.
-#define with constant value of type _libssh2_cipher_type().
-
-_libssh2_cipher_aes192ctr
-AES-192-CTR algorithm identifier initializer.
-#define with constant value of type _libssh2_cipher_type().
-
-_libssh2_cipher_aes256ctr
-AES-256-CTR algorithm identifier initializer.
-#define with constant value of type _libssh2_cipher_type().
-
-4.2) Blowfish in CBC block mode.
-LIBSSH2_BLOWFISH
-#define as 1 if the crypto library supports blowfish in CBC mode, else 0.
-If defined as 0, the rest of this section can be omitted.
-
-_libssh2_cipher_blowfish
-Blowfish-CBC algorithm identifier initializer.
-#define with constant value of type _libssh2_cipher_type().
-
-4.3) RC4.
-LIBSSH2_RC4
-#define as 1 if the crypto library supports RC4 (arcfour), else 0.
-If defined as 0, the rest of this section can be omitted.
-
-_libssh2_cipher_arcfour
-RC4 algorithm identifier initializer.
-#define with constant value of type _libssh2_cipher_type().
-
-4.4) CAST5 in CBC block mode.
-LIBSSH2_CAST
-#define 1 if the crypto library supports cast, else 0.
-If defined as 0, the rest of this section can be omitted.
-
-_libssh2_cipher_cast5
-CAST5-CBC algorithm identifier initializer.
-#define with constant value of type _libssh2_cipher_type().
-
-4.5) Tripple DES in CBC block mode.
-LIBSSH2_3DES
-#define as 1 if the crypto library supports TripleDES in CBC mode, else 0.
-If defined as 0, the rest of this section can be omitted.
-
-_libssh2_cipher_3des
-TripleDES-CBC algorithm identifier initializer.
-#define with constant value of type _libssh2_cipher_type().
-
-
-5) Big numbers.
-Positive multi-byte integers support is sufficient.
-
-5.1) Computation contexts.
-This has a real meaning if the big numbers computations need some context
-storage. If not, use a dummy type and functions (macros).
-
-_libssh2_bn_ctx
-Type of multiple precision computation context. May not be empty. if not used,
-#define as char, for example.
-
-libssh2_bn_ctx _libssh2_bn_ctx_new(void);
-Returns a new multiple precision computation context.
-
-void _libssh2_bn_ctx_free(_libssh2_bn_ctx ctx);
-Releases a multiple precision computation context.
-
-5.2) Computation support.
-_libssh2_bn
-Type of multiple precision numbers (aka bignumbers or huge integers) for the
-crypto library.
-
-_libssh2_bn * _libssh2_bn_init(void);
-Creates a multiple precision number (preset to zero).
-
-_libssh2_bn * _libssh2_bn_init_from_bin(void);
-Create a multiple precision number intended to be set by the
-_libssh2_bn_from_bin() function (see below). Unlike _libssh2_bn_init(), this
-code may be a dummy initializer if the _libssh2_bn_from_bin() actually
-allocates the number. Returns a value of type _libssh2_bn *.
-
-void _libssh2_bn_free(_libssh2_bn *bn);
-Destroys the multiple precision number at bn.
-
-unsigned long _libssh2_bn_bytes(libssh2_bn *bn);
-Get the number of bytes needed to store the bits of the multiple precision
-number at bn.
-
-unsigned long _libssh2_bn_bits(_libssh2_bn *bn);
-Returns the number of bits of multiple precision number at bn.
-
-int _libssh2_bn_set_word(_libssh2_bn *bn, unsigned long val);
-Sets the value of bn to val.
-Returns 1 on success, 0 otherwise.
-
-_libssh2_bn * _libssh2_bn_from_bin(_libssh2_bn *bn, int len,
-	                           const unsigned char *val);
-Converts the positive integer in big-endian form of length len at val
-into a _libssh2_bn and place it in bn. If bn is NULL, a new _libssh2_bn is
-created.
-Returns a pointer to target _libssh2_bn or NULL if error.
-
-int _libssh2_bn_to_bin(_libssh2_bn *bn, unsigned char *val);
-Converts the absolute value of bn into big-endian form and store it at
-val. val must point to _libssh2_bn_bytes(bn) bytes of memory.
-Returns the length of the big-endian number.
-
-void _libssh2_bn_rand(_libssh2_bn *bn, int bits, int top, int bottom);
-Generates a cryptographically strong pseudo-random number of bits in
-length and stores it in bn. If top is -1, the most significant bit of the
-random number can be zero. If top is 0, it is set to 1, and if top is 1, the
-two most significant bits of the number will be set to 1, so that the product
-of two such random numbers will always have 2*bits length. If bottom is true,
-the number will be odd.
-
-void _libssh2_bn_mod_exp(_libssh2_bn *r, _libssh2_bn *a,
-	                 _libssh2_bn *p, _libssh2_bn *m,
-	                 _libssh2_bn_ctx *ctx);
-Computes a to the p-th power modulo m and stores the result into r (r=a^p % m).
-May use the given context.
-
-
-6) Private key algorithms.
-Format of an RSA public key:
-a) "ssh-rsa".
-b) RSA exponent, MSB first, with high order bit = 0.
-c) RSA modulus, MSB first, with high order bit = 0.
-Each item is preceded by its 32-bit byte length, MSB first.
-
-Format of a DSA public key:
-a) "ssh-dss".
-b) p, MSB first, with high order bit = 0.
-c) q, MSB first, with high order bit = 0.
-d) g, MSB first, with high order bit = 0.
-e) pub_key, MSB first, with high order bit = 0.
-Each item is preceded by its 32-bit byte length, MSB first.
-
-int _libssh2_pub_priv_keyfile(LIBSSH2_SESSION *session,
-                              unsigned char **method,
-                              size_t *method_len,
-                              unsigned char **pubkeydata,
-                              size_t *pubkeydata_len,
-                              const char *privatekey,
-                              const char *passphrase);
-Reads a private key from file privatekey and extract the public key -->
-(pubkeydata, pubkeydata_len). Store the associated method (ssh-rsa or ssh-dss)
-into (method, method_len).
-Both buffers have to be allocated using LIBSSH2_ALLOC().
-Returns 0 if OK, else -1.
-This procedure is already prototyped in crypto.h.
-
-int _libssh2_pub_priv_keyfilememory(LIBSSH2_SESSION *session,
-                                    unsigned char **method,
-                                    size_t *method_len,
-                                    unsigned char **pubkeydata,
-                                    size_t *pubkeydata_len,
-                                    const char *privatekeydata,
-                                    size_t privatekeydata_len,
-                                    const char *passphrase);
-Gets a private key from bytes at (privatekeydata, privatekeydata_len) and
-extract the public key --> (pubkeydata, pubkeydata_len). Store the associated
-method (ssh-rsa or ssh-dss) into (method, method_len).
-Both buffers have to be allocated using LIBSSH2_ALLOC().
-Returns 0 if OK, else -1.
-This procedure is already prototyped in crypto.h.
-
-6.1) RSA
-LIBSSH2_RSA
-#define as 1 if the crypto library supports RSA, else 0.
-If defined as 0, the rest of this section can be omitted.
-
-libssh2_rsa_ctx
-Type of an RSA computation context. Generally a struct.
-
-int _libssh2_rsa_new(libssh2_rsa_ctx **rsa,
-                     const unsigned char *edata,
-                     unsigned long elen,
-                     const unsigned char *ndata,
-                     unsigned long nlen,
-                     const unsigned char *ddata,
-                     unsigned long dlen,
-                     const unsigned char *pdata,
-                     unsigned long plen,
-                     const unsigned char *qdata,
-                     unsigned long qlen,
-                     const unsigned char *e1data,
-                     unsigned long e1len,
-                     const unsigned char *e2data,
-                     unsigned long e2len,
-                     const unsigned char *coeffdata, unsigned long coefflen);
-Creates a new context for RSA computations from key source values:
-	pdata, plen	Prime number p. Only used if private key known (ddata).
-	qdata, qlen	Prime number q. Only used if private key known (ddata).
-	ndata, nlen	Modulus n.
-	edata, elen	Exponent e.
-	ddata, dlen	e^-1 % phi(n) = private key. May be NULL if unknown.
-	e1data, e1len	dp = d % (p-1). Only used if private key known (dtata).
-	e2data, e2len	dq = d % (q-1). Only used if private key known (dtata).
-	coeffdata, coefflen	q^-1 % p. Only used if private key known.
-Returns 0 if OK.
-This procedure is already prototyped in crypto.h.
-Note: the current generic code only calls this function with e and n (public
-key parameters): unless used internally by the backend, it is not needed to
-support the private key and the other parameters here.
-
-int _libssh2_rsa_new_private(libssh2_rsa_ctx **rsa,
-                             LIBSSH2_SESSION *session,
-                             const char *filename,
-                             unsigned const char *passphrase);
-Reads an RSA private key from file filename into a new RSA context.
-Must call _libssh2_init_if_needed().
-Return 0 if OK, else -1.
-This procedure is already prototyped in crypto.h.
-
-int _libssh2_rsa_new_private_frommemory(libssh2_rsa_ctx **rsa,
-                                        LIBSSH2_SESSION *session,
-                                        const char *data,
-					size_t data_len,
-                                        unsigned const char *passphrase);
-Gets an RSA private key from data into a new RSA context.
-Must call _libssh2_init_if_needed().
-Return 0 if OK, else -1.
-This procedure is already prototyped in crypto.h.
-
-int _libssh2_rsa_sha1_verify(libssh2_rsa_ctx *rsa,
-                             const unsigned char *sig,
-                             unsigned long sig_len,
-                             const unsigned char *m, unsigned long m_len);
-Verify (sig, siglen) signature of (m, m_len) using an SHA-1 hash and the
-RSA context.
-Return 0 if OK, else -1.
-This procedure is already prototyped in crypto.h.
-
-int _libssh2_rsa_sha1_signv(LIBSSH2_SESSION *session,
-	                    unsigned char **sig, size_t *siglen,
-	                    int count, const struct iovec vector[],
-	                    libssh2_rsa_ctx *ctx);
-RSA signs the SHA-1 hash computed over the count data chunks in vector.
-Signature is stored at (sig, siglen).
-Signature buffer must be allocated from the given session.
-Returns 0 if OK, else -1.
-Note: this procedure is optional: if provided, it MUST be defined as a macro.
-
-int _libssh2_rsa_sha1_sign(LIBSSH2_SESSION *session,
-                           libssh2_rsa_ctx *rsactx,
-                           const unsigned char *hash,
-                           size_t hash_len,
-                           unsigned char **signature,
-                           size_t *signature_len);
-RSA signs the (hash, hashlen) SHA-1 hash bytes and stores the allocated
-signature at (signature, signature_len).
-Signature buffer must be allocated from the given session.
-Returns 0 if OK, else -1.
-This procedure is already prototyped in crypto.h.
-Note: this procedure is not used if macro _libssh2_rsa_sha1_signv() is defined.
-
-void _libssh2_rsa_free(libssh2_rsa_ctx *rsactx);
-Releases the RSA computation context at rsactx.
-
-
-6.2) DSA
-LIBSSH2_DSA
-#define as 1 if the crypto library supports DSA, else 0.
-If defined as 0, the rest of this section can be omitted.
-
-
-libssh2_dsa_ctx
-Type of a DSA computation context. Generally a struct.
-
-int _libssh2_dsa_new(libssh2_dsa_ctx **dsa,
-                     const unsigned char *pdata,
-                     unsigned long plen,
-                     const unsigned char *qdata,
-                     unsigned long qlen,
-                     const unsigned char *gdata,
-                     unsigned long glen,
-                     const unsigned char *ydata,
-                     unsigned long ylen,
-                     const unsigned char *x, unsigned long x_len);
-Creates a new context for DSA computations from source key values:
-	pdata, plen	Prime number p. Only used if private key known (ddata).
-	qdata, qlen	Prime number q. Only used if private key known (ddata).
-	gdata, glen	G number.
-	ydata, ylen	Public key.
-	xdata, xlen	Private key. Only taken if xlen non-zero.
-Returns 0 if OK.
-This procedure is already prototyped in crypto.h.
-
-int _libssh2_dsa_new_private(libssh2_dsa_ctx **dsa,
-                             LIBSSH2_SESSION *session,
-                             const char *filename,
-                             unsigned const char *passphrase);
-Gets a DSA private key from file filename into a new DSA context.
-Must call _libssh2_init_if_needed().
-Return 0 if OK, else -1.
-This procedure is already prototyped in crypto.h.
-
-int _libssh2_dsa_new_private_frommemory(libssh2_dsa_ctx **dsa,
-                                        LIBSSH2_SESSION *session,
-                                        const char *data,
-					size_t data_len,
-                                        unsigned const char *passphrase);
-Gets a DSA private key from the data_len-bytes data into a new DSA context.
-Must call _libssh2_init_if_needed().
-Returns 0 if OK, else -1.
-This procedure is already prototyped in crypto.h.
-
-int _libssh2_dsa_sha1_verify(libssh2_dsa_ctx *dsactx,
-                             const unsigned char *sig,
-                             const unsigned char *m, unsigned long m_len);
-Verify (sig, siglen) signature of (m, m_len) using an SHA1 hash and the
-DSA context.
-Returns 0 if OK, else -1.
-This procedure is already prototyped in crypto.h.
-
-int _libssh2_dsa_sha1_sign(libssh2_dsa_ctx *dsactx,
-                           const unsigned char *hash,
-                           unsigned long hash_len, unsigned char *sig);
-DSA signs the (hash, hash_len) data using SHA-1 and store the signature at sig.
-Returns 0 if OK, else -1.
-This procedure is already prototyped in crypto.h.
-
-void _libssh2_dsa_free(libssh2_dsa_ctx *dsactx);
-Releases the DSA computation context at dsactx.
-
-
-7) Miscellaneous
-
-void libssh2_prepare_iovec(struct iovec *vector, unsigned int len);
-Prepare len consecutive iovec slots before using them.
-In example, this is needed to preset unused structure slacks on platforms
-requiring it.
-If this is not needed, it should be defined as an empty macro.
-
-void _libssh2_random(unsigned char *buf, int len);
-Store len random bytes at buf.
--- a/docs/INSTALL_AUTOTOOLS
+++ b/docs/INSTALL_AUTOTOOLS
@ -1,325 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
-
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
-
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
-More configure options
-======================
-
-Some ./configure options deserve additional comments:
-
- * --enable-crypt-none
-
-	The SSH2 Transport allows for unencrypted data
-	transmission using the "none" cipher.  Because this is
-	such a huge security hole, it is typically disabled on
-	SSH2 implementations and is disabled in libssh2 by
-	default as well.
-
-	Enabling this option will allow for "none" as a
-	negotiable method, however it still requires that the
-	method be advertized by the remote end and that no
-	more-preferable methods are available.
-
- * --enable-mac-none
-
-	The SSH2 Transport also allows implementations to
-	forego a message authentication code.  While this is
-	less of a security risk than using a "none" cipher, it
-	is still not recommended as disabling MAC hashes
-	removes a layer of security.
-
-	Enabling this option will allow for "none" as a
-	negotiable method, however it still requires that the
-	method be advertized by the remote end and that no
-	more-preferable methods are available.
-
- * --disable-gex-new
-
-	The diffie-hellman-group-exchange-sha1 (dh-gex) key
-	exchange method originally defined an exchange
-	negotiation using packet type 30 to request a
-	generation pair based on a single target value.  Later
-	refinement of dh-gex provided for range and target
-	values.  By default libssh2 will use the newer range
-	method.
-
-	If you experience trouble connecting to an old SSH
-	server using dh-gex, try this option to fallback on
-	the older more reliable method.
-
- * --with-libgcrypt
- * --without-libgcrypt
- * --with-libgcrypt-prefix=DIR
-
-	libssh2 can use the Libgcrypt library
-	(http://www.gnupg.org/) for cryptographic operations.
-	Either Libgcrypt or OpenSSL is required.
-
-	Configure will attempt to locate Libgcrypt
-	automatically.
-
-	If your installation of Libgcrypt is in another
-	location, specify it using --with-libgcrypt-prefix.
-
- * --with-openssl
- * --without-openssl
- * --with-libssl-prefix=[DIR]
-
-	libssh2 can use the OpenSSL library
-	(http://www.openssl.org) for cryptographic operations.
-	Either Libgcrypt or OpenSSL is required.
-
-	Configure will attempt to locate OpenSSL in the
-	default location.
-
-	If your installation of OpenSSL is in another
-	location, specify it using --with-libssl-prefix.
-
- * --with-libz
- * --without-libz
- * --with-libz-prefix=[DIR]
-
-	If present, libssh2 will attempt to use the zlib
-	(http://www.zlib.org) for payload compression, however
-	zlib is not required.
-
-	If your installation of Libz is in another location,
-	specify it using --with-libz-prefix.
-
- * --enable-debug
-
-	Will make the build use more pedantic and strict compiler
-	options as well as enable the libssh2_trace() function (for
-	showing debug traces).
--- a/docs/INSTALL_CMAKE
+++ b/docs/INSTALL_CMAKE
@ -1,174 +0,0 @@
-License: see COPYING
-
-Source code: https://github.com/libssh2/libssh2
-
-Web site source code: https://github.com/libssh2/www
-
-Installation instructions are in docs/INSTALL
-=======
-To build libssh2 you will need CMake v2.8 or later [1] and one of the
-following cryptography libraries:
-
-* OpenSSL
-* Libgcrypt
-* WinCNG
-
-Getting started
---------------
-
-If you are happy with the default options, make a new build directory,
-change to it, configure the build environment and build the project:
-
-  mkdir bin
-  cd bin
-  cmake ..
-  cmake --build .
-
-libssh2 will be built as a static library and will use any
-cryptography library available.  The library binary will be put in
-`bin/src`, with the examples in `bin/example` and the tests in
-`bin/tests`.
-
-Customising the build
---------------------
-
-Of course, you might want to customise the build options.  You can
-pass the options to CMake on the command line:
-
-  cmake -D<option>=<value> ..
-
-The following options are available:
-
- * `BUILD_SHARED_LIBS=OFF`
-
-    Determines whether libssh2 is built as a static library or as a
-    shared library (.dll/.so).  Can be `ON` or `OFF`.
-
- * `CRYPTO_BACKEND=`
-
-    Chooses a specific cryptography library to use for cryptographic
-    operations.  Can be `OpenSSL` (http://www.openssl.org),
-    `Libgcrypt` (http://www.gnupg.org/), `WinCNG` (Windows Vista+) or
-    blank to use any library available.
-
-    CMake will attempt to locate the libraries automatically.  See [2]
-    for more information.
-
- * `ENABLE_ZLIB_COMPRESSION=OFF`
-
-    Will use zlib (http://www.zlib.org) for payload compression.  Can
-    be `ON` or `OFF`.
-
- * `ENABLE_CRYPT_NONE=OFF`
-
-    The SSH2 Transport allows for unencrypted data transmission using
-    the "none" cipher.  Because this is such a huge security hole, it
-    is typically disabled on SSH2 implementations and is disabled in
-    libssh2 by default as well.
-
-    Enabling this option will allow for "none" as a negotiable method,
-    however it still requires that the method be advertized by the
-    remote end and that no more-preferable methods are available.
-
- * `ENABLE_MAC_NONE=OFF`
-
-    The SSH2 Transport also allows implementations to forego a message
-    authentication code.  While this is less of a security risk than
-    using a "none" cipher, it is still not recommended as disabling
-    MAC hashes removes a layer of security.
-
-    Enabling this option will allow for "none" as a negotiable method,
-    however it still requires that the method be advertized by the
-    remote end and that no more-preferable methods are available.
-
- * `ENABLE_GEX_NEW=ON`
-
-    The diffie-hellman-group-exchange-sha1 (dh-gex) key exchange
-    method originally defined an exchange negotiation using packet
-    type 30 to request a generation pair based on a single target
-    value.  Later refinement of dh-gex provided for range and target
-    values.  By default libssh2 will use the newer range method.
-
-    If you experience trouble connecting to an old SSH server using
-    dh-gex, try this option to fallback on the older more reliable
-    method.
-
- * `ENABLE_DEBUG_LOGGING=ON` in Debug, `=OFF` in Release
-
-    Will enable the libssh2_trace() function for showing debug traces.
-
-Build tools
-----------
-
-The previous examples used CMake to start the build using:
-
-  cmake --build .
-
-Alternatively, once CMake has configured your project, you can just
-use your own build tool, e.g GNU make, Visual Studio, etc., from that
-point onwards.
-
-Tests
-----
-
-To test the build, run the appropriate test target for your build
-system.  For example:
-
-  cmake --build . --target test
-or
-  cmake --build . --target RUN_TESTS
-
-How do I use libssh2 in my project if my project doesn't use CMake?
-------------------------------------------------------------------
-
-If you are not using CMake for your own project, install libssh2
-
-  cmake <libssh2 source location>
-  cmake --build .
-  cmake --build . --target install
-or
-  cmake --build . --target INSTALL
-
-and then specify the install location to your project in the normal
-way for your build environment.  If you don't like the default install
-location, add `-DCMAKE_INSTALL_PREFIX=<chosen prefix>` when initially
-configuring the project.
-
-How can I use libssh2 in my project if it also uses CMake?
----------------------------------------------------------
-
-If your own project also uses CMake, you don't need to worry about
-setting it up with libssh2's location.  Just add just the following
-lines and CMake will find libssh2 on your system, set up the necessary
-paths and link the library with your binary.
-
-    find_package(Libssh2 REQUIRED CONFIG)
-    target_link_libraries(my_project_target Libssh2::libssh2)
-
-Of course, you still have to make libssh2 available on your system
-first.  You can install it in the traditional way shown above, but you
-don't have to.  Instead you can just build it, which will export its
-location to the user package registry [3] where `find_package` will
-find it.
-
-You can even combine the two steps using a so-called 'superbuild'
-project [4] that downloads, builds and exports libssh2, and then
-builds your project:
-
-    include(ExternalProject)
-
-    ExternalProject_Add(
-        Libssh2
-        URL <libssh2 download location>
-        URL_HASH SHA1=<libssh2 archive SHA1>
-	INSTALL_COMMAND "")
-
-    ExternalProject_Add(
-        MyProject DEPENDS Libssh2
-        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src
-        INSTALL_COMMAND "")
-
-[1] http://www.cmake.org/cmake/resources/software.html
-[2] http://www.cmake.org/cmake/help/v3.0/manual/cmake-packages.7.html
-[3] http://www.cmake.org/cmake/help/v3.0/manual/cmake-packages.7.html#package-registry
-[4] http://www.kitware.com/media/html/BuildingExternalProjectsWithCMake2.8.html
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@ -1,7 +1,6 @@
 # $Id: Makefile.am,v 1.37 2009/03/26 15:41:15 bagder Exp $

-EXTRA_DIST = template.3 BINDINGS INSTALL_AUTOTOOLS INSTALL_CMAKE HACKING TODO	\
- AUTHORS CMakeLists.txt HACKING.CRYPTO
+EXTRA_DIST = template.3

 dist_man_MANS = \
 	libssh2_agent_connect.3 \
@ -14,162 +13,95 @@ dist_man_MANS = \
 	libssh2_banner_set.3 \
 	libssh2_base64_decode.3 \
 	libssh2_channel_close.3 \
-	libssh2_channel_direct_tcpip.3 \
 	libssh2_channel_direct_tcpip_ex.3 \
 	libssh2_channel_eof.3 \
-	libssh2_channel_exec.3 \
-	libssh2_channel_flush.3 \
 	libssh2_channel_flush_ex.3 \
-	libssh2_channel_flush_stderr.3 \
 	libssh2_channel_forward_accept.3 \
 	libssh2_channel_forward_cancel.3 \
-	libssh2_channel_forward_listen.3 \
 	libssh2_channel_forward_listen_ex.3 \
 	libssh2_channel_free.3 \
-	libssh2_channel_get_exit_signal.3 \
 	libssh2_channel_get_exit_status.3 \
 	libssh2_channel_handle_extended_data.3 \
 	libssh2_channel_handle_extended_data2.3 \
-	libssh2_channel_ignore_extended_data.3 \
 	libssh2_channel_open_ex.3 \
-	libssh2_channel_open_session.3 \
 	libssh2_channel_process_startup.3 \
-	libssh2_channel_read.3 \
 	libssh2_channel_read_ex.3 \
-	libssh2_channel_read_stderr.3 \
 	libssh2_channel_receive_window_adjust.3 \
 	libssh2_channel_receive_window_adjust2.3 \
-	libssh2_channel_request_pty.3 \
 	libssh2_channel_request_pty_ex.3 \
-	libssh2_channel_request_pty_size.3 \
 	libssh2_channel_request_pty_size_ex.3 \
 	libssh2_channel_send_eof.3 \
 	libssh2_channel_set_blocking.3 \
-	libssh2_channel_setenv.3 \
 	libssh2_channel_setenv_ex.3 \
-	libssh2_channel_shell.3 \
-	libssh2_channel_subsystem.3 \
 	libssh2_channel_wait_closed.3 \
 	libssh2_channel_wait_eof.3 \
-	libssh2_channel_window_read.3 \
 	libssh2_channel_window_read_ex.3 \
-	libssh2_channel_window_write.3 \
 	libssh2_channel_window_write_ex.3 \
-	libssh2_channel_write.3 \
 	libssh2_channel_write_ex.3 \
-	libssh2_channel_write_stderr.3 \
-	libssh2_channel_x11_req.3 \
 	libssh2_channel_x11_req_ex.3 \
-	libssh2_exit.3 \
-	libssh2_free.3 \
+	libssh2_free_host_entry.3 \
+	libssh2_host_entry_match.3 \
 	libssh2_hostkey_hash.3 \
-	libssh2_init.3 \
-	libssh2_keepalive_config.3 \
-	libssh2_keepalive_send.3 \
 	libssh2_knownhost_add.3 \
-	libssh2_knownhost_addc.3 \
 	libssh2_knownhost_check.3 \
-	libssh2_knownhost_checkp.3 \
 	libssh2_knownhost_del.3 \
-	libssh2_knownhost_free.3 \
 	libssh2_knownhost_get.3 \
 	libssh2_knownhost_init.3 \
+	libssh2_knownhost_free.3 \
 	libssh2_knownhost_readfile.3 \
 	libssh2_knownhost_readline.3 \
 	libssh2_knownhost_writefile.3 \
 	libssh2_knownhost_writeline.3 \
+	libssh2_new_host_entry.3 \
 	libssh2_poll.3 \
 	libssh2_poll_channel_read.3 \
-	libssh2_publickey_add.3 \
 	libssh2_publickey_add_ex.3 \
 	libssh2_publickey_init.3 \
 	libssh2_publickey_list_fetch.3 \
 	libssh2_publickey_list_free.3 \
-	libssh2_publickey_remove.3 \
 	libssh2_publickey_remove_ex.3 \
 	libssh2_publickey_shutdown.3 \
 	libssh2_scp_recv.3 \
-	libssh2_scp_recv2.3 \
-	libssh2_scp_send.3 \
-	libssh2_scp_send64.3 \
 	libssh2_scp_send_ex.3 \
 	libssh2_session_abstract.3 \
-	libssh2_session_banner_get.3 \
-	libssh2_session_banner_set.3 \
 	libssh2_session_block_directions.3 \
 	libssh2_session_callback_set.3 \
-	libssh2_session_disconnect.3 \
 	libssh2_session_disconnect_ex.3 \
 	libssh2_session_flag.3 \
 	libssh2_session_free.3 \
 	libssh2_session_get_blocking.3 \
-	libssh2_session_get_timeout.3 \
-	libssh2_session_handshake.3 \
 	libssh2_session_hostkey.3 \
-	libssh2_session_init.3 \
 	libssh2_session_init_ex.3 \
 	libssh2_session_last_errno.3 \
 	libssh2_session_last_error.3 \
-	libssh2_session_set_last_error.3 \
 	libssh2_session_method_pref.3 \
 	libssh2_session_methods.3 \
 	libssh2_session_set_blocking.3 \
-	libssh2_session_set_timeout.3 \
 	libssh2_session_startup.3 \
-	libssh2_session_supported_algs.3 \
-	libssh2_sftp_close.3 \
 	libssh2_sftp_close_handle.3 \
-	libssh2_sftp_closedir.3 \
-	libssh2_sftp_fsetstat.3 \
-	libssh2_sftp_fstat.3 \
 	libssh2_sftp_fstat_ex.3 \
-	libssh2_sftp_fstatvfs.3 \
-	libssh2_sftp_fsync.3 \
-	libssh2_sftp_get_channel.3 \
 	libssh2_sftp_init.3 \
 	libssh2_sftp_last_error.3 \
-	libssh2_sftp_lstat.3 \
-	libssh2_sftp_mkdir.3 \
 	libssh2_sftp_mkdir_ex.3 \
-	libssh2_sftp_open.3 \
 	libssh2_sftp_open_ex.3 \
-	libssh2_sftp_opendir.3 \
 	libssh2_sftp_read.3 \
-	libssh2_sftp_readdir.3 \
 	libssh2_sftp_readdir_ex.3 \
-	libssh2_sftp_readlink.3 \
-	libssh2_sftp_realpath.3 \
-	libssh2_sftp_rename.3 \
 	libssh2_sftp_rename_ex.3 \
-	libssh2_sftp_rewind.3 \
-	libssh2_sftp_rmdir.3 \
 	libssh2_sftp_rmdir_ex.3 \
 	libssh2_sftp_seek.3 \
-	libssh2_sftp_seek64.3 \
-	libssh2_sftp_setstat.3 \
 	libssh2_sftp_shutdown.3 \
-	libssh2_sftp_stat.3 \
 	libssh2_sftp_stat_ex.3 \
-	libssh2_sftp_statvfs.3 \
-	libssh2_sftp_symlink.3 \
 	libssh2_sftp_symlink_ex.3 \
 	libssh2_sftp_tell.3 \
 	libssh2_sftp_tell64.3 \
-	libssh2_sftp_unlink.3 \
 	libssh2_sftp_unlink_ex.3 \
 	libssh2_sftp_write.3 \
 	libssh2_trace.3 \
 	libssh2_trace_sethandler.3 \
 	libssh2_userauth_authenticated.3 \
-	libssh2_userauth_hostbased_fromfile.3 \
 	libssh2_userauth_hostbased_fromfile_ex.3 \
-	libssh2_userauth_keyboard_interactive.3 \
 	libssh2_userauth_keyboard_interactive_ex.3 \
 	libssh2_userauth_list.3 \
-	libssh2_userauth_password.3 \
 	libssh2_userauth_password_ex.3 \
-	libssh2_userauth_publickey.3 \
-	libssh2_userauth_publickey_fromfile.3 \
 	libssh2_userauth_publickey_fromfile_ex.3 \
-	libssh2_userauth_publickey_frommemory.3 \
 	libssh2_version.3
--- a/docs/TODO
+++ b/docs/TODO
@ -1,174 +0,0 @@
-Things TODO
-===========
-
-* Fix the numerous malloc+copy operations for sending data, see "Buffering
-  Improvements" below for details
-
-* make sure the windowing code adapts better to slow situations so that it
-  doesn't then use as much memory as today. Possibly by an app-controllable
-  "Window mode"?
-
-* Decrease the number of mallocs. Everywhere. Will get easier once the
-  buffering improvements have been done.
-
-* Use SO_NOSIGPIPE for Mac OS/BSD systems where MSG_NOSIGNAL doesn't
-  exist/work
-
-* Extend the test suite to actually test lots of aspects of libssh2
-
-* Fix all compiler warnings (some can't be done without API changes)
-
-* Expose error messages sent by the server
-
-* select() is troublesome with libssh2 when using multiple channels over
-  the same session. See "New Transport API" below for more details.
-
-At next SONAME bump
-===================
-
-* stop using #defined macros as part of the official API. The macros should
-  either be turned into real functions or discarded from the API.
-
-* fix the parts of the API where object pointers and function pointers are
-  mixed like libssh2_session_callback_set()
-
-* remove the following functions from the API/ABI
-
-  libssh2_base64_decode()
-  libssh2_session_flag()
-  libssh2_channel_handle_extended_data()
-  libssh2_channel_receive_window_adjust()
-  libssh2_poll()
-  libssh2_poll_channel_read()
-  libssh2_session_startup() (libssh2_session_handshake() is the replacement)
-  libssh2_banner_set() (libssh2_session_banner_set() is the repacement)
-
-* Rename a few function:
-
-  libssh2_hostkey_hash => libssh2_session_hostkey_hash
-  libssh2_banner_set => libssh2_session_banner_set
-
-* change 'int' to 'libssh2_socket_t' in the public API for sockets.
-
-* Use 'size_t' for string lengths in all functions.
-
-* Add a comment field to struct libssh2_knownhost.
-
-* remove the existing libssh2_knownhost_add() function and rename
-  libssh2_knownhost_addc to become the new libssh2_knownhost_add instead
-
-* remove the existing libssh2_scp_send_ex() function and rename
-  libssh2_scp_send64 to become the new libssh2_scp_send instead.
-
-* remove the existing libssh2_knownhost_check() functin and rename
-  libssh2_knownhost_checkp() to become the new libssh2_knownhost_check instead
-
-Buffering Improvements
-======================
-
-transport_write
-
-  - If this function gets called with a total packet size that is larger than
-  32K, it should create more than one SSH packet so that it keeps the largest
-  one below 32K
-
-sftp_write
-
-  - should not copy/allocate anything for the data, only create a header chunk
-  and pass on the payload data to channel_write "pointed to"
-
-New Transport API
-=================
-
-THE PROBLEM
-
-The problem in a nutshell is that when an application opens up multiple
-channels over a single session, those are all using the same socket. If the
-application is then using select() to wait for traffic (like any sensible app
-does) and wants to act on the data when select() tells there is something to
-for example read, what does an application do?
-
-With our current API, you have to loop over all the channels and read from
-them to see if they have data. This effectively makes blocking reads
-impossible. If the app has many channels in a setup like this, it even becomes
-slow. (The original API had the libssh2_poll_channel_read() and libssh2_poll()
-to somewhat overcome this hurdle, but they too have pretty much the same
-problems plus a few others.)
-
-Traffic in the other direction is similarly limited: the app has to try
-sending to all channels, even though some of them may very well not accept any
-data at that point.
-
-A SOLUTION
-
-I suggest we introduce two new helper functions:
-
- libssh2_transport_read()
-
- - Read "a bunch" of data from the given socket and returns information to the
-   app about what channels that are now readable (ie they will not block when
-   read from). The function can be called over and over and it will repeatedly
-   return info about what channels that are readable at that moment.
-
- libssh2_transport_write()
-
- - Returns information about what channels that are writable, in the sense
-   that they have windows set from the remote side that allows data to get
-   sent. Writing to one of those channels will not block. Of course, the
-   underlying socket may only accept a certain amount of data, so at the first
-   short return, nothing more should be attempted to get sent until select()
-   (or equivalent) has been used on the master socket again.
-
-I haven't yet figured out a sensible API for how these functions should return
-that info, but if we agree on the general principles I guess we can work that
-out.
-
-VOLUNTARY
-
-  I wanted to mention that these two helper functions would not be mandatory
-  in any way. They would just be there for those who want them, and existing
-  programs can remain using the old functions only if they prefer to.
-
-New SFTP API
-============
-
-PURPOSE
-
- Provide API functions that explicitly tells at once that a (full) SFTP file
- transfer is wanted, to allow libssh2 to leverage on that knowledge to speed
- up things internally. It can for example do read ahead, buffer writes (merge
- small writes into larger chunks), better tune the SSH window and more. This
- sort of API is already provided for SCP transfers.
-
-API
-
- New functions:
-
-    LIBSSH2_SFTP_HANDLE *libssh2_sftp_send(SFTP_SESSION *sftp,
-                                           uint64_t filesize,
-                                           char *remote_path,
-                                           size_t remote_path_len,
-                                           long mode);
-
- Tell libssh2 that a local file with a given size is about to get sent to
- the SFTP server.
-
-    LIBSSH2_SFTP_HANDLE *libssh2_sftp_recv();
-
- Tell libssh2 that a remote file is requested to get downloaded from the SFTP
- server.
-
- Only the setup of the file transfer is different from an application's point
- of view. Depending on direction of the transfer(s), the following already
- existing functions should then be used until the transfer is complete:
-
- libssh2_sftp_read()
- libssh2_sftp_write()
-
-HOW TO USE
-
- 1. Setup the transfer using one of the two new functions.
-
- 2. Loop through the reading or writing of data.
-
- 3. Cleanup the transfer
--- a/docs/libssh2_banner_set.3
+++ b/docs/libssh2_banner_set.3
@ -1,6 +1,8 @@
+.\" $Id: libssh2_banner_set.3,v 1.3 2009/03/17 10:34:27 bagder Exp $
+.\"
 .TH libssh2_banner_set 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
-libssh2_banner_set - set the SSH protocol banner for the local client
+libssh2_banner_set - set the SSH prococol banner for the local client
 .SH SYNOPSIS
 #include <libssh2.h>

@ -8,9 +10,6 @@ int
 libssh2_banner_set(LIBSSH2_SESSION *session, const char *banner);

 .SH DESCRIPTION
-This function is \fBDEPRECATED\fP. Use \fIlibssh2_session_banner_set(3)\fP
-instead!
-
 \fIsession\fP - Session instance as returned by 
 .BR libssh2_session_init_ex(3)

@ -18,15 +17,16 @@ instead!

 Set the banner that will be sent to the remote host when the SSH session is 
 started with 
-.BR libssh2_session_handshake(3)
+.BR libssh2_session_startup(3)
  This is optional; a banner corresponding to the protocol and libssh2 version will be sent by default.
+
 .SH RETURN VALUE
 Return 0 on success or negative on failure.  It returns
 LIBSSH2_ERROR_EAGAIN when it would otherwise block. While
 LIBSSH2_ERROR_EAGAIN is a negative number, it isn't really a failure per se.
-.SH AVAILABILITY
-Marked as deprecated since 1.4.0
+
 .SH ERRORS
 \fILIBSSH2_ERROR_ALLOC\fP -  An internal memory allocation call failed.
+
 .SH SEE ALSO
-.BR libssh2_session_handshake(3)
+.BR libssh2_session_startup(3)
--- a/docs/libssh2_base64_decode.3
+++ b/docs/libssh2_base64_decode.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_base64_decode.3,v 1.3 2009/02/17 16:22:51 dottedmag Exp $
+.\"
 .TH libssh2_base64_decode 3 "23 Dec 2008" "libssh2 1.0" "libssh2 manual"
 .SH NAME
 libssh2_base64_decode - decode a base64 encoded string
@ -19,7 +21,7 @@ The returned buffer is allocated by this function, but it is not clear how to
 free that memory!
 .SH BUGS
 The memory that *dest points to is allocated by the malloc function libssh2
-uses, but there's no way for an application to free this data in a safe and
+uses, but there's no way for an appliction to free this data in a safe and
 reliable way!
 .SH RETURN VALUE
 0 if successful, \-1 if any error occurred.
--- a/docs/libssh2_channel_close.3
+++ b/docs/libssh2_channel_close.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_close.3,v 1.3 2009/03/16 23:25:14 bagder Exp $
+.\"
 .TH libssh2_channel_close 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_close - close a channel
--- a/docs/libssh2_channel_direct_tcpip.3
+++ b/docs/libssh2_channel_direct_tcpip.3
@ -1,18 +0,0 @@
-.TH libssh2_channel_direct_tcpip 3 "20 Feb 2010" "libssh2 1.2.4" "libssh2 manual"
-.SH NAME
-libssh2_channel_direct_tcpip - convenience macro for \fIlibssh2_channel_direct_tcpip_ex(3)\fP calls
-.SH SYNOPSIS
-#include <libssh2.h>
-
-LIBSSH2_CHANNEL *
-libssh2_channel_direct_tcpip(LIBSSH2_SESSION *session, const char *host, int port);
-
-.SH DESCRIPTION
-This is a macro defined in a public libssh2 header file that is using the
-underlying function \fIlibssh2_channel_direct_tcpip_ex(3)\fP.
-.SH RETURN VALUE
-See \fIlibssh2_channel_direct_tcpip_ex(3)\fP
-.SH ERRORS
-See \fIlibssh2_channel_direct_tcpip_ex(3)\fP
-.SH SEE ALSO
-.BR libssh2_channel_direct_tcpip_ex(3)
--- a/docs/libssh2_channel_direct_tcpip_ex.3
+++ b/docs/libssh2_channel_direct_tcpip_ex.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_direct_tcpip_ex.3,v 1.2 2009/03/17 10:34:27 bagder Exp $
+.\"
 .TH libssh2_channel_direct_tcpip_ex 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_direct_tcpip_ex - Tunnel a TCP connection through an SSH session
--- a/docs/libssh2_channel_eof.3
+++ b/docs/libssh2_channel_eof.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_eof.3,v 1.2 2009/03/16 23:25:14 bagder Exp $
+.\"
 .TH libssh2_channel_eof 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_eof - check a channel's EOF status
@ -11,7 +13,6 @@ libssh2_channel_eof(LIBSSH2_CHANNEL *channel);

 Check if the remote host has sent an EOF status for the selected stream.
 .SH RETURN VALUE
-Returns 1 if the remote host has sent EOF, otherwise 0. Negative on
-failure.
+Returns 1 if the remote host has sent EOF, otherwise 0.
 .SH SEE ALSO
 .BR libssh2_channel_close(3)
--- a/docs/libssh2_channel_exec.3
+++ b/docs/libssh2_channel_exec.3
@ -1,17 +0,0 @@
-.TH libssh2_channel_exec 3 "20 Feb 2010" "libssh2 1.2.4" "libssh2 manual"
-.SH NAME
-libssh2_channel_exec - convenience macro for \fIlibssh2_channel_process_startup(3)\fP calls
-.SH SYNOPSIS
-#include <libssh2.h>
-
-int libssh2_channel_exec(LIBSSH2_CHANNEL *channel, const char *command);
-
-.SH DESCRIPTION
-This is a macro defined in a public libssh2 header file that is using the
-underlying function \fIlibssh2_channel_process_startup(3)\fP.
-.SH RETURN VALUE
-See \fIlibssh2_channel_process_startup(3)\fP
-.SH ERRORS
-See \fIlibssh2_channel_process_startup(3)\fP
-.SH SEE ALSO
-.BR libssh2_channel_process_startup(3)
--- a/docs/libssh2_channel_flush.3
+++ b/docs/libssh2_channel_flush.3
@ -1,17 +0,0 @@
-.TH libssh2_channel_flush 3 "20 Feb 2010" "libssh2 1.2.4" "libssh2 manual"
-.SH NAME
-libssh2_channel_flush - convenience macro for \fIlibssh2_channel_flush_ex(3)\fP calls
-.SH SYNOPSIS
-#include <libssh2.h>
-
-int libssh2_channel_flush(LIBSSH2_CHANNEL *channel);
-
-.SH DESCRIPTION
-This is a macro defined in a public libssh2 header file that is using the
-underlying function \fIlibssh2_channel_flush_ex(3)\fP.
-.SH RETURN VALUE
-See \fIlibssh2_channel_flush_ex(3)\fP
-.SH ERRORS
-See \fIlibssh2_channel_flush_ex(3)\fP
-.SH SEE ALSO
-.BR libssh2_channel_flush_ex(3)
--- a/docs/libssh2_channel_flush_ex.3
+++ b/docs/libssh2_channel_flush_ex.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_flush_ex.3,v 1.1 2007/06/13 19:53:09 jehousley Exp $
+.\"
 .TH libssh2_channel_flush_ex 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_flush_ex - flush a channel
--- a/docs/libssh2_channel_flush_stderr.3
+++ b/docs/libssh2_channel_flush_stderr.3
@ -1,17 +0,0 @@
-.TH libssh2_channel_flush_stderr 3 "20 Feb 2010" "libssh2 1.2.4" "libssh2 manual"
-.SH NAME
-libssh2_channel_flush_stderr - convenience macro for \fIlibssh2_channel_flush_ex(3)\fP calls
-.SH SYNOPSIS
-#include <libssh2.h>
-
-int libssh2_channel_flush_stderr(LIBSSH2_CHANNEL *channel);
-
-.SH DESCRIPTION
-This is a macro defined in a public libssh2 header file that is using the
-underlying function \fIlibssh2_channel_flush_ex(3)\fP.
-.SH RETURN VALUE
-See \fIlibssh2_channel_flush_ex(3)\fP
-.SH ERRORS
-See \fIlibssh2_channel_flush_ex(3)\fP
-.SH SEE ALSO
-.BR libssh2_channel_flush_ex(3)
--- a/docs/libssh2_channel_forward_accept.3
+++ b/docs/libssh2_channel_forward_accept.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_forward_accept.3,v 1.6 2009/03/16 23:25:14 bagder Exp $
+.\"
 .TH libssh2_channel_forward_accept 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_forward_accept - accept a queued connection
@ -13,8 +15,7 @@ libssh2_channel_forward_accept(LIBSSH2_LISTENER *listener);
 .SH RETURN VALUE
 A newly allocated channel instance or NULL on failure.
 .SH ERRORS
-When this function returns NULL use \fIlibssh2_session_last_errno(3)\fP to
-extract the error code. If that code is \fILIBSSH2_ERROR_EAGAIN\fP, the
-session is set to do non-blocking I/O but the call would block.
+\fILIBSSH2_ERROR_EAGAIN\fP - Marked for non-blocking I/O but the call 
+would block.
 .SH SEE ALSO
 .BR libssh2_channel_forward_listen_ex(3)
--- a/docs/libssh2_channel_forward_cancel.3
+++ b/docs/libssh2_channel_forward_cancel.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_forward_cancel.3,v 1.2 2009/03/16 23:25:14 bagder Exp $
+.\"
 .TH libssh2_channel_forward_cancel 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_forward_cancel - cancel a forwarded TCP port
--- a/docs/libssh2_channel_forward_listen.3
+++ b/docs/libssh2_channel_forward_listen.3
@ -1,17 +0,0 @@
-.TH libssh2_channel_forward_listen 3 "20 Feb 2010" "libssh2 1.2.4" "libssh2 manual"
-.SH NAME
-libssh2_channel_forward_listen - convenience macro for \fIlibssh2_channel_forward_listen_ex(3)\fP calls
-.SH SYNOPSIS
-#include <libssh2.h>
-
-int libssh2_channel_forward_listen(LIBSSH2_SESSION *session, int port);
-
-.SH DESCRIPTION
-This is a macro defined in a public libssh2 header file that is using the
-underlying function \fIlibssh2_channel_forward_listen_ex(3)\fP.
-.SH RETURN VALUE
-See \fIlibssh2_channel_forward_listen_ex(3)\fP
-.SH ERRORS
-See \fIlibssh2_channel_forward_listen_ex(3)\fP
-.SH SEE ALSO
-.BR libssh2_channel_forward_listen_ex(3)
--- a/docs/libssh2_channel_forward_listen_ex.3
+++ b/docs/libssh2_channel_forward_listen_ex.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_forward_listen_ex.3,v 1.7 2007/06/13 16:41:33 jehousley Exp $
+.\"
 .TH libssh2_channel_forward_listen_ex 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_forward_listen_ex - listen to inbound connections
--- a/docs/libssh2_channel_free.3
+++ b/docs/libssh2_channel_free.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_free.3,v 1.1 2007/06/13 20:09:15 jehousley Exp $
+.\"
 .TH libssh2_channel_free 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_free - free all resources associated with a channel
--- a/docs/libssh2_channel_get_exit_signal.3
+++ b/docs/libssh2_channel_get_exit_signal.3
@ -1,34 +0,0 @@
-.TH libssh2_channel_get_exit_signal 3 "4 Oct 2010" "libssh2 1.2.8" "libssh2 manual"
-.SH NAME
-libssh2_channel_get_exit_signal - get the remote exit signal
-.SH SYNOPSIS
-#include <libssh2.h>
-
-int 
-libssh2_channel_get_exit_signal(LIBSSH2_CHANNEL *channel, char **exitsignal, size_t *exitsignal_len, char **errmsg, size_t *errmsg_len, char **langtag, size_t *langtag_len);
-
-.SH DESCRIPTION
-\fIchannel\fP - Closed channel stream to retrieve exit signal from.
-
-\fIexitsignal\fP - If not NULL, is populated by reference with the exit signal
-(without leading "SIG"). Note that the string is stored in a newly allocated
-buffer. If the remote program exited cleanly, the referenced string pointer
-will be set to NULL. 
-
-\fIexitsignal_len\fP - If not NULL, is populated by reference with the length
-of exitsignal. 
-
-\fIerrmsg\fP - If not NULL, is populated by reference with the error message
-(if provided by remote server, if not it will be set to NULL). Note that the
-string is stored in a newly allocated buffer.
-
-\fIerrmsg_len\fP - If not NULL, is populated by reference with the length of errmsg.
-
-\fIlangtag\fP - If not NULL, is populated by reference with the language tag 
-(if provided by remote server, if not it will be set to NULL). Note that the
-string is stored in a newly allocated buffer.
-
-\fIlangtag_len\fP - If not NULL, is populated by reference with the length of langtag.
-
-.SH RETURN VALUE
-Numeric error code corresponding to the the Error Code constants.
--- a/docs/libssh2_channel_get_exit_status.3
+++ b/docs/libssh2_channel_get_exit_status.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_get_exit_status.3,v 1.1 2007/06/15 10:53:04 jehousley Exp $
+.\"
 .TH libssh2_channel_get_exit_status 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_get_exit_status - get the remote exit code
@ -8,7 +10,7 @@ int
 libssh2_channel_get_exit_status(LIBSSH2_CHANNEL* channel)

 .SH DESCRIPTION
-\fIchannel\fP - Closed channel stream to retrieve exit status from.
+\fIchannel\fP - Closed channel stream to retreive exit status from.

 Returns the exit code raised by the process running on the remote host at 
 the other end of the named channel. Note that the exit status may not be 
--- a/docs/libssh2_channel_handle_extended_data.3
+++ b/docs/libssh2_channel_handle_extended_data.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_handle_extended_data.3,v 1.2 2009/03/26 15:41:16 bagder Exp $
+.\"
 .TH libssh2_channel_handle_extended_data 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_handle_extended_data - set extended data handling mode
--- a/docs/libssh2_channel_handle_extended_data2.3
+++ b/docs/libssh2_channel_handle_extended_data2.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_handle_extended_data2.3,v 1.1 2007/06/13 20:09:15 jehousley Exp $
+.\"
 .TH libssh2_channel_handle_extended_data2 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_handle_extended_data2 - set extended data handling mode
--- a/docs/libssh2_channel_ignore_extended_data.3
+++ b/docs/libssh2_channel_ignore_extended_data.3
@ -1,20 +0,0 @@
-.TH libssh2_channel_ignore_extended_data 3 "20 Feb 2010" "libssh2 1.2.4" "libssh2 manual"
-.SH NAME
-libssh2_channel_ignore_extended_data - convenience macro for \fIlibssh2_channel_handle_extended_data(3)\fP calls
-.SH SYNOPSIS
-#include <libssh2.h>
-
-libssh2_channel_ignore_extended_data(arguments)
-
-.SH DESCRIPTION
-This function is deprecated. Use the
-\fIlibssh2_channel_handle_extended_data2(3)\fP function instead!
-
-This is a macro defined in a public libssh2 header file that is using the
-underlying function \fIlibssh2_channel_handle_extended_data(3)\fP.
-.SH RETURN VALUE
-See \fIlibssh2_channel_handle_extended_data(3)\fP
-.SH ERRORS
-See \fIlibssh2_channel_handle_extended_data(3)\fP
-.SH SEE ALSO
-.BR libssh2_channel_handle_extended_data(3)
--- a/docs/libssh2_channel_open_ex.3
+++ b/docs/libssh2_channel_open_ex.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_open_ex.3,v 1.2 2009/03/17 10:34:27 bagder Exp $
+.\"
 .TH libssh2_channel_open_ex 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_open_ex - establish a generic session channel
--- a/docs/libssh2_channel_open_session.3
+++ b/docs/libssh2_channel_open_session.3
@ -1,18 +0,0 @@
-.TH libssh2_channel_open_session 3 "20 Feb 2010" "libssh2 1.2.4" "libssh2 manual"
-.SH NAME
-libssh2_channel_open_session - convenience macro for \fIlibssh2_channel_open_ex(3)\fP calls
-.SH SYNOPSIS
-#include <libssh2.h>
-
-LIBSSH2_CHANNEL *
-libssh2_channel_open_session(LIBSSH2_SESSION *session);
-
-.SH DESCRIPTION
-This is a macro defined in a public libssh2 header file that is using the
-underlying function \fIlibssh2_channel_open_ex(3)\fP.
-.SH RETURN VALUE
-See \fIlibssh2_channel_open_ex(3)\fP
-.SH ERRORS
-See \fIlibssh2_channel_open_ex(3)\fP
-.SH SEE ALSO
-.BR libssh2_channel_open_ex(3)
--- a/docs/libssh2_channel_process_startup.3
+++ b/docs/libssh2_channel_process_startup.3
@ -1,15 +1,23 @@
+.\" $Id: libssh2_channel_process_startup.3,v 1.2 2009/03/16 23:25:14 bagder Exp $
+.\"
 .TH libssh2_channel_process_startup 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_process_startup - request a shell on a channel
 .SH SYNOPSIS
-.nf
 #include <libssh2.h>

-int libssh2_channel_process_startup(LIBSSH2_CHANNEL *channel,
-                                    const char *request,
-                                    unsigned int request_len,
-                                    const char *message,
-                                    unsigned int message_len);
+int
+libssh2_channel_process_startup(LIBSSH2_CHANNEL *channel, const char *request, unsigned int request_len, const char *message, unsigned int message_len);
+
+int
+libssh2_channel_shell(LIBSSH2_CHANNEL *channel);
+
+int
+libssh2_channel_exec(LIBSSH2_CHANNEL *channel, const char *message);
+
+int
+libssh2_channel_subsystem(LIBSSH2_CHANNEL *channel, const char *message);
+
 .SH DESCRIPTION
 \fIchannel\fP - Active session channel instance.

--- a/docs/libssh2_channel_read.3
+++ b/docs/libssh2_channel_read.3
@ -1,17 +0,0 @@
-.TH libssh2_channel_read 3 "20 Feb 2010" "libssh2 1.2.4" "libssh2 manual"
-.SH NAME
-libssh2_channel_read - convenience macro for \fIlibssh2_channel_read_ex(3)\fP calls
-.SH SYNOPSIS
-#include <libssh2.h>
-
-ssize_t libssh2_channel_read(LIBSSH2_CHANNEL *channel, char *buf, size_t buflen);
-
-.SH DESCRIPTION
-This is a macro defined in a public libssh2 header file that is using the
-underlying function \fIlibssh2_channel_read_ex(3)\fP.
-.SH RETURN VALUE
-See \fIlibssh2_channel_read_ex(3)\fP
-.SH ERRORS
-See \fIlibssh2_channel_read_ex(3)\fP
-.SH SEE ALSO
-.BR libssh2_channel_read_ex(3)
--- a/docs/libssh2_channel_read_ex.3
+++ b/docs/libssh2_channel_read_ex.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_read_ex.3,v 1.10 2007/06/13 16:41:33 jehousley Exp $
+.\"
 .TH libssh2_channel_read_ex 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_read_ex - read data from a channel stream
--- a/docs/libssh2_channel_read_stderr.3
+++ b/docs/libssh2_channel_read_stderr.3
@ -1,17 +0,0 @@
-.TH libssh2_channel_read_stderr 3 "20 Feb 2010" "libssh2 1.2.4" "libssh2 manual"
-.SH NAME
-libssh2_channel_read_stderr - convenience macro for \fIlibssh2_channel_read_ex(3)\fP calls
-.SH SYNOPSIS
-#include <libssh2.h>
-
-ssize_t libssh2_channel_read_stderr(LIBSSH2_CHANNEL *channel, char *buf, size_t buflen);
-
-.SH DESCRIPTION
-This is a macro defined in a public libssh2 header file that is using the
-underlying function \fIlibssh2_channel_read_ex(3)\fP.
-.SH RETURN VALUE
-See \fIlibssh2_channel_read_ex(3)\fP
-.SH ERRORS
-See \fIlibssh2_channel_read_ex(3)\fP
-.SH SEE ALSO
-.BR libssh2_channel_read_ex(3)
--- a/docs/libssh2_channel_receive_window_adjust.3
+++ b/docs/libssh2_channel_receive_window_adjust.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_receive_window_adjust.3,v 1.3 2009/03/26 15:41:16 bagder Exp $
+.\"
 .TH libssh2_channel_receive_window_adjust 3 "15 Mar 2009" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_receive_window_adjust - adjust the channel window
--- a/docs/libssh2_channel_receive_window_adjust2.3
+++ b/docs/libssh2_channel_receive_window_adjust2.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_receive_window_adjust2.3,v 1.1 2009/03/26 15:41:16 bagder Exp $
+.\"
 .TH libssh2_channel_receive_window_adjust2 3 "26 Mar 2009" "libssh2 1.1" "libssh2 manual"
 .SH NAME
 libssh2_channel_receive_window_adjust2 - adjust the channel window
--- a/docs/libssh2_channel_request_pty.3
+++ b/docs/libssh2_channel_request_pty.3
@ -1,17 +0,0 @@
-.TH libssh2_channel_request_pty 3 "20 Feb 2010" "libssh2 1.2.4" "libssh2 manual"
-.SH NAME
-libssh2_channel_request_pty - convenience macro for \fIlibssh2_channel_request_pty_ex(3)\fP calls
-.SH SYNOPSIS
-#include <libssh2.h>
-
-int libssh2_channel_request_pty(LIBSSH2_SESSION *session, const char *term);
-
-.SH DESCRIPTION
-This is a macro defined in a public libssh2 header file that is using the
-underlying function \fIlibssh2_channel_request_pty_ex(3)\fP.
-.SH RETURN VALUE
-See \fIlibssh2_channel_request_pty_ex(3)\fP
-.SH ERRORS
-See \fIlibssh2_channel_request_pty_ex(3)\fP
-.SH SEE ALSO
-.BR libssh2_channel_request_pty_ex(3)
--- a/docs/libssh2_channel_request_pty_ex.3
+++ b/docs/libssh2_channel_request_pty_ex.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_request_pty_ex.3,v 1.2 2009/03/16 23:25:14 bagder Exp $
+.\"
 .TH libssh2_channel_request_pty_ex 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_request_pty_ex - short function description
--- a/docs/libssh2_channel_request_pty_size.3
+++ b/docs/libssh2_channel_request_pty_size.3
@ -1,17 +0,0 @@
-.TH libssh2_channel_request_pty_size 3 "20 Feb 2010" "libssh2 1.2.4" "libssh2 manual"
-.SH NAME
-libssh2_channel_request_pty_size - convenience macro for \fIlibssh2_channel_request_pty_size_ex(3)\fP calls
-.SH SYNOPSIS
-#include <libssh2.h>
-
-int libssh2_channel_request_pty_size(LIBSSH2_CHANNEL *channel, int width, int height);
-
-.SH DESCRIPTION
-This is a macro defined in a public libssh2 header file that is using the
-underlying function \fIlibssh2_channel_request_pty_size_ex(3)\fP.
-.SH RETURN VALUE
-See \fIlibssh2_channel_request_pty_size_ex(3)\fP
-.SH ERRORS
-See \fIlibssh2_channel_request_pty_size_ex(3)\fP
-.SH SEE ALSO
-.BR libssh2_channel_request_pty_size_ex(3)
--- a/docs/libssh2_channel_request_pty_size_ex.3
+++ b/docs/libssh2_channel_request_pty_size_ex.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_request_pty_size_ex.3,v 1.1 2009/03/16 15:00:45 bagder Exp $
+.\"
 .TH libssh2_channel_request_pty_size_ex 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_request_pty_size_ex - TODO
--- a/docs/libssh2_channel_send_eof.3
+++ b/docs/libssh2_channel_send_eof.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_send_eof.3,v 1.1 2007/06/13 21:07:59 jehousley Exp $
+.\"
 .TH libssh2_channel_send_eof 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_send_eof - send EOF to remote server
--- a/docs/libssh2_channel_set_blocking.3
+++ b/docs/libssh2_channel_set_blocking.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_set_blocking.3,v 1.6 2009/03/26 15:41:16 bagder Exp $
+.\"
 .TH libssh2_channel_set_blocking 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_set_blocking - set or clear blocking mode on channel
--- a/docs/libssh2_channel_setenv.3
+++ b/docs/libssh2_channel_setenv.3
@ -1,17 +0,0 @@
-.TH libssh2_channel_setenv 3 "20 Feb 2010" "libssh2 1.2.4" "libssh2 manual"
-.SH NAME
-libssh2_channel_setenv - convenience macro for \fIlibssh2_channel_setenv_ex(3)\fP calls
-.SH SYNOPSIS
-#include <libssh2.h>
-
-int libssh2_channel_setenv(LIBSSH2_CHANNEL *channel, const char *varname, const char *value);
-
-.SH DESCRIPTION
-This is a macro defined in a public libssh2 header file that is using the
-underlying function \fIlibssh2_channel_setenv_ex(3)\fP.
-.SH RETURN VALUE
-See \fIlibssh2_channel_setenv_ex(3)\fP
-.SH ERRORS
-See \fIlibssh2_channel_setenv_ex(3)\fP
-.SH SEE ALSO
-.BR libssh2_channel_setenv_ex(3)
--- a/docs/libssh2_channel_setenv_ex.3
+++ b/docs/libssh2_channel_setenv_ex.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_setenv_ex.3,v 1.2 2009/03/16 23:25:14 bagder Exp $
+.\"
 .TH libssh2_channel_setenv_ex 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_setenv_ex - set an environment variable on the channel
--- a/docs/libssh2_channel_shell.3
+++ b/docs/libssh2_channel_shell.3
@ -1,17 +0,0 @@
-.TH libssh2_channel_shell 3 "20 Feb 2010" "libssh2 1.2.4" "libssh2 manual"
-.SH NAME
-libssh2_channel_shell - convenience macro for \fIlibssh2_channel_process_startup(3)\fP calls
-.SH SYNOPSIS
-#include <libssh2.h>
-
-int libssh2_channel_shell(LIBSSH2_CHANNEL *channel);
-
-.SH DESCRIPTION
-This is a macro defined in a public libssh2 header file that is using the
-underlying function \fIlibssh2_channel_process_startup(3)\fP.
-.SH RETURN VALUE
-See \fIlibssh2_channel_process_startup(3)\fP
-.SH ERRORS
-See \fIlibssh2_channel_process_startup(3)\fP
-.SH SEE ALSO
-.BR libssh2_channel_process_startup(3)
--- a/docs/libssh2_channel_subsystem.3
+++ b/docs/libssh2_channel_subsystem.3
@ -1,17 +0,0 @@
-.TH libssh2_channel_subsystem 3 "20 Feb 2010" "libssh2 1.2.4" "libssh2 manual"
-.SH NAME
-libssh2_channel_subsystem - convenience macro for \fIlibssh2_channel_process_startup(3)\fP calls
-.SH SYNOPSIS
-#include <libssh2.h>
-
-int libssh2_channel_subsystem(LIBSSH2_CHANNEL *channel, const char *subsystem);
-
-.SH DESCRIPTION
-This is a macro defined in a public libssh2 header file that is using the
-underlying function \fIlibssh2_channel_process_startup(3)\fP.
-.SH RETURN VALUE
-See \fIlibssh2_channel_process_startup(3)\fP
-.SH ERRORS
-See \fIlibssh2_channel_process_startup(3)\fP
-.SH SEE ALSO
-.BR libssh2_channel_process_startup(3)
--- a/docs/libssh2_channel_wait_closed.3
+++ b/docs/libssh2_channel_wait_closed.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_wait_closed.3,v 1.2 2007/11/29 10:04:16 bagder Exp $
+.\"
 .TH libssh2_channel_wait_closed 3 "29 Nov 2007" "libssh2 0.19" "libssh2 manual"
 .SH NAME
 libssh2_channel_wait_closed - wait for the remote to close the channel
--- a/docs/libssh2_channel_wait_eof.3
+++ b/docs/libssh2_channel_wait_eof.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_wait_eof.3,v 1.5 2007/06/13 16:41:33 jehousley Exp $
+.\"
 .TH libssh2_channel_wait_eof 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_wait_eof - wait for the remote to reply to an EOF request
--- a/docs/libssh2_channel_window_read.3
+++ b/docs/libssh2_channel_window_read.3
@ -1,17 +0,0 @@
-.TH libssh2_channel_window_read 3 "20 Feb 2010" "libssh2 1.2.4" "libssh2 manual"
-.SH NAME
-libssh2_channel_window_read - convenience macro for \fIlibssh2_channel_window_read_ex(3)\fP calls
-.SH SYNOPSIS
-#include <libssh2.h>
-
-unsigned long libssh2_channel_window_read(LIBSSH2_CHANNEL *channel);
-
-.SH DESCRIPTION
-This is a macro defined in a public libssh2 header file that is using the
-underlying function \fIlibssh2_channel_window_read_ex(3)\fP.
-.SH RETURN VALUE
-See \fIlibssh2_channel_window_read_ex(3)\fP
-.SH ERRORS
-See \fIlibssh2_channel_window_read_ex(3)\fP
-.SH SEE ALSO
-.BR libssh2_channel_window_read_ex(3)
--- a/docs/libssh2_channel_window_read_ex.3
+++ b/docs/libssh2_channel_window_read_ex.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_window_read_ex.3,v 1.2 2009/03/16 23:25:14 bagder Exp $
+.\"
 .TH libssh2_channel_window_read_ex 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_window_read_ex - Check the status of the read window
--- a/docs/libssh2_channel_window_write.3
+++ b/docs/libssh2_channel_window_write.3
@ -1,17 +0,0 @@
-.TH libssh2_channel_window_write 3 "20 Feb 2010" "libssh2 1.2.4" "libssh2 manual"
-.SH NAME
-libssh2_channel_window_write - convenience macro for \fIlibssh2_channel_window_write_ex(3)\fP calls
-.SH SYNOPSIS
-#include <libssh2.h>
-
-unsigned long libssh2_channel_window_write(LIBSSH2_CHANNEL *channel);
-
-.SH DESCRIPTION
-This is a macro defined in a public libssh2 header file that is using the
-underlying function \fIlibssh2_channel_window_write_ex(3)\fP.
-.SH RETURN VALUE
-See \fIlibssh2_channel_window_write_ex(3)\fP
-.SH ERRORS
-See \fIlibssh2_channel_window_write_ex(3)\fP
-.SH SEE ALSO
-.BR libssh2_channel_window_write_ex(3)
--- a/docs/libssh2_channel_window_write_ex.3
+++ b/docs/libssh2_channel_window_write_ex.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_window_write_ex.3,v 1.2 2009/03/16 23:25:14 bagder Exp $
+.\"
 .TH libssh2_channel_window_write_ex 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_window_write_ex - Check the status of the write window
@ -9,11 +11,11 @@ libssh2_channel_window_write_ex(LIBSSH2_CHANNEL *channel,
                                unsigned long *window_size_initial)
 .SH DESCRIPTION
 Check the status of the write window Returns the number of bytes which may be
-safely written on the channel without blocking. 'window_size_initial' (if
+safely writen on the channel without blocking. 'window_size_initial' (if
 passed) will be populated with the size of the initial window as defined by
 the channel_open request
 .SH RETURN VALUE
-Number of bytes which may be safely written on the channel without blocking.
+Number of bytes which may be safely writen on the channel without blocking.
 .SH ERRORS

 .SH SEE ALSO
--- a/docs/libssh2_channel_write.3
+++ b/docs/libssh2_channel_write.3
@ -1,18 +0,0 @@
-.TH libssh2_channel_write 3 "20 Feb 2010" "libssh2 1.2.4" "libssh2 manual"
-.SH NAME
-libssh2_channel_write - convenience macro for \fIlibssh2_channel_write_ex(3)\fP
-.SH SYNOPSIS
-.nf
-#include <libssh2.h>
-
-ssize_t libssh2_channel_write(LIBSSH2_CHANNEL *channel, const char *buf, size_t buflen);
-
-.SH DESCRIPTION
-This is a macro defined in a public libssh2 header file that is using the
-underlying function \fIlibssh2_channel_write_ex(3)\fP.
-.SH RETURN VALUE
-See \fIlibssh2_channel_write_ex(3)\fP
-.SH ERRORS
-See \fIlibssh2_channel_write_ex(3)\fP
-.SH SEE ALSO
-.BR libssh2_channel_write_ex(3)
--- a/docs/libssh2_channel_write_ex.3
+++ b/docs/libssh2_channel_write_ex.3
@ -1,13 +1,19 @@
+.\" $Id: libssh2_channel_write_ex.3,v 1.6 2009/03/16 23:25:14 bagder Exp $
+.\"
 .TH libssh2_channel_write_ex 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_write_ex - write data to a channel stream blocking
 .SH SYNOPSIS
-.nf
 #include <libssh2.h>

-ssize_t libssh2_channel_write_ex(LIBSSH2_CHANNEL *channel,
-                                 int stream_id, char *buf,
-                                 size_t buflen);
+ssize_t
+libssh2_channel_write_ex(LIBSSH2_CHANNEL *channel, int stream_id, char *buf, size_t buflen);
+
+ssize_t
+libssh2_channel_write(LIBSSH2_CHANNEL *channel, char *buf, size_t buflen);
+
+ssize_t
+libssh2_channel_write_stderr(LIBSSH2_CHANNEL *channel, char *buf, size_t buflen);
 .SH DESCRIPTION
 Write data to a channel stream. All channel streams have one standard I/O
 substream (stream_id == 0), and may have up to 2^32 extended data streams as
@ -23,12 +29,7 @@ defines a stream ID of 1 to be the stderr substream.
 \fIbuflen\fP - size of the data to write

 \fIlibssh2_channel_write(3)\fP and \fIlibssh2_channel_write_stderr(3)\fP are
-convenience macros for this function.
-
-\fIlibssh2_channel_write_ex(3)\fP will use as much as possible of the buffer
-and put it into a single SSH protocol packet. This means that to get maximum
-performance when sending larger files, you should try to always pass in at
-least 32K of data to this function.
+macros.
 .SH RETURN VALUE
 Actual number of bytes written or negative on failure.
 LIBSSH2_ERROR_EAGAIN when it would otherwise block. While
--- a/docs/libssh2_channel_write_stderr.3
+++ b/docs/libssh2_channel_write_stderr.3
@ -1,18 +0,0 @@
-.TH libssh2_channel_write_stderr 3 "20 Feb 2010" "libssh2 1.2.4" "libssh2 manual"
-.SH NAME
-libssh2_channel_write_stderr - convenience macro for \fIlibssh2_channel_write_ex(3)\fP
-.SH SYNOPSIS
-.nf
-#include <libssh2.h>
-
-ssize_t libssh2_channel_write_stderr(LIBSSH2_CHANNEL *channel, const char *buf, size_t buflen);
-
-.SH DESCRIPTION
-This is a macro defined in a public libssh2 header file that is using the
-underlying function \fIlibssh2_channel_write_ex(3)\fP.
-.SH RETURN VALUE
-See \fIlibssh2_channel_write_ex(3)\fP
-.SH ERRORS
-See \fIlibssh2_channel_write_ex(3)\fP
-.SH SEE ALSO
-.BR libssh2_channel_write_ex(3)
--- a/docs/libssh2_channel_x11_req.3
+++ b/docs/libssh2_channel_x11_req.3
@ -1,17 +0,0 @@
-.TH libssh2_channel_x11_req 3 "20 Feb 2010" "libssh2 1.2.4" "libssh2 manual"
-.SH NAME
-libssh2_channel_x11_req - convenience macro for \fIlibssh2_channel_x11_req_ex(3)\fP calls
-.SH SYNOPSIS
-#include <libssh2.h>
-
-int libssh2_channel_x11_req(LIBSSH2_CHANNEL *channel, int screen_number);
-
-.SH DESCRIPTION
-This is a macro defined in a public libssh2 header file that is using the
-underlying function \fIlibssh2_channel_x11_req_ex(3)\fP.
-.SH RETURN VALUE
-See \fIlibssh2_channel_x11_req_ex(3)\fP
-.SH ERRORS
-See \fIlibssh2_channel_x11_req_ex(3)\fP
-.SH SEE ALSO
-.BR libssh2_channel_x11_req_ex(3)
--- a/docs/libssh2_channel_x11_req_ex.3
+++ b/docs/libssh2_channel_x11_req_ex.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_channel_x11_req_ex.3,v 1.2 2009/03/16 23:25:14 bagder Exp $
+.\"
 .TH libssh2_channel_x11_req_ex 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_channel_x11_req_ex - request an X11 forwarding channel
--- a/docs/libssh2_exit.3
+++ b/docs/libssh2_exit.3
@ -1,14 +0,0 @@
-.TH libssh2_exit 3 "19 Mar 2010" "libssh2 1.2.5" "libssh2 manual"
-.SH NAME
-libssh2_exit - global library deinitialization
-.SH SYNOPSIS
-#include <libssh2.h>
-
-void
-libssh2_exit(void);
-.SH DESCRIPTION
-Exit the libssh2 functions and free's all memory used internal.
-.SH AVAILABILITY
-Added in libssh2 1.2.5
-.SH SEE ALSO
-.BR libssh2_init(3)
--- a/docs/libssh2_free.3
+++ b/docs/libssh2_free.3
@ -1,19 +0,0 @@
-.TH libssh2_exit 3 "13 Oct 2010" "libssh2 1.2.8" "libssh2 manual"
-.SH NAME
-libssh2_free - deallocate libssh2 memory
-.SH SYNOPSIS
-#include <libssh2.h>
-
-void
-libssh2_free(LIBSSH2_SESSION *session, void *ptr);
-.SH DESCRIPTION
-Deallocate memory allocated by earlier call to libssh2 functions.  It
-uses the memory allocation callbacks provided by the application, if
-any.  Otherwise, this will just call free().
-
-This function is mostly useful under Windows when libssh2 is linked to
-one run-time library and the application to another.
-.SH AVAILABILITY
-Added in libssh2 1.2.8
-.SH SEE ALSO
-.BR libssh2_session_init_ex(3)
--- a/docs/libssh2_free_host_entry.3
+++ b/docs/libssh2_free_host_entry.3
@ -0,0 +1,14 @@
+.\" $Id: libssh2_free_host_entry.3,v 1.1 2009/03/16 15:00:45 bagder Exp $
+.\"
+.TH libssh2_free_host_entry 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
+.SH NAME
+libssh2_free_host_entry - TODO
+.SH SYNOPSIS
+
+.SH DESCRIPTION
+
+.SH RETURN VALUE
+
+.SH ERRORS
+
+.SH SEE ALSO
--- a/docs/libssh2_host_entry_match.3
+++ b/docs/libssh2_host_entry_match.3
@ -0,0 +1,14 @@
+.\" $Id: libssh2_host_entry_match.3,v 1.1 2009/03/16 15:00:45 bagder Exp $
+.\"
+.TH libssh2_host_entry_match 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
+.SH NAME
+libssh2_host_entry_match - TODO
+.SH SYNOPSIS
+
+.SH DESCRIPTION
+
+.SH RETURN VALUE
+
+.SH ERRORS
+
+.SH SEE ALSO
--- a/docs/libssh2_hostkey_hash.3
+++ b/docs/libssh2_hostkey_hash.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_hostkey_hash.3,v 1.2 2009/03/17 10:34:27 bagder Exp $
+.\"
 .TH libssh2_hostkey_hash 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_hostkey_hash - return a hash of the remote host's key
@ -18,9 +20,8 @@ Returns the computed digest of the remote system's hostkey. The length of
 the returned string is hash_type specific (e.g. 16 bytes for MD5, 
 20 bytes for SHA1).
 .SH RETURN VALUE
-Computed hostkey hash value, or NULL if the information is not available
-(either the session has not yet been started up, or the requested hash
-algorithm was not available). The hash consists of raw binary bytes, not hex
-digits, so it is not directly printable.
+Computed hostkey hash value. or NULL if the session has not yet been started 
+up. (The hash consists of raw binary bytes, not hex digits, so is not 
+directly printable.)
 .SH SEE ALSO
 .BR libssh2_session_init_ex(3)
--- a/docs/libssh2_init.3
+++ b/docs/libssh2_init.3
@ -1,20 +0,0 @@
-.TH libssh2_init 3 "19 Mar 2010" "libssh2 1.2.5" "libssh2 manual"
-.SH NAME
-libssh2_init - global library initialization
-.SH SYNOPSIS
-#include <libssh2.h>
-
-#define LIBSSH2_INIT_NO_CRYPTO 0x0001
-
-int
-libssh2_init(int flags);
-.SH DESCRIPTION
-Initialize the libssh2 functions.  This typically initialize the
-crypto library.  It uses a global state, and is not thread safe -- you
-must make sure this function is not called concurrently.
-.SH RETURN VALUE
-Returns 0 if succeeded, or a negative value for error.
-.SH AVAILABILITY
-Added in libssh2 1.2.5
-.SH SEE ALSO
-.BR libssh2_exit(3)
--- a/docs/libssh2_keepalive_config.3
+++ b/docs/libssh2_keepalive_config.3
@ -1,27 +0,0 @@
-.TH libssh2_keepalive_config 3 "12 Apr 2011" "libssh2 1.2.5" "libssh2 manual"
-.SH NAME
-libssh2_keepalive_config - short function description
-.SH SYNOPSIS
-#include <libssh2.h>
-.nf
-
-void libssh2_keepalive_config(LIBSSH2_SESSION *session,
-                              int want_reply,
-                              unsigned interval);
-.fi
-.SH DESCRIPTION
-Set how often keepalive messages should be sent. \fBwant_reply\fP indicates
-whether the keepalive messages should request a response from the server.
-\fBinterval\fP is number of seconds that can pass without any I/O, use 0 (the
-default) to disable keepalives.  To avoid some busy-loop corner-cases, if you
-specify an interval of 1 it will be treated as 2.
-
-Note that non-blocking applications are responsible for sending the keepalive
-messages using \fBlibssh2_keepalive_send(3)\fP.
-.SH RETURN VALUE
-Nothing
-.SH AVAILABILITY
-Added in libssh2 1.2.5
-.SH SEE ALSO
-.BR libssh2_keepalive_send(3)
-
--- a/docs/libssh2_keepalive_send.3
+++ b/docs/libssh2_keepalive_send.3
@ -1,18 +0,0 @@
-.TH libssh2_keepalive_send 3 "13 Apr 2011" "libssh2 1.2.5" "libssh2 manual"
-.SH NAME
-libssh2_keepalive_send - short function description
-.SH SYNOPSIS
-#include <libssh2.h>
-.nf
-
-int libssh2_keepalive_send(LIBSSH2_SESSION *session,
-                           int *seconds_to_next);
-.SH DESCRIPTION
-Send a keepalive message if needed.  \fBseconds_to_next\fP indicates how many
-seconds you can sleep after this call before you need to call it again.
-.SH RETURN VALUE
-Returns 0 on success, or LIBSSH2_ERROR_SOCKET_SEND on I/O errors.
-.SH AVAILABILITY
-Added in libssh2 1.2.5
-.SH SEE ALSO
-.BR libssh2_keepalive_config(3)
--- a/docs/libssh2_knownhost_add.3
+++ b/docs/libssh2_knownhost_add.3
@ -1,11 +1,10 @@

-.\" Copyright (c) 2009, 2010 by Daniel Stenberg
+.\" Copyright (c) 2009 by Daniel Stenberg
 .\"
 .TH libssh2_knownhost_add 3 "28 May 2009" "libssh2 1.2" "libssh2 manual"
 .SH NAME
 libssh2_knownhost_add - add a known host
 .SH SYNOPSIS
-.nf
 #include <libssh2.h>

 int libssh2_knownhost_add(LIBSSH2_KNOWNHOSTS *hosts,
@ -14,11 +13,6 @@ int libssh2_knownhost_add(LIBSSH2_KNOWNHOSTS *hosts,
                          int typemask,
                          struct libssh2_knownhost **store);
 .SH DESCRIPTION
-We discourage use of this function as of libssh2 1.2.5. Instead we strongly
-urge users to use \fIlibssh2_knownhost_addc(3)\fP instead, which as a more
-complete API. \fIlibssh2_knownhost_add(3)\fP is subject for removal in a
-future release.
-
 Adds a known host to the collection of known hosts identified by the 'hosts'
 handle.

@ -36,7 +30,7 @@ The salt has to be provided base64 encoded with a trailing zero byte.
 argument

 \fItypemask\fP is a bitmask that specifies format and info about the data
-passed to this function. Specifically, it details what format the host name is,
+passed to this function. Specificly, it details what format the host name is,
 what format the key is and what key type it is.

 The host name is given as one of the following types:
@ -57,10 +51,8 @@ this pointer.
 Returns a regular libssh2 error code, where negative values are error codes
 and 0 indicates success.
 .SH AVAILABILITY
-Added in libssh2 1.2, deprecated since libssh2 1.2.5. Use
-\fIlibssh2_knownhost_addc(3)\fP instead!
+Added in libssh2 1.2
 .SH SEE ALSO
 .BR libssh2_knownhost_init(3)
 .BR libssh2_knownhost_free(3)
 .BR libssh2_knownhost_check(3)
-.BR libssh2_knownhost_addc(3)
--- a/docs/libssh2_knownhost_addc.3
+++ b/docs/libssh2_knownhost_addc.3
@ -1,68 +0,0 @@
-
-.\" Copyright (c) 2009, 2010 by Daniel Stenberg
-.\"
-.TH libssh2_knownhost_add 3 "28 May 2009" "libssh2 1.2" "libssh2 manual"
-.SH NAME
-libssh2_knownhost_add - add a known host
-.SH SYNOPSIS
-#include <libssh2.h>
-
-int libssh2_knownhost_addc(LIBSSH2_KNOWNHOSTS *hosts,
-                           char *host, char *salt,
-                           char *key, size_t keylen,
-                           const char *comment, size_t commentlen,
-                           int typemask,
-                           struct libssh2_knownhost **store);
-.SH DESCRIPTION
-Adds a known host to the collection of known hosts identified by the 'hosts'
-handle.
-
-\fIhost\fP is a pointer the host name in plain text or hashed. If hashed, it
-must be provided base64 encoded. The host name can be the IP numerical address
-of the host or the full name.
-
-If you want to add a key for a specific port number for the given host, you
-must provide the host name like '[host]:port' with the actual characters '['
-and ']' enclosing the host name and a colon separating the host part from the
-port number. For example: \&"[host.example.com]:222".
-
-\fIsalt\fP is a pointer to the salt used for the host hashing, if the host is
-provided hashed. If the host is provided in plain text, salt has no meaning.
-The salt has to be provided base64 encoded with a trailing zero byte.
-
-\fIkey\fP is a pointer to the key for the given host.
-
-\fIkeylen\fP is the total size in bytes of the key pointed to by the \fIkey\fP
-argument
-
-\fIcomment\fP is a pointer to a comment for the key.
-
-\fIcommentlen\fP is the total size in bytes of the comment pointed to by the \fIcomment\fP argument
-
-\fItypemask\fP is a bitmask that specifies format and info about the data
-passed to this function. Specifically, it details what format the host name is,
-what format the key is and what key type it is.
-
-The host name is given as one of the following types:
-LIBSSH2_KNOWNHOST_TYPE_PLAIN, LIBSSH2_KNOWNHOST_TYPE_SHA1 or
-LIBSSH2_KNOWNHOST_TYPE_CUSTOM.
-
-The key is encoded using one of the following encodings:
-LIBSSH2_KNOWNHOST_KEYENC_RAW or LIBSSH2_KNOWNHOST_KEYENC_BASE64.
-
-The key is using one of these algorithms:
-LIBSSH2_KNOWNHOST_KEY_RSA1, LIBSSH2_KNOWNHOST_KEY_SSHRSA or
-LIBSSH2_KNOWNHOST_KEY_SSHDSS.
-
-\fIstore\fP should point to a pointer that gets filled in to point to the
-known host data after the addition. NULL can be passed if you don't care about
-this pointer.
-.SH RETURN VALUE
-Returns a regular libssh2 error code, where negative values are error codes
-and 0 indicates success.
-.SH AVAILABILITY
-Added in libssh2 1.2.5
-.SH SEE ALSO
-.BR libssh2_knownhost_init(3)
-.BR libssh2_knownhost_free(3)
-.BR libssh2_knownhost_check(3)
--- a/docs/libssh2_knownhost_check.3
+++ b/docs/libssh2_knownhost_check.3
@ -8,8 +8,7 @@ libssh2_knownhost_check - check a host+key against the list of known hosts
 #include <libssh2.h>

 int libssh2_knownhost_check(LIBSSH2_KNOWNHOSTS *hosts,
-                            const char *host,
-                            const char *key, size_t keylen,
+                            char *host, char *key, size_t keylen,
                            int typemask,
                            struct libssh2_knownhost **knownhost);
 .SH DESCRIPTION
@ -25,7 +24,7 @@ IP numerical address of the host or the full name.
 argument

 \fItypemask\fP is a bitmask that specifies format and info about the data
-passed to this function. Specifically, it details what format the host name is,
+passed to this function. Specificly, it details what format the host name is,
 what format the key is and what key type it is.

 The host name is given as one of the following types:
--- a/docs/libssh2_knownhost_checkp.3
+++ b/docs/libssh2_knownhost_checkp.3
@ -1,63 +0,0 @@
-.\"
-.\" Copyright (c) 2009-2010 by Daniel Stenberg
-.\"
-.TH libssh2_knownhost_check 3 "1 May 2010" "libssh2 1.2.6" "libssh2 manual"
-.SH NAME
-libssh2_knownhost_checkp - check a host+key against the list of known hosts
-.SH SYNOPSIS
-#include <libssh2.h>
-
-int libssh2_knownhost_checkp(LIBSSH2_KNOWNHOSTS *hosts,
-                             const char *host, int port,
-                             const char *key, size_t keylen,
-                             int typemask,
-                             struct libssh2_knownhost **knownhost);
-.SH DESCRIPTION
-Checks a host and its associated key against the collection of known hosts,
-and returns info back about the (partially) matched entry.
-
-\fIhost\fP is a pointer the host name in plain text. The host name can be the
-IP numerical address of the host or the full name.
-
-\fIport\fP is the port number used by the host (or a negative number
-to check the generic host). If the port number is given, libssh2 will
-check the key for the specific host + port number combination in
-addition to the plain host name only check.
-
-\fIkey\fP is a pointer to the key for the given host.
-
-\fIkeylen\fP is the total size in bytes of the key pointed to by the \fIkey\fP
-argument
-
-\fItypemask\fP is a bitmask that specifies format and info about the data
-passed to this function. Specifically, it details what format the host name is,
-what format the key is and what key type it is.
-
-The host name is given as one of the following types:
-LIBSSH2_KNOWNHOST_TYPE_PLAIN or LIBSSH2_KNOWNHOST_TYPE_CUSTOM.
-
-The key is encoded using one of the following encodings:
-LIBSSH2_KNOWNHOST_KEYENC_RAW or LIBSSH2_KNOWNHOST_KEYENC_BASE64.
-
-\fIknownhost\fP if set to non-NULL, it must be a pointer to a 'struct
-libssh2_knownhost' pointer that gets filled in to point to info about a known
-host that matches or partially matches.
-.SH RETURN VALUE
-\fIlibssh2_knownhost_check(3)\fP returns info about how well the provided
-host + key pair matched one of the entries in the list of known hosts.
-
-LIBSSH2_KNOWNHOST_CHECK_FAILURE - something prevented the check to be made
-
-LIBSSH2_KNOWNHOST_CHECK_NOTFOUND - no host match was found
-
-LIBSSH2_KNOWNHOST_CHECK_MATCH - hosts and keys match.
-
-LIBSSH2_KNOWNHOST_CHECK_MISMATCH - host was found, but the keys didn't match!
-.SH AVAILABILITY
-Added in libssh2 1.2.6
-.SH EXAMPLE
-See the ssh2_exec.c example as provided in the tarball.
-.SH SEE ALSO
-.BR libssh2_knownhost_init(3)
-.BR libssh2_knownhost_free(3)
-.BR libssh2_knownhost_add(3)
--- a/docs/libssh2_knownhost_readfile.3
+++ b/docs/libssh2_knownhost_readfile.3
@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2009-2011 by Daniel Stenberg
+.\" Copyright (c) 2009 by Daniel Stenberg
 .\"
 .TH libssh2_knownhost_readfile 3 "28 May 2009" "libssh2 1.2" "libssh2 manual"
 .SH NAME
@ -19,8 +19,8 @@ collection of known hosts.
 \fILIBSSH2_KNOWNHOST_FILE_OPENSSH\fP is the only currently supported
 format. This file is normally found named ~/.ssh/known_hosts
 .SH RETURN VALUE
-Returns a negative value, a regular libssh2 error code for errors, or a
-positive number as number of parsed known hosts in the file.
+Returns a regular libssh2 error code, where negative values are error codes
+and 0 indicates success.
 .SH AVAILABILITY
 Added in libssh2 1.2
 .SH SEE ALSO
--- a/docs/libssh2_knownhost_writeline.3
+++ b/docs/libssh2_knownhost_writeline.3
@ -35,7 +35,7 @@ and 0 indicates success.

 If the provided buffer is deemed too small to fit the data libssh2 wants to
 store in it, LIBSSH2_ERROR_BUFFER_TOO_SMALL will be returned. The application
-is then advised to call the function again with a larger buffer. The
+is then adviced to call the function again with a larger buffer. The
 \fIoutlen\fP size will then hold the requested size.
 .SH AVAILABILITY
 Added in libssh2 1.2
--- a/docs/libssh2_new_host_entry.3
+++ b/docs/libssh2_new_host_entry.3
@ -0,0 +1,14 @@
+.\" $Id: libssh2_new_host_entry.3,v 1.1 2009/03/16 15:00:45 bagder Exp $
+.\"
+.TH libssh2_new_host_entry 3 "1 Jun 2007" "libssh2 0.15" "libssh2 manual"
+.SH NAME
+libssh2_new_host_entry - TODO
+.SH SYNOPSIS
+
+.SH DESCRIPTION
+
+.SH RETURN VALUE
+
+.SH ERRORS
+
+.SH SEE ALSO
--- a/docs/libssh2_poll.3
+++ b/docs/libssh2_poll.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_poll.3,v 1.4 2009/04/14 21:38:36 bagder Exp $
+.\"
 .TH libssh2_poll 3 "14 Dec 2006" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_poll - poll for activity on a socket, channel or listener
@ -6,9 +8,7 @@ libssh2_poll - poll for activity on a socket, channel or listener

 int libssh2_poll(LIBSSH2_POLLFD *fds, unsigned int nfds, long timeout);
 .SH DESCRIPTION
-This function is deprecated. Do note use. We encourage users to instead use
-the \fIpoll(3)\fP or \fIselect(3)\fP functions to check for socket activity or
-when specific sockets are ready to get received from or send to.
+This function is deprecated. Do note use.

 Poll for activity on a socket, channel, listener, or any combination of these
 three types. The calling semantics for this function generally match
--- a/docs/libssh2_poll_channel_read.3
+++ b/docs/libssh2_poll_channel_read.3
@ -1,3 +1,5 @@
+.\" $Id: libssh2_poll_channel_read.3,v 1.3 2009/04/14 21:38:36 bagder Exp $
+.\"
 .TH libssh2_poll_channel_read 3 "14 Dec 2006" "libssh2 0.15" "libssh2 manual"
 .SH NAME
 libssh2_poll_channel_read - check if data is available
--- a/Show More
+++ b/Show More