Migrated Windows wheels to openssl backend. Added openssl libraries to windows wheels.

Author: Pan

.appveyor.yml

@@ -75,7 +75,7 @@ install:
 
   # Upgrade to the latest version of pip to avoid it displaying warnings
   # about it being out of date.
-  - "pip install --disable-pip-version-check --user --upgrade pip"
+  # - "pip install --disable-pip-version-check --user --upgrade pip"
 
   # Install the build dependencies of the project. If some dependencies contain
   # compiled extensions and are not provided as pre-built wheel packages,

.travis.yml

@@ -35,11 +35,16 @@ jobs:
   include:
     - stage: OSX wheel build
       os: osx
-      if: tag IS present
+      # if: tag IS present
       before_install:
         - brew update
       install:
-        - brew install libssh2
+        # - brew install libssh2
+        - brew upgrade openssl
+        - export PATH="/usr/local/opt/openssl/bin:$PATH"
+        # - export OPENSSL_ROOT_DIR="/usr/local/opt/openssl"
+        # - export OPENSSL_INCLUDE_DIR="/usr/local/opt/openssl/include"
+        - sudo ci/install-ssh2.sh
         - sudo -H pip2 install -U delocate twine wheel pip setuptools
         - pip2 wheel .
       script:
@@ -61,11 +66,14 @@ jobs:
     - stage: OSX wheel build
       os: osx
       osx_image: xcode8
-      if: tag IS present
+      # if: tag IS present
       before_install:
         - brew update
       install:
-        - brew install libssh2
+        # - brew install libssh2
+        - brew upgrade openssl
+        - export PATH="/usr/local/opt/openssl/bin:$PATH"
+        - sudo ci/install-ssh2.sh
         - sudo -H pip2 install -U delocate twine wheel pip setuptools
         - pip2 wheel .
       script:
@@ -87,11 +95,14 @@ jobs:
     - stage: OSX wheel build
       os: osx
       osx_image: xcode6.4
-      if: tag IS present
+      # if: tag IS present
       before_install:
         - brew update
       install:
-        - brew install libssh2
+        # - brew install libssh2
+        - brew upgrade openssl
+        - export PATH="/usr/local/opt/openssl/bin:$PATH"
+        - sudo ci/install-ssh2.sh
         - python --version
         - wget --no-check-certificate https://bootstrap.pypa.io/get-pip.py
         - sudo python get-pip.py

Changelog.rst

@@ -1,7 +1,7 @@
 Change Log
 =============
 
-0.12.0
+0.13.0
 +++++++
 
 Changes
@@ -11,6 +11,7 @@ Changes
 * Adds support for ECDSA host and client keys.
 * Adds support for SHA-256 host key fingerprints.
 * Added SSH agent forwarding implementation.
+* Windows wheels switched to OpenSSL back end.
 
 Note - binary wheels only.
 

ci/appveyor/build_ssh2.bat

@@ -4,19 +4,33 @@ IF "%MSVC%" == "Visual Studio 9" (
    ECHO "Building without platform set"
    cmake ..\libssh2 -G "NMake Makefiles"        ^
    	 -DCMAKE_BUILD_TYPE=Release             ^
-	 -DCRYPTO_BACKEND=WinCNG                ^
+	 -DCRYPTO_BACKEND=OpenSSL               ^
 	 -DBUILD_SHARED_LIBS=OFF
 ) ELSE (
    ECHO "Building with platform %MSVC%"
    cmake ..\libssh2 -G "NMake Makefiles"        ^
    	 -DCMAKE_BUILD_TYPE=Release             ^
-	 -DCRYPTO_BACKEND=WinCNG                ^
+	 -DCRYPTO_BACKEND=OpenSSL               ^
 	 -G"%MSVC%"                             ^
 	 -DBUILD_SHARED_LIBS=OFF
 )
 
+IF "%PYTHON_ARCH%" == "32" (
+  set OPENSSL_DIR="C:\OpenSSL-Win32"
+) ELSE (
+  set OPENSSL_DIR="C:\OpenSSL-Win64"
+)
+
+cp %OPENSSL_DIR%\lib\VC\libeay32MD.lib %APPVEYOR_BUILD_FOLDER%
+cp %OPENSSL_DIR%\lib\VC\ssleay32MD.lib %APPVEYOR_BUILD_FOLDER%
+cp %OPENSSL_DIR%\libeay32.dll %APPVEYOR_BUILD_FOLDER%\ssh2\
+cp %OPENSSL_DIR%\ssleay32.dll %APPVEYOR_BUILD_FOLDER%\ssh2\
+
 cmake --build . --config Release
 cd ..
+ls %OPENSSL_DIR%\
+ls
+ls ssh2
 ls src/src
 cp src/src/libssh2.lib %PYTHON%/libs/ || cp src/src/Release/libssh2.lib %PYTHON%/libs/
 ls %PYTHON%/libs/

libssh2

@@ -20,13 +20,16 @@
 else:
     USING_CYTHON = True
 
+ON_WINDOWS = platform.system() == 'Windows'
+
 ext = 'pyx' if USING_CYTHON else 'c'
 sources = glob('ssh2/*.%s' % (ext,))
-_libs = ['ssh2'] if platform.system() != 'Windows' else [
+if ON_WINDOWS:
     # For libssh2 OpenSSL backend on Windows.
-    # Windows native WinCNG is used by default.
-    # 'libeay32', 'ssleay32',
-    'Ws2_32', 'libssh2', 'user32']
+    _libs = ['Ws2_32', 'libssh2', 'user32',
+             'libeay32MD', 'ssleay32MD']
+else:
+    _libs = ['ssh2']
 
 # _comp_args = ["-ggdb"]
 _comp_args = ["-O3"] if platform.system() != 'Windows' else None
@@ -51,6 +54,13 @@
     )
     for i in range(len(sources))]
 
+package_data = {'ssh2': ['*.pxd']}
+
+if ON_WINDOWS:
+    package_data['ssh2'].extend(['libeay32.dll', 'ssleay32.dll'])
+
+print("Using package data %s" % package_data)
+
 cmdclass = versioneer.get_cmdclass()
 if USING_CYTHON:
     cmdclass['build_ext'] = build_ext
@@ -89,5 +99,5 @@
         'Operating System :: POSIX :: BSD',
     ],
     ext_modules=extensions,
-    package_data={'ssh2': ['*.pxd']},
+    package_data=package_data,
 )