Migrated windows wheels to openssl backend.

Broken pip fix for appveyor.
Added zlib and enabled compression for windows wheels.
Enabled no MAC and no encryption options for windows wheels.

Author: Pan

.appveyor.yml

@@ -5,6 +5,7 @@ environment:
     # See: http://stackoverflow.com/a/13751649/163740
     CMD_IN_ENV: "cmd /E:ON /V:ON /C %APPVEYOR_BUILD_FOLDER%\\ci\\appveyor\\run_with_env.cmd"
     PYTHONUNBUFFERED: 1
+    OPENSSL_VER: 1.0.2l
     PYPI_USER:
       secure: 2m0jy6JD/R9RExIosOT6YA==
     PYPI_PASS:
@@ -14,41 +15,49 @@ environment:
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "32"
       MSVC: "Visual Studio 9"
+      ARCH: i386
 
     - PYTHON: "C:\\Python27-x64"
       PYTHON_VERSION: "2.7"
       PYTHON_ARCH: "64"
       MSVC: "Visual Studio 9"
+      ARCH: x64_86
 
     - PYTHON: "C:\\Python34"
       PYTHON_VERSION: "3.4"
       PYTHON_ARCH: "32"
       MSVC: "Visual Studio 10"
+      ARCH: i386
 
     - PYTHON: "C:\\Python34-x64"
       PYTHON_VERSION: "3.4"
       PYTHON_ARCH: "64"
       MSVC: "Visual Studio 10 Win64"
+      ARCH: x64_86
 
     - PYTHON: "C:\\Python35"
       PYTHON_VERSION: "3.5"
       PYTHON_ARCH: "32"
       MSVC: "Visual Studio 14"
+      ARCH: i386
 
     - PYTHON: "C:\\Python35-x64"
       PYTHON_VERSION: "3.5"
       PYTHON_ARCH: "64"
       MSVC: "Visual Studio 14 Win64"
+      ARCH: x64_86
 
     - PYTHON: "C:\\Python36"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "32"
       MSVC: "Visual Studio 14"
+      ARCH: i386
 
     - PYTHON: "C:\\Python36-x64"
       PYTHON_VERSION: "3.6"
       PYTHON_ARCH: "64"
       MSVC: "Visual Studio 14 Win64"
+      ARCH: x64_86
 
 install:
   # If there is a newer build queued for the same PR, cancel this one.
@@ -72,25 +81,26 @@ install:
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
 
-  # 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"
 
   - git submodule update --init --recursive
-  - "%CMD_IN_ENV% ci\\appveyor\\build_ssh2.bat"
-  # Install the build dependencies of the project. If some dependencies contain
-  # compiled extensions and are not provided as pre-built wheel packages,
-  # pip will build them from source using the MSVC compiler matching the
-  # target Python version and architecture
+  - appveyor DownloadFile http://zlib.net/zlib1211.zip
+  - 7z x zlib1211.zip
+  - appveyor DownloadFile https://indy.fulgan.com/SSL/openssl-%OPENSSL_VER%-%ARCH%-win%PYTHON_ARCH%.zip
+  - 7z x openssl-%OPENSSL_VER%-%ARCH%-win%PYTHON_ARCH%.zip
+  - cp ssleay32.dll pssh\native\
+  - cp libeay32.dll pssh\native\
+  - ps: ls pssh\native
   - "%CMD_IN_ENV% pip install -r requirements.txt"
   - "%CMD_IN_ENV% pip install -U wheel setuptools twine"
 
 build_script:
-  # Build the compiled extension
+  - "%CMD_IN_ENV% ci\\appveyor\\build_zlib.bat"
+  - "%CMD_IN_ENV% ci\\appveyor\\build_ssh2.bat"
   - "%CMD_IN_ENV% python setup.py build_ext -i"
 
 test_script:
-  - python -c "import pssh.pssh2_client"
+  - python -c "import pssh.clients"
 
 after_test:
   # If tests are successful, create binary packages for the project.
@@ -102,4 +112,4 @@ artifacts:
   - path: "*.whl"
 
 deploy_script:
-  - python ci/appveyor/pypi_upload.py *.whl
+  - IF "%APPVEYOR_REPO_TAG%" == "true"( python ci/appveyor/pypi_upload.py *.whl )

ci/appveyor/build_ssh2.bat

@@ -1,22 +1,56 @@
-mkdir src && cd src
+mkdir src
+cd src
+
+IF "%PYTHON_ARCH%" == "32" (
+  set OPENSSL_DIR="C:\OpenSSL-Win32"
+) ELSE (
+  set OPENSSL_DIR="C:\OpenSSL-Win64"
+)
+
+ls %OPENSSL_DIR%\lib
+ls %OPENSSL_DIR%\lib\VC
+ls %OPENSSL_DIR%\lib\VC\static
 
 IF "%MSVC%" == "Visual Studio 9" (
    ECHO "Building without platform set"
    cmake ..\libssh2 -G "NMake Makefiles"        ^
    	 -DCMAKE_BUILD_TYPE=Release             ^
-	 -DCRYPTO_BACKEND=WinCNG                ^
-	 -DBUILD_SHARED_LIBS=OFF
+	 -DCRYPTO_BACKEND=OpenSSL               ^
+	 -DBUILD_SHARED_LIBS=OFF                ^
+	 -DENABLE_ZLIB_COMPRESSION=ON           ^
+	 -DENABLE_CRYPT_NONE=ON                 ^
+	 -DENABLE_MAC_NONE=ON                   ^
+	 -DZLIB_LIBRARY=C:/zlib/lib/zlib.lib    ^
+	 -DZLIB_INCLUDE_DIR=C:/zlib/include     ^
+	 -DOPENSSL_ROOT_DIR=%OPENSSL_DIR%
+REM	 -DOPENSSL_MSVC_STATIC_RT=TRUE
+REM 	 -DOPENSSL_USE_STATIC_LIBS=TRUE
 ) 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
+	 -DBUILD_SHARED_LIBS=OFF                ^
+	 -DENABLE_ZLIB_COMPRESSION=ON           ^
+	 -DENABLE_CRYPT_NONE=ON                 ^
+	 -DENABLE_MAC_NONE=ON                   ^
+	 -DZLIB_LIBRARY=C:/zlib/lib/zlib.lib    ^
+	 -DZLIB_INCLUDE_DIR=C:/zlib/include     ^
+	 -DOPENSSL_ROOT_DIR=%OPENSSL_DIR%
+REM	 -DOPENSSL_MSVC_STATIC_RT=TRUE
+REM	 -DOPENSSL_USE_STATIC_LIBS=TRUE
 )
 
+cp %OPENSSL_DIR%\lib\VC\libeay32MD.lib %APPVEYOR_BUILD_FOLDER%
+cp %OPENSSL_DIR%\lib\VC\ssleay32MD.lib %APPVEYOR_BUILD_FOLDER%
+REM cp %OPENSSL_DIR%\libeay32.dll %APPVEYOR_BUILD_FOLDER%\ssh2\
+REM cp %OPENSSL_DIR%\ssleay32.dll %APPVEYOR_BUILD_FOLDER%\ssh2\
+
 cmake --build . --config Release
 cd ..
+ls
+ls pssh
 ls src/src
 cp src/src/libssh2.lib %PYTHON%/libs/ || cp src/src/Release/libssh2.lib %PYTHON%/libs/
 ls %PYTHON%/libs/

ci/appveyor/build_zlib.bat

@@ -0,0 +1,21 @@
+mkdir zlib_build && cd zlib_build
+
+IF "%MSVC%" == "Visual Studio 9" (
+   ECHO "Building without platform set"
+   cmake ..\zlib-1.2.11 -G "NMake Makefiles"        ^
+       -DCMAKE_INSTALL_PREFIX="C:\zlib"             ^
+       -DCMAKE_BUILD_TYPE=Release                   ^
+       -DBUILD_SHARED_LIBS=OFF
+) ELSE (
+   ECHO "Building with platform %MSVC%"
+   cmake ..\zlib-1.2.11                             ^
+       -G"%MSVC%"                                   ^
+       -DCMAKE_INSTALL_PREFIX="C:\zlib"             ^
+       -DCMAKE_BUILD_TYPE=Release                   ^
+       -DBUILD_SHARED_LIBS=OFF
+)
+
+cmake --build . --config Release --target install
+cp C:/zlib/lib/zlibstatic.lib %PYTHON%/libs/
+cd ..
+ls %PYTHON%/libs/

setup.py

@@ -29,6 +29,7 @@
 else:
     USING_CYTHON = True
 
+ON_WINDOWS = platform.system() == 'Windows'
 
 gevent_req = 'gevent<=1.1' if python_version() < '2.7' else 'gevent>=1.1'
 
@@ -43,15 +44,18 @@
                'cython_compile_time_env': {'EMBEDDED_LIB': _embedded_lib},
 } if USING_CYTHON else {}
 
-_libs = ['ssh2'] if platform.system() != 'Windows' else [
+_libs = ['ssh2'] if not ON_WINDOWS else [
     # For libssh2 OpenSSL backend on Windows.
     # Windows native WinCNG is used by default.
     # 'libeay32', 'ssleay32',
-    'Ws2_32', 'libssh2', 'user32']
+    'Ws2_32', 'libssh2', 'user32',
+    'libeay32MD', 'ssleay32MD',
+    'zlibstatic',
+]
 
 
 ext = 'pyx' if USING_CYTHON else 'c'
-_comp_args = ["-O3"] if platform.system() != 'Windows' else None
+_comp_args = ["-O3"] if not ON_WINDOWS else None
 
 extensions = [
     Extension('pssh.native._ssh2',
@@ -62,6 +66,14 @@
               **cython_args
     )]
 
+
+package_data = {}
+
+if ON_WINDOWS:
+    package_data['pssh.native'] = [
+        'libeay32.dll', 'ssleay32.dll',
+    ]
+
 cmdclass = versioneer.get_cmdclass()
 if USING_CYTHON:
     cmdclass['build_ext'] = build_ext
@@ -96,4 +108,5 @@
         'Operating System :: Microsoft :: Windows',
         ],
       ext_modules=extensions,
+      package_data=package_data,
 )