updated SingleApplication submodule

Update amneziavpn_ru_RU.ts

.gitattributes

@@ -0,0 +1,6 @@
+deploy/data/windows/x64/tap/windows_7/OemVista.inf eol=crlf
+deploy/data/windows/x64/tap/windows_10/OemVista.inf eol=crlf
+deploy/data/windows/x32/tap/windows_7/OemVista.inf eol=crlf
+deploy/data/windows/x32/tap/windows_10/OemVista.inf eol=crlf
+client/3rd/* linguist-vendored
+client/android/gradlew.bat eol=crlf

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,42 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Log files**
+Attach log files to help explain your problem.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Windows 10]
+ - Version [e.g. 2.1.2]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Version [e.g. 2.1.2]
+
+**Server (please complete the following information):**
+ - OS: [e.g. Ubuntu 22.04]
+
+**Additional context**
+Add any other context about the problem here.

.github/workflows/deploy.yml

@@ -0,0 +1,459 @@
+name: 'Deploy workflow'
+
+on:
+  push:
+    branches:
+      - '**'
+
+env:
+  QT_MIRROR: https://mirrors.ocf.berkeley.edu/qt/ # https://download.qt.io/static/mirrorlist/
+
+jobs:
+  Build-Linux-Ubuntu:
+    runs-on: ubuntu-20.04
+
+    env:
+      QT_VERSION: 6.6.2
+      QIF_VERSION: 4.7
+      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
+
+    steps:
+    - name: 'Install Qt'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'linux'
+        target: 'desktop'
+        arch: 'gcc_64'
+        modules: 'qtremoteobjects qt5compat qtshadertools'
+        dir: ${{ runner.temp }}
+        setup-python: 'true'
+        tools: 'tools_ifw'
+        set-env: 'true'
+        extra: '--external 7z --base ${{ env.QT_MIRROR }}'
+
+    - name: 'Get sources'
+      uses: actions/checkout@v4
+      with:
+        submodules: 'true'
+        fetch-depth: 10
+
+    - name: 'Setup ccache'
+      uses: hendrikmuhs/ccache-action@v1.2
+
+    - name: 'Build project'
+      run: |
+        sudo apt-get install libxkbcommon-x11-0
+        export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64/bin
+        export QIF_BIN_DIR=${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin
+        bash deploy/build_linux.sh
+
+    - name: 'Pack installer'
+      run: cd deploy && tar -cf AmneziaVPN_Linux_Installer.tar AmneziaVPN_Linux_Installer.bin
+
+    - name: 'Upload installer artifact'
+      uses: actions/upload-artifact@v4
+      with:
+        name: AmneziaVPN_Linux_installer.tar
+        path: deploy/AmneziaVPN_Linux_Installer.tar
+        retention-days: 7
+
+    - name: 'Upload unpacked artifact'
+      uses: actions/upload-artifact@v4
+      with:
+        name: AmneziaVPN_Linux_unpacked
+        path: deploy/AppDir
+        retention-days: 7
+
+    - name: 'Upload translations artifact'
+      uses: actions/upload-artifact@v4
+      with:
+        name: AmneziaVPN_translations
+        path: client/translations
+        retention-days: 7
+
+# ------------------------------------------------------
+
+  Build-Windows:
+    runs-on: windows-latest
+
+    env:
+      QT_VERSION: 6.6.2
+      QIF_VERSION: 4.7
+      BUILD_ARCH: 64
+      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
+
+    steps:
+    - name: 'Get sources'
+      uses: actions/checkout@v4
+      with:
+        submodules: 'true'
+        fetch-depth: 10
+
+    - name: 'Setup ccache'
+      uses: hendrikmuhs/ccache-action@v1.2
+
+    - name: 'Install Qt'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'windows'
+        target: 'desktop'
+        arch: 'win64_msvc2019_64'
+        modules: 'qtremoteobjects qt5compat qtshadertools'
+        dir: ${{ runner.temp }}
+        setup-python: 'true'
+        tools: 'tools_ifw'
+        set-env: 'true'
+        extra: '--external 7z --base ${{ env.QT_MIRROR }}'
+
+    - name: 'Setup mvsc'
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: 'x64'
+
+    - name: 'Build project'
+      shell: cmd
+      run: |
+        set BUILD_ARCH=${{ env.BUILD_ARCH }}
+        set QT_BIN_DIR="${{ runner.temp }}\\Qt\\${{ env.QT_VERSION }}\\msvc2019_64\\bin"
+        set QIF_BIN_DIR="${{ runner.temp }}\\Qt\\Tools\\QtInstallerFramework\\${{ env.QIF_VERSION }}\\bin"
+        call deploy\\build_windows.bat
+
+    - name: 'Upload installer artifact'
+      uses: actions/upload-artifact@v4
+      with:
+        name: AmneziaVPN_Windows_installer
+        path: AmneziaVPN_x${{ env.BUILD_ARCH }}.exe
+        retention-days: 7
+
+    - name: 'Upload unpacked artifact'
+      uses: actions/upload-artifact@v4
+      with:
+        name: AmneziaVPN_Windows_unpacked
+        path: deploy\\build_${{ env.BUILD_ARCH }}\\client\\Release
+        retention-days: 7
+
+# ------------------------------------------------------
+
+  Build-iOS:
+    runs-on: macos-13
+
+    env:
+      QT_VERSION: 6.6.2
+      CC: cc
+      CXX: c++
+      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
+
+    steps:
+    - name: 'Setup xcode'
+      uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: '15.2'
+
+    - name: 'Install desktop Qt'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'mac'
+        target: 'desktop'
+        modules: 'qtremoteobjects qt5compat qtshadertools qtmultimedia'
+        arch: 'clang_64'
+        dir: ${{ runner.temp }}
+        set-env: 'true'
+        extra: '--base ${{ env.QT_MIRROR }}'
+
+    - name: 'Install iOS Qt'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'mac'
+        target: 'ios'
+        modules: 'qtremoteobjects qt5compat qtshadertools qtmultimedia'
+        dir: ${{ runner.temp }}
+        setup-python: 'true'
+        set-env: 'true'
+        extra: '--external 7z --base ${{ env.QT_MIRROR }}'
+
+    - name: 'Install go'
+      uses: actions/setup-go@v5
+      with:
+        go-version: '1.20'
+        cache: false
+
+    - name: 'Setup gomobile'
+      run: |
+          export PATH=$PATH:~/go/bin
+          go install golang.org/x/mobile/cmd/gomobile@latest
+          gomobile init
+
+    - name: 'Get sources'
+      uses: actions/checkout@v4
+      with:
+        submodules: 'true'
+        fetch-depth: 10
+
+    - name: 'Setup ccache'
+      uses: hendrikmuhs/ccache-action@v1.2
+
+    - name: 'Install dependencies'
+      run: pip install jsonschema jinja2
+
+    - name: 'Build project'
+      run: |
+        git submodule update --init --recursive
+        export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/ios/bin"
+        export QT_MACOS_ROOT_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/macos"
+        export PATH=$PATH:~/go/bin
+        sh deploy/build_ios.sh
+      env:
+        IOS_TRUST_CERT_BASE64: ${{ secrets.IOS_TRUST_CERT_BASE64 }}
+        IOS_SIGNING_CERT_BASE64: ${{ secrets.IOS_SIGNING_CERT_BASE64 }}
+        IOS_SIGNING_CERT_PASSWORD: ${{ secrets.IOS_SIGNING_CERT_PASSWORD }}
+        APPSTORE_CONNECT_KEY_ID: ${{ secrets.APPSTORE_CONNECT_KEY_ID }}
+        APPSTORE_CONNECT_ISSUER_ID: ${{ secrets.APPSTORE_CONNECT_ISSUER_ID }}
+        APPSTORE_CONNECT_PRIVATE_KEY: ${{ secrets.APPSTORE_CONNECT_PRIVATE_KEY }}
+        IOS_APP_PROVISIONING_PROFILE: ${{ secrets.IOS_APP_PROVISIONING_PROFILE }}
+        IOS_NE_PROVISIONING_PROFILE: ${{ secrets.IOS_NE_PROVISIONING_PROFILE }}
+
+#    - name: 'Upload appstore .ipa and dSYMs to artifacts'
+#      uses: actions/upload-artifact@v4
+#      with:
+#        name: app-store ipa & dsyms
+#        path: |
+#          ${{ github.workspace }}/AmneziaVPN-iOS.ipa
+#          ${{ github.workspace }}/*.app.dSYM.zip
+#        retention-days: 7
+
+# ------------------------------------------------------
+
+  Build-MacOS:
+    runs-on: macos-latest
+
+    env:
+      # Keep compat with MacOS 10.15 aka Catalina by Qt 6.4
+      QT_VERSION: 6.4.3
+      QIF_VERSION: 4.6
+      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
+
+    steps:
+    - name: 'Setup xcode'
+      uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: '14.3.1'
+
+    - name: 'Install Qt'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'mac'
+        target: 'desktop'
+        arch: 'clang_64'
+        modules: 'qtremoteobjects qt5compat qtshadertools'
+        dir: ${{ runner.temp }}
+        setup-python: 'true'
+        set-env: 'true'
+        extra: '--external 7z --base ${{ env.QT_MIRROR }}'
+
+    - name: 'Install Qt Installer Framework ${{ env.QIF_VERSION }}'
+      run: |
+        mkdir -pv ${{ runner.temp }}/Qt/Tools/QtInstallerFramework
+        wget https://qt.amzsvc.com/tools/ifw/${{ env.QIF_VERSION }}.zip
+        unzip ${{ env.QIF_VERSION }}.zip -d ${{ runner.temp }}/Qt/Tools/QtInstallerFramework/
+
+    - name: 'Get sources'
+      uses: actions/checkout@v4
+      with:
+        submodules: 'true'
+        fetch-depth: 10
+
+    - name: 'Setup ccache'
+      uses: hendrikmuhs/ccache-action@v1.2
+
+    - name: 'Build project'
+      run: |
+        export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/macos/bin"
+        export QIF_BIN_DIR="${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin"
+        bash deploy/build_macos.sh
+
+    - name: 'Upload installer artifact'
+      uses: actions/upload-artifact@v4
+      with:
+        name: AmneziaVPN_MacOS_installer
+        path: AmneziaVPN.dmg
+        retention-days: 7
+
+    - name: 'Upload unpacked artifact'
+      uses: actions/upload-artifact@v4
+      with:
+        name: AmneziaVPN_MacOS_unpacked
+        path: deploy/build/client/AmneziaVPN.app
+        retention-days: 7
+
+# ------------------------------------------------------
+
+  Build-Android:
+    runs-on: ubuntu-latest
+
+    env:
+      ANDROID_BUILD_PLATFORM: android-34
+      QT_VERSION: 6.6.2
+      QT_MODULES: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
+      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
+
+    steps:
+    - name: 'Install desktop Qt'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'linux'
+        target: 'desktop'
+        arch: 'gcc_64'
+        modules: ${{ env.QT_MODULES }}
+        dir: ${{ runner.temp }}
+        extra: '--external 7z --base ${{ env.QT_MIRROR }}'
+
+    - name: 'Install android_x86_64 Qt'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'linux'
+        target: 'android'
+        arch: 'android_x86_64'
+        modules: ${{ env.QT_MODULES }}
+        dir: ${{ runner.temp }}
+        extra: '--external 7z --base ${{ env.QT_MIRROR }}'
+
+    - name: 'Install android_x86 Qt'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'linux'
+        target: 'android'
+        arch: 'android_x86'
+        modules: ${{ env.QT_MODULES }}
+        dir: ${{ runner.temp }}
+        extra: '--external 7z --base ${{ env.QT_MIRROR }}'
+
+    - name: 'Install android_armv7 Qt'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'linux'
+        target: 'android'
+        arch: 'android_armv7'
+        modules: ${{ env.QT_MODULES }}
+        dir: ${{ runner.temp }}
+        extra: '--external 7z --base ${{ env.QT_MIRROR }}'
+
+    - name: 'Install android_arm64_v8a Qt'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'linux'
+        target: 'android'
+        arch: 'android_arm64_v8a'
+        modules: ${{ env.QT_MODULES }}
+        dir: ${{ runner.temp }}
+        extra: '--external 7z --base ${{ env.QT_MIRROR }}'
+
+    - name: 'Grant execute permission for qt-cmake'
+      shell: bash
+      run: |
+        chmod +x ${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/android_x86_64/bin/qt-cmake
+
+    - name: 'Get sources'
+      uses: actions/checkout@v4
+      with:
+        submodules: 'true'
+
+    - name: 'Setup ccache'
+      uses: hendrikmuhs/ccache-action@v1.2
+
+    - name: 'Setup Java'
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+        cache: 'gradle'
+
+    - name: 'Setup Android NDK'
+      id: setup-ndk
+      uses: nttld/setup-ndk@v1
+      with:
+        ndk-version: 'r26b'
+
+    - name: 'Decode keystore secret to file'
+      env:
+        KEYSTORE_BASE64: ${{ secrets.ANDROID_RELEASE_KEYSTORE_BASE64 }}
+      shell: bash
+      run: |
+        echo $KEYSTORE_BASE64 | base64 --decode > android.keystore
+
+    - name: 'Build project'
+      env:
+        ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
+        QT_HOST_PATH: ${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64
+        ANDROID_KEYSTORE_PATH: ${{ github.workspace }}/android.keystore
+        ANDROID_KEYSTORE_KEY_ALIAS: ${{ secrets.ANDROID_RELEASE_KEYSTORE_KEY_ALIAS }}
+        ANDROID_KEYSTORE_KEY_PASS: ${{ secrets.ANDROID_RELEASE_KEYSTORE_KEY_PASS }}
+      shell: bash
+      run: ./deploy/build_android.sh --aab --apk all --build-platform ${{ env.ANDROID_BUILD_PLATFORM }}
+
+    - name: 'Upload x86_64 apk'
+      uses: actions/upload-artifact@v4
+      with:
+        name: AmneziaVPN-android-x86_64
+        path: deploy/build/AmneziaVPN-x86_64-release.apk
+        compression-level: 0
+        retention-days: 7
+
+    - name: 'Upload x86 apk'
+      uses: actions/upload-artifact@v4
+      with:
+        name: AmneziaVPN-android-x86
+        path: deploy/build/AmneziaVPN-x86-release.apk
+        compression-level: 0
+        retention-days: 7
+
+    - name: 'Upload arm64-v8a apk'
+      uses: actions/upload-artifact@v4
+      with:
+        name: AmneziaVPN-android-arm64-v8a
+        path: deploy/build/AmneziaVPN-arm64-v8a-release.apk
+        compression-level: 0
+        retention-days: 7
+
+    - name: 'Upload armeabi-v7a apk'
+      uses: actions/upload-artifact@v4
+      with:
+        name: AmneziaVPN-android-armeabi-v7a
+        path: deploy/build/AmneziaVPN-armeabi-v7a-release.apk
+        compression-level: 0
+        retention-days: 7
+
+    - name: 'Upload aab'
+      uses: actions/upload-artifact@v4
+      with:
+        name: AmneziaVPN-android
+        path: deploy/build/AmneziaVPN-release.aab
+        compression-level: 0
+        retention-days: 7
+
+  Extra:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Search a corresponding PR
+        uses: octokit/request-action@v2.x
+        id: pull_request
+        with:
+          route: GET /repos/${{ github.repository }}/pulls
+          head: ${{ github.repository_owner }}:${{ github.ref_name }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Add PR link to build summary
+        if: ${{ fromJSON(steps.pull_request.outputs.data)[0].number != '' }}
+        run: | 
+          echo "Pull request:" >> $GITHUB_STEP_SUMMARY
+          echo "[[#${{ fromJSON(steps.pull_request.outputs.data)[0].number }}] ${{ fromJSON(steps.pull_request.outputs.data)[0].title }}](${{ fromJSON(steps.pull_request.outputs.data)[0].html_url }})" >> $GITHUB_STEP_SUMMARY

.github/workflows/tag-deploy.yml

@@ -0,0 +1,143 @@
+name: 'Release deploy workflow'
+
+on: 
+  workflow_dispatch:
+  # push:
+  # tags:
+  #   - **
+
+jobs:
+
+  Build-Android-Release:
+    name: 'Build-Android-Release'
+    runs-on: ubuntu-latest
+
+    env:
+      QT_VERSION: 6.4.1
+      QIF_VERSION: 4.5
+      PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
+
+    steps:
+    - name: 'Install desktop Qt'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'linux'
+        target: 'desktop'
+        arch: 'gcc_64'
+        modules: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
+        dir: ${{ runner.temp }}
+        setup-python: 'true'
+        set-env: 'true'
+        extra: '--external 7z'
+
+    - name: 'Install android Qt x86_64'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'linux'
+        target: 'android'
+        arch: 'android_x86_64'
+        modules: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
+        dir: ${{ runner.temp }}
+        setup-python: 'true'
+        set-env: 'true'
+        extra: '--external 7z'
+
+    - name: 'Install android Qt x86'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'linux'
+        target: 'android'
+        arch: 'android_x86'
+        modules: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
+        dir: ${{ runner.temp }}
+        setup-python: 'true'
+        set-env: 'true'
+        extra: '--external 7z'
+
+    - name: 'Install android Qt arm_v7'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'linux'
+        target: 'android'
+        arch: 'android_armv7'
+        modules: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
+        dir: ${{ runner.temp }}
+        setup-python: 'true'
+        set-env: 'true'
+        extra: '--external 7z'
+
+    - name: 'Install android Qt arm_v8'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'linux'
+        target: 'android'
+        arch: 'android_arm64_v8a'
+        modules: 'qtremoteobjects qt5compat qtimageformats qtshadertools'
+        dir: ${{ runner.temp }}
+        setup-python: 'true'
+        set-env: 'true'
+        extra: '--external 7z'
+
+    - name: 'Get sources'
+      uses: actions/checkout@v3
+      with:
+        path: main
+        submodules: 'true'
+        fetch-depth: 10
+
+    - name: 'Preparations before keystore fetching'
+      run: | 
+        mkdir keystore
+
+    - name: 'Getting keystore'
+      uses: actions/checkout@v3  
+      with:
+        repository: amnezia-vpn/amnezia-android-certificates
+        ssh-key: ${{ secrets.ANDROID_CERTS_SSH_PRIVATE_KEY }}
+        path: keystore
+
+    - name: 'Setup ccache'
+      uses: hendrikmuhs/ccache-action@v1.2
+
+    - name: 'Setup Java'
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: '11'
+
+    - name: 'Build project'
+      run: |
+        export QT_HOST_PATH="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64"
+        export NDK_VERSION=23c
+        export ANDROID_NDK_PLATFORM=android-23
+        export ANDROID_NDK_HOME=${{ runner.temp }}/android-ndk-r${NDK_VERSION}
+        export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME
+
+        if [ ! -f $ANDROID_NDK_ROOT/ndk-build ]; then 
+          wget https://dl.google.com/android/repository/android-ndk-r${NDK_VERSION}-linux.zip -qO ${{ runner.temp }}/ndk.zip &&
+          unzip -q -d ${{ runner.temp }} ${{ runner.temp }}/ndk.zip ; 
+        fi
+
+        export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/android_arm64_v8a/bin
+        cd main
+        bash deploy/build_android.sh
+
+    - name: 'Signing APK'
+      run: |
+        pwd
+
+        ANDROID_BUILD_TOOLS_VERSION=30.0.3
+
+        ${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}/zipalign -f -v 4 AmneziaVPN-release-unsigned.apk AmneziaVPN-release-aligned.apk
+        ${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}/apksigner sign --out AmneziaVPN-release-signed.apk --ks keystore/debug.keystore --ks-key-alias ${{ secrets.DEBUG_ANDROID_KEYSTORE_KEY_ALIAS }} --ks-pass pass:${{secrets.DEBUG_ANDROID_KEYSTOTE_KEY_PASS }} AmneziaVPN-release-aligned.apk
+
+    - name: 'Upload'
+      uses: actions/upload-artifact@v3
+      with:
+        name: Release APK
+        path: ${{ runner.temp }}/main/AmneziaVPN-release-signed.apk

.github/workflows/tag-upload.yml

@@ -0,0 +1,64 @@
+name: 'Upload a new version'
+
+on:
+  push:
+    tags:
+    - '[0-9]+.[0-9]+.[0-9]+.[0-9]+'
+
+jobs:
+  upload:
+    runs-on: ubuntu-latest
+    name: upload
+    steps:
+      - name: Checkout CMakeLists.txt
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref_name }}
+          sparse-checkout: |
+            CMakeLists.txt
+          sparse-checkout-cone-mode: false
+
+      - name: Verify git tag
+        run: |
+          GIT_TAG=${{ github.ref_name }}
+          CMAKE_TAG=$(grep 'project.*VERSION' CMakeLists.txt | sed -E 's/.* ([0-9]+.[0-9]+.[0-9]+.[0-9]+)$/\1/')
+
+          if [[ "$GIT_TAG" == "$CMAKE_TAG" ]]; then
+            echo "Git tag ($GIT_TAG) and version in CMakeLists.txt ($CMAKE_TAG) are the same. Continuing..."
+          else
+            echo "Git tag ($GIT_TAG) and version in CMakeLists.txt ($CMAKE_TAG) are not the same! Cancelling..."
+            exit 1
+          fi
+
+      - name: Download artifacts from the "${{ github.ref_name }}" tag
+        uses: robinraju/release-downloader@v1.8
+        with:
+          tag: ${{ github.ref_name }}
+          fileName: "AmneziaVPN_(Linux_|)${{ github.ref_name }}*"
+          out-file-path: ${{ github.ref_name }}
+
+      - name: Upload beta version
+        uses: jakejarvis/s3-sync-action@master
+        if: contains(github.event.base_ref, 'dev')
+        with:
+          args: --include "AmneziaVPN*" --delete
+        env:
+          AWS_S3_BUCKET: updates
+          AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_SECRET_ACCESS_KEY }}
+          AWS_S3_ENDPOINT: https://${{ vars.CF_ACCOUNT_ID }}.r2.cloudflarestorage.com
+          SOURCE_DIR: ${{ github.ref_name }}
+          DEST_DIR: beta/${{ github.ref_name }}
+
+      - name: Upload stable version
+        uses: jakejarvis/s3-sync-action@master
+        if: contains(github.event.base_ref, 'master')
+        with:
+          args: --include "AmneziaVPN*" --delete
+        env:
+          AWS_S3_BUCKET: updates
+          AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_SECRET_ACCESS_KEY }}
+          AWS_S3_ENDPOINT: https://${{ vars.CF_ACCOUNT_ID }}.r2.cloudflarestorage.com
+          SOURCE_DIR: ${{ github.ref_name }}
+          DEST_DIR: stable/${{ github.ref_name }}

.gitignore

@@ -8,6 +8,8 @@ deploy/build/*
 deploy/build_32/*
 deploy/build_64/*
 winbuild*.bat
+.cache/
+
 
 # Qt-es
 /.qmake.cache
@@ -22,7 +24,39 @@ qrc_*.cpp
 ui_*.h
 Makefile*
 *build-*
+compile_commands.json
 
+# fastlane
+client/fastlane/report.xml
+client/fastlane/build/*
+
+# Qt-es
+client/Release-iphoneos/
+client/Debug-iphoneos/
+client/.xcode/
+client/.qmake.cache
+client/.qmake.stash
+client/*.pro.user
+client/*.pro.user.*
+client/*.qbs.user
+client/*.qbs.user.*
+client/*.moc
+client/moc_*.cpp
+client/qrc_*.cpp
+client/ui_*.h
+client/ui_*.cpp
+client/Makefile*
+client/fastlane/build/
+client/*build-*
+client/AmneziaVPN.xcodeproj
+client/Debug-iphonesimulator/
+client/amneziavpn_plugin_import.cpp
+client/amneziavpn_qml_plugin_import.cpp
+client/qmlcache_loader.cpp
+client/rep_ipc_interface_replica.h
+client/resources_qmlcache.qrc
+client/3rd/OpenVPNAdpter/build/
+client/3rd/ShadowSocks/build/
 # QtCreator
 
 *.autosave
@@ -34,8 +68,15 @@ Makefile*
 # QtCtreator CMake
 CMakeLists.txt.user*
 
+# Linux files
+*.7z
+deploy/AppDir
+deploy/Tools
+deploy/AmneziaVPN*Installer*
+
 # MACOS files
 .DS_Store
+client/.DS_Store
 ._.DS_Store
 ._*
 *.dmg
@@ -43,4 +84,53 @@ CMakeLists.txt.user*
 # tmp files
 *.*~
 
+#########################  Android
+# Built application files
+*.apk
+*.aar
+*.ap_
+*.aab
 
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/
+
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Android Profiling
+*.hprof
+client/3rd/ShadowSocks/ss_ios.xcconfig
+
+# UML generated pics
+out/
+
+# CMake files
+CMakeFiles/

.gitlab-ci.yml

@@ -1,27 +0,0 @@
-variables:
-    GIT_STRATEGY: clone
-
-stages:
-  - build
-
-build-windows:
-  stage: build
-  tags:
-    - windows
-  script:
-    - cmd.exe /k "deploy\windows-env.bat && cd deploy && windows.bat"
-  artifacts:
-    name: artifacts-windows
-    paths:
-    - AmneziaVPN.exe
-
-build-macos:
-  stage: build
-  tags:
-    - macos
-  script:
-    - cd deploy && ./macos.sh
-  artifacts:
-    name: artifacts-macos
-    paths:
-    - AmneziaVPN.dmg

.gitmodules

@@ -1,3 +1,21 @@
-[submodule "3rd/QtSsh"]
-	path = 3rd/QtSsh
-	url = https://github.com/amnezia-vpn/QtSsh.git
+[submodule "client/3rd/OpenVPNAdapter"]
+	path = client/3rd/OpenVPNAdapter
+	url = https://github.com/amnezia-vpn/OpenVPNAdapter.git
+[submodule "client/3rd/qtkeychain"]
+	path = client/3rd/qtkeychain
+	url = https://github.com/frankosterfeld/qtkeychain.git
+[submodule "client/3rd/SortFilterProxyModel"]
+	path = client/3rd/SortFilterProxyModel
+	url = https://github.com/mitchcurtis/SortFilterProxyModel.git
+[submodule "client/3rd-prebuilt"]
+	path = client/3rd-prebuilt
+	url = https://github.com/amnezia-vpn/3rd-prebuilt
+[submodule "client/3rd/amneziawg-apple"]
+	path = client/3rd/amneziawg-apple
+	url = https://github.com/amnezia-vpn/amneziawg-apple
+[submodule "client/3rd/QSimpleCrypto"]
+	path = client/3rd/QSimpleCrypto
+	url = https://github.com/amnezia-vpn/QSimpleCrypto.git
+[submodule "client/3rd/SingleApplication"]
+	path = client/3rd/SingleApplication
+	url = git@github.com:itay-grudev/SingleApplication.git

.gitpod.Dockerfile

@@ -0,0 +1,47 @@
+FROM gitpod/workspace-full-vnc
+
+USER gitpod
+
+RUN sudo apt-get -q update \
+    && sudo apt-get install -yq \
+        build-essential \
+        libgl1-mesa-dev \
+        libgstreamer-gl1.0-0 \
+        libpulse-dev \
+        libsecret-1-dev \
+        libxcb-glx0 \
+        libxcb-icccm4 \
+        libxcb-image0 \
+        libxcb-keysyms1 \
+        libxcb-randr0 \
+        libxcb-render-util0 \
+        libxcb-render0 \
+        libxcb-shape0 \
+        libxcb-shm0 \
+        libxcb-sync1 \
+        libxcb-util1 \
+        libxcb-xfixes0 \
+        libxcb-xinerama0 \
+        libxcb1 \
+        libxkbcommon-dev \
+        libxkbcommon-x11-0 \
+        libxcb-xkb-dev \
+        p7zip-full \
+    && sudo rm -rf /var/lib/apt/lists/*
+
+RUN sudo pip3 install aqtinstall
+
+ARG QT_VERSION=6.4.1
+ARG QT_ARCH=gcc_64
+
+ARG QT_DIR=/opt/qt
+RUN sudo aqt install-qt --outputdir ${QT_DIR} linux desktop ${QT_VERSION} ${QT_ARCH} --modules \
+    qtremoteobjects \
+    qt5compat \
+    qtshadertools
+ENV QT_BIN_DIR=${QT_DIR}/${QT_VERSION}/${QT_ARCH}/bin
+
+ARG QIF_VERSION=4.5
+ARG QIF_DIR=/opt/qif
+RUN sudo aqt install-tool --outputdir ${QIF_DIR} linux desktop tools_ifw
+ENV QIF_BIN_DIR=${QIF_DIR}/Tools/QtInstallerFramework/${QIF_VERSION}/bin

.gitpod.yml

@@ -0,0 +1,8 @@
+tasks:
+- init: >-
+    deploy/build_linux.sh
+image:
+  file: .gitpod.Dockerfile
+vscode:
+  extensions:
+  - llvm-vs-code-extensions.vscode-clangd

.travis.yml

@@ -1,144 +0,0 @@
-language: cpp
-
-branches:
-  only:
-    - master
-    - dev
-    - /\d+\.\d+/
-  
-jobs:
-  include:
-    - name: MacOS
-      os: osx
-      osx_image: xcode12.5
-      
-      env:
-        - QT_VERSION=5.15.2
-        - QIF_VERSION=4.1
-        - QT_BIN_DIR=$HOME/Qt/$QT_VERSION/clang_64/bin
-        - QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin
-         
-      script:
-        - |
-          if [ ! -f $HOME/Qt/$QT_VERSION/clang_64/bin/qmake ]; then \
-          brew install p7zip && \
-          python3 -m pip install --upgrade pip && \
-          pip install -U aqtinstall requests py7zr && \
-          pip show aqtinstall && \
-          python3 -m aqt install --outputdir $HOME/Qt $QT_VERSION mac desktop clang_64 -m qtbase && \
-          python3 -m aqt tool --outputdir $HOME/Qt mac tools_ifw $QIF_VERSION qt.tools.ifw.${QIF_VERSION/./};
-          fi
-        - bash deploy/build_macos.sh 
-
-      deploy:
-        provider: releases
-        token: $GH_TOKEN
-        skip_cleanup: true
-        file:
-        - "AmneziaVPN_unsigned.dmg"
-        on:
-          tags: true
-          branch: master
-    
-    - name: Windows_x64
-      os: windows
-      
-      env:
-        - PATH=/c/Python39:/c/Python39/Scripts:$PATH
-        - QT_VERSION=5.14.2
-        - QIF_VERSION=4.1
-        - QT_BIN_DIR="c:\\Qt\\$QT_VERSION\\msvc2017_64\\bin"
-        - QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\${QIF_VERSION}\\bin"
-        - BUILD_ARCH=64
-        
-      before_install:
-        - if [ ! -f /C/Qt/$QT_VERSION/msvc2017_64/bin/qmake ]; then choco install python --version 3.9.1; fi
-        
-      script:
-        - dir "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build"
-        - dir "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools"
-        - |
-          if [ ! -f /C/Qt/$QT_VERSION/msvc2017_64/bin/qmake ]; then \
-          python -m pip install --upgrade pip && \
-          pip3 install -U aqtinstall requests py7zr && \
-          pip3 show aqtinstall && \
-          python -m aqt install --outputdir /C/Qt $QT_VERSION windows desktop win64_msvc2017_64 -m qtbase && \
-          python -m aqt tool --outputdir /C/Qt windows tools_ifw $QIF_VERSION qt.tools.ifw.${QIF_VERSION/./}; \
-          fi
-        - echo set BUILD_ARCH=$BUILD_ARCH > winbuild.bat
-        - echo set QT_BIN_DIR="$QT_BIN_DIR" >> winbuild.bat
-        - echo set QIF_BIN_DIR="$QIF_BIN_DIR" >> winbuild.bat
-        - echo call \""C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\VC\\Auxiliary\\Build\\vcvars${BUILD_ARCH}.bat\"" >> winbuild.bat
-        - echo call \""C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\Common7\\Tools\\VsDevCmd.bat\" -arch=amd64" >> winbuild.bat
-        - echo set WIN_CERT_PW=$WIN_CERT_PW >> winbuild.bat
-        - echo call deploy\\build_windows.bat >> winbuild.bat
-        - cmd //c winbuild.bat
-
-        
-      deploy:
-        provider: releases
-        token: $GH_TOKEN
-        skip_cleanup: true
-        file:
-        - "AmneziaVPN_x64.exe"
-        on:
-          tags: true
-          branch: master
-
-    - name: Windows_x32
-      os: windows
-
-      env:
-        - PATH=/c/Python39:/c/Python39/Scripts:$PATH
-        - QT_VERSION=5.14.2
-        - QIF_VERSION=4.1
-        - QT_BIN_DIR="c:\\Qt\\${QT_VERSION}\\msvc2017\\bin"
-        - QIF_BIN_DIR="c:\\Qt\\Tools\\QtInstallerFramework\\${QIF_VERSION}\\bin"
-        - BUILD_ARCH=32
-
-      before_install:
-        - if [ ! -f /C/Qt/$QT_VERSION/msvc2017/bin/qmake ]; then choco install python --version 3.9.1; fi
-
-      script:
-        - dir "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build"
-        - dir "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\Tools"
-        - |
-          if [ ! -f /C/Qt/$QT_VERSION/msvc2017/bin/qmake ]; then \
-          python -m pip install --upgrade pip && \
-          pip3 install -U aqtinstall requests py7zr && \
-          pip3 show aqtinstall && \
-          python -m aqt install --outputdir /C/Qt $QT_VERSION windows desktop win32_msvc2017 -m qtbase && \
-          python -m aqt tool --outputdir /C/Qt windows tools_ifw $QIF_VERSION qt.tools.ifw.${QIF_VERSION/./}; \
-          fi
-        - echo call \""C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\Common7\\Tools\\VsDevCmd.bat\"" > winbuild.bat
-        - echo set BUILD_ARCH=$BUILD_ARCH >> winbuild.bat
-        - echo set QT_BIN_DIR="$QT_BIN_DIR" >> winbuild.bat
-        - echo set QIF_BIN_DIR="$QIF_BIN_DIR" >> winbuild.bat
-        - echo call \""C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\VC\\Auxiliary\\Build\\vcvars${BUILD_ARCH}.bat\"" >> winbuild.bat
-        - echo set WIN_CERT_PW=$WIN_CERT_PW >> winbuild.bat
-        - echo call deploy\\build_windows.bat >> winbuild.bat
-        - cmd //c winbuild.bat
-
-      deploy:
-        provider: releases
-        token: $GH_TOKEN
-        skip_cleanup: true
-        file:
-        - "AmneziaVPN_x32.exe"
-        on:
-          tags: true
-          branch: master
-
-deploy:
-  skip_cleanup: true
-  
-before_cache:
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew cleanup; fi
-  # Cache only .git files under "/usr/local/Homebrew" so "brew update" does not take 5min every build
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then find /usr/local/Homebrew \! -regex ".+\.git.+" -delete; fi
-  
-cache:
-  directories:
-    - $HOME/Qt
-    - /C/Qt
-    - $HOME/Library/Caches/Homebrew

AmneziaVPN.pro

@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = client service platform
-

CMakeLists.txt

@@ -0,0 +1,44 @@
+cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR)
+
+set(PROJECT AmneziaVPN)
+
+project(${PROJECT} VERSION 4.7.0.0
+        DESCRIPTION "AmneziaVPN"
+        HOMEPAGE_URL "https://amnezia.org/"
+)
+
+string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
+set(RELEASE_DATE "${CURRENT_DATE}")
+
+set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
+set(APP_ANDROID_VERSION_CODE 57)
+
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+    set(MZ_PLATFORM_NAME "linux")
+elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+    set(MZ_PLATFORM_NAME "windows")
+elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+    set(MZ_PLATFORM_NAME "macos")
+elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
+    set(MZ_PLATFORM_NAME "android")
+elseif(${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
+    set(MZ_PLATFORM_NAME "ios")
+elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
+    set(MZ_PLATFORM_NAME "wasm")
+endif()
+
+set(QT_BUILD_TOOLS_WHEN_CROSS_COMPILING ON)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+if(APPLE AND NOT IOS)
+    set(CMAKE_OSX_ARCHITECTURES "x86_64")
+endif()
+
+add_subdirectory(client)
+
+if(NOT IOS AND NOT ANDROID)
+    add_subdirectory(service)
+
+    include(${CMAKE_SOURCE_DIR}/deploy/installer/config.cmake)
+endif()

README.md

@@ -1,50 +1,194 @@
 # Amnezia VPN
 ## _The best client for self-hosted VPN_
 
-[![Build Status](https://travis-ci.com/amnezia-vpn/desktop-client.svg?branch=master)](https://travis-ci.com/amnezia-vpn/desktop-client)
+[![Build Status](https://github.com/amnezia-vpn/amnezia-client/actions/workflows/deploy.yml/badge.svg?branch=dev)](https://github.com/amnezia-vpn/amnezia-client/actions/workflows/deploy.yml?query=branch:dev)
+[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/amnezia-vpn/amnezia-client)
+
+Amnezia is an open-source VPN client, with a key feature that enables you to deploy your own VPN server on your server.
+
+![Image](https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/uipic4.png)
+
+<br>
+
+<a href="https://github.com/amnezia-vpn/amnezia-client/releases/download/4.6.0.3/AmneziaVPN_4.6.0.3_x64.exe"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/win.png" width="150" style="max-width: 100%;"></a> 
+<a href="https://github.com/amnezia-vpn/amnezia-client/releases/download/4.6.0.3/AmneziaVPN_4.6.0.3.dmg"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/mac.png" width="150" style="max-width: 100%;"></a> 
+<a href="https://github.com/amnezia-vpn/amnezia-client/releases/download/4.6.0.3/AmneziaVPN_Linux_4.6.0.3.tar.zip"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/lin.png" width="150" style="max-width: 100%;"></a>
+<a href="https://github.com/amnezia-vpn/amnezia-client/releases/tag/4.6.0.3"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/andr.png" width="150" style="max-width: 100%;"></a>
+
+<br>
+
+<a href="https://play.google.com/store/search?q=amnezia+vpn&c=apps"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/play.png" width="150" style="max-width: 100%;"></a>
+<a href="https://apps.apple.com/us/app/amneziavpn/id1600529900"><img src="https://github.com/amnezia-vpn/amnezia-client/blob/dev/metadata/img-readme/apl.png" width="150" style="max-width: 100%;"></a>
+
+
+[All releases](https://github.com/amnezia-vpn/amnezia-client/releases)
+
+<br>
 
-Amnezia is a VPN client with the key feature of deploying your own VPN server on you virtual server.
 
 ## Features
-- Very easy to use - enter your ip address, ssh login and password, and Amnezia client will automatically install VPN docker containers to your server and connect to VPN.
-- OpenVPN and OpenVPN over ShadowSocks protocols support. 
-- Custom VPN routing mode support - add any sites to client to enable VPN only for them.
-- Windows and MacOS support.
-- Unsecure sharing connection profile for family use.
+
+- Very easy to use - enter your IP address, SSH login, password and Amnezia will automatically install VPN docker containers to your server and connect to the VPN.
+- Classic VPN-protocols: OpenVPN, WireGuard and IKEv2 protocols.
+- Protocols with traffic Masking (Obfuscation): OpenVPN over [Cloak](https://github.com/cbeuw/Cloak) plugin, Shadowsocks (OpenVPN over Shadowsocks), [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) and XRay.
+- Split tunneling support - add any sites to the client to enable VPN only for them or add Apps (only for Android and Desktop).
+- Windows, MacOS, Linux, Android, iOS releases.
+- Support for AmneziaWG protocol configuration on [Keenetic beta firmware](https://docs.keenetic.com/ua/air/kn-1611/en/6319-latest-development-release.html#UUID-186c4108-5afd-c10b-f38a-cdff6c17fab3_section-idm33192196168192-improved).
+
+## Links
+
+- [https://amnezia.org](https://amnezia.org) - project website  
+- [https://www.reddit.com/r/AmneziaVPN](https://www.reddit.com/r/AmneziaVPN) - Reddit  
+- [https://t.me/amnezia_vpn_en](https://t.me/amnezia_vpn_en) - Telegram support channel (English) 
+- [https://t.me/amnezia_vpn_ir](https://t.me/amnezia_vpn_ir) - Telegram support channel (Farsi) 
+- [https://t.me/amnezia_vpn_mm](https://t.me/amnezia_vpn_mm) - Telegram support channel (Myanmar)  
+- [https://t.me/amnezia_vpn](https://t.me/amnezia_vpn) - Telegram support channel (Russian)
+- [https://vpnpay.io/en/amnezia-premium/](https://vpnpay.io/en/amnezia-premium/) - Amnezia Premium
 
 ## Tech
 
-AmneziaVPN uses a number of open source projects to work:
+AmneziaVPN uses several open-source projects to work:
 
 - [OpenSSL](https://www.openssl.org/)
 - [OpenVPN](https://openvpn.net/)
-- [ShadowSocks](https://shadowsocks.org/)
+- [Shadowsocks](https://shadowsocks.org/)
 - [Qt](https://www.qt.io/)
-- [EasyRSA](https://github.com/OpenVPN/easy-rsa) - part of OpenVPN
-- [CygWin](https://www.cygwin.com/) - only for Windiws, used for launching EasyRSA scripts
-- [QtSsh](https://github.com/jaredtao/QtSsh) - forked form Qt Creator
+- [LibSsh](https://libssh.org) - forked from Qt Creator
 - and more...
 
+## Checking out the source code
+
+Make sure to pull all submodules after checking out the repo.
+
+```bash
+git submodule update --init --recursive
+```
+
 ## Development
 
 Want to contribute? Welcome!
 
+### Help with translations
+
+Download the most actual translation files.
+
+Go to ["Actions" tab](https://github.com/amnezia-vpn/amnezia-client/actions?query=is%3Asuccess+branch%3Adev), click on the first line.
+Then scroll down to the "Artifacts" section and download "AmneziaVPN_translations".
+
+Unzip this file.
+Each *.ts file contains strings for one corresponding language.
+
+Translate or correct some strings in one or multiple *.ts files and commit them back to this repository into the ``client/translations`` folder.
+You can do it via a web-interface or any other method you're familiar with.
+
 ### Building sources and deployment
-Easiest way to build your own executables - is to fork project and configure [Travis CI](https://travis-ci.com/)  
-Or you can build sources manually using Qt Creator. Qt >= 14.2 supported.  
-Look to the `build_macos.sh` and `build_windows.bat` scripts in `deploy` folder for details.
+
+Check deploy folder for build scripts. 
+
+### How to build an iOS app from source code on MacOS
+
+1. First, make sure you have [XCode](https://developer.apple.com/xcode/) installed, at least version 14 or higher.
+
+2. We use QT to generate the XCode project. We need QT version 6.6.2. Install QT for MacOS [here](https://doc.qt.io/qt-6/macos.html) or [QT Online Installer](https://www.qt.io/download-open-source). Required modules:
+   - MacOS
+   - iOS
+   - Qt 5 Compatibility Module
+   - Qt Shader Tools
+   - Additional Libraries:
+     - Qt Image Formats
+     - Qt Multimedia
+     - Qt Remote Objects 
+
+3. Install CMake if required. We recommend CMake version 3.25. You can install CMake [here](https://cmake.org/download/)
+
+4. You also need to install go >= v1.16. If you don't have it installed already,
+download go from the [official website](https://golang.org/dl/) or use Homebrew. 
+The latest version is recommended. Install gomobile
+```bash
+export PATH=$PATH:~/go/bin
+go install golang.org/x/mobile/cmd/gomobile@latest
+gomobile init
+```
+
+5. Build the project
+```bash
+export QT_BIN_DIR="<PATH-TO-QT-FOLDER>/Qt/<QT-VERSION>/ios/bin"
+export QT_MACOS_ROOT_DIR="<PATH-TO-QT-FOLDER>/Qt/<QT-VERSION>/macos"
+export QT_IOS_BIN=$QT_BIN_DIR
+export PATH=$PATH:~/go/bin
+mkdir build-ios
+$QT_IOS_BIN/qt-cmake . -B build-ios -GXcode -DQT_HOST_PATH=$QT_MACOS_ROOT_DIR
+```
+Replace PATH-TO-QT-FOLDER and QT-VERSION to your environment
+
+
+If you get `gomobile: command not found` make sure to set PATH to the location 
+of the bin folder where gomobile was installed. Usually, it's in `GOPATH`.
+```bash
+export PATH=$(PATH):/path/to/GOPATH/bin
+```
+
+6. Open the XCode project. You can then run /test/archive/ship the app.
+
+If the build fails with the following error
+```
+make: *** 
+[$(PROJECTDIR)/client/build/AmneziaVPN.build/Debug-iphoneos/wireguard-go-bridge/goroot/.prepared] 
+Error 1
+```
+Add a user-defined variable to both AmneziaVPN and WireGuardNetworkExtension targets' build settings with
+key `PATH` and value `${PATH}/path/to/bin/folder/with/go/executable`, e.g. `${PATH}:/usr/local/go/bin`.
+
+if the above error persists on your M1 Mac, then most probably you need to install arch based CMake 
+```
+arch -arm64 brew install cmake
+```
+
+Build might fail with the "source files not found" error the first time you try it, because the modern XCode build system compiles dependencies in parallel, and some dependencies end up being built after the ones that
+require them. In this case, simply restart the build.
+
+## How to build the Android app
+
+_Tested on Mac OS_
+
+The Android app has the following requirements:
+* JDK 11
+* Android platform SDK 33
+* CMake 3.25.0
+
+After you have installed QT, QT Creator, and Android Studio, you need to configure QT Creator correctly.
+
+- Click in the top menu bar on `QT Creator` -> `Preferences` -> `Devices` and select the tab `Android`.
+- Set path to JDK 11
+- Set path to Android SDK (`$ANDROID_HOME`)
+
+In case you get errors regarding missing SDK or 'SDK manager not running', you cannot fix them by correcting the paths. If you have some spare GBs on your disk, you can let QT Creator install all requirements by choosing an empty folder for `Android SDK location` and clicking on `Set Up SDK`. Be aware: This will install a second Android SDK and NDK on your machine! 
+Double-check that the right CMake version is configured:  Click on `QT Creator` -> `Preferences` and click on the side menu on `Kits`. Under the center content view's `Kits` tab, you'll find an entry for `CMake Tool`. If the default selected CMake version is lower than 3.25.0, install on your system CMake >= 3.25.0 and choose `System CMake at <path>` from the drop-down list. If this entry is missing, you either have not installed CMake yet or QT Creator hasn't found the path to it. In that case, click in the preferences window on the side menu item `CMake`, then on the tab `Tools` in the center content view, and finally on the button `Add` to set the path to your installed CMake. 
+Please make sure that you have selected Android Platform SDK 33 for your project: click in the main view's side menu on `Projects`, and on the left, you'll see a section `Build & Run` showing different Android build targets. You can select any of them, Amnezia VPN's project setup is designed in a way that all Android targets will be built. Click on the targets submenu item `Build` and scroll in the center content view to `Build Steps`. Click on `Details` at the end of the headline `Build Android APK` (the `Details` button might be hidden in case the QT Creator Window is not running in full screen!). Here we are: Choose `android-33` as `Android Build Platform SDK`.
+
+That's it! You should be ready to compile the project from QT Creator!
+
+### Development flow
+
+After you've hit the build button, QT-Creator copies the whole project to a folder in the repository parent directory. The folder should look something like `build-amnezia-client-Android_Qt_<version>_Clang_<architecture>-<BuildType>`.
+If you want to develop Amnezia VPNs Android components written in Kotlin, such as components using system APIs, you need to import the generated project in Android Studio with `build-amnezia-client-Android_Qt_<version>_Clang_<architecture>-<BuildType>/client/android-build` as the projects root directory. While you should be able to compile the generated project from Android Studio, you cannot work directly in the repository's Android project. So whenever you are confident with your work in the generated project, you'll need to copy and paste the affected files to the corresponding path in the repository's Android project so that you can add and commit your changes!
+
+You may face compiling issues in QT Creator after you've worked in Android Studio on the generated project. Just do a `./gradlew clean` in the generated project's root directory (`<path>/client/android-build/.`) and you should be good to go.
 
 ## License
-GPL v.3
 
-## Contacts
-[https://t.me/amnezia_vpn_en](https://t.me/amnezia_vpn_en) - Telegram support channel (English)  
-[https://t.me/amnezia_vpn](https://t.me/amnezia_vpn) - Telegram support channel (Russian)  
-[https://signal.group/...](https://signal.group/#CjQKIB2gUf8QH_IXnOJMGQWMDjYz9cNfmRQipGWLFiIgc4MwEhAKBONrSiWHvoUFbbD0xwdh) - Signal channel  
-[https://amnezia.org](https://amnezia.org) - project website  
+GPL v3.0
 
 ## Donate
-Bitcoin: bc1qn9rhsffuxwnhcuuu4qzrwp4upkrq94xnh8r26u  
+
+Patreon: [https://www.patreon.com/amneziavpn](https://www.patreon.com/amneziavpn)
+
+Bitcoin: bc1q26eevjcg9j0wuyywd2e3uc9cs2w58lpkpjxq6p <br>
+USDT BEP20: 0x6abD576765a826f87D1D95183438f9408C901bE4 <br>
+USDT TRC20: TELAitazF1MZGmiNjTcnxDjEiH5oe7LC9d <br>
 XMR: 48spms39jt1L2L5vyw2RQW6CXD6odUd4jFu19GZcDyKKQV9U88wsJVjSbL4CfRys37jVMdoaWVPSvezCQPhHXUW5UKLqUp3  
-payeer.com: P2561305  
-ko-fi.com: [https://ko-fi.com/amnezia_vpn](https://ko-fi.com/amnezia_vpn)  
+
+## Acknowledgments
+
+This project is tested with BrowserStack.
+We express our gratitude to [BrowserStack](https://www.browserstack.com) for supporting our project.

client/3rd/QJsonStruct/.gitignore

@@ -0,0 +1,2 @@
+*.user
+build/

client/3rd/QJsonStruct/CMakeLists.txt

@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(QJsonStruct LANGUAGES CXX)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+option(BUILD_TESTING ON)
+
+include(QJsonStruct.cmake)
+find_package(Qt5 COMPONENTS Core REQUIRED)
+
+if(BUILD_TESTING)
+    include(CTest)
+    add_subdirectory(test)
+endif()

client/3rd/QJsonStruct/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Qv2ray Workgroup
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

client/3rd/QJsonStruct/QJsonIO.hpp

@@ -0,0 +1,190 @@
+#pragma once
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QList>
+#include <tuple>
+
+enum class QJsonIOPathType
+{
+    JSONIO_MODE_ARRAY,
+    JSONIO_MODE_OBJECT
+};
+
+typedef QPair<QString, QJsonIOPathType> QJsonIONodeType;
+
+struct QJsonIOPath : QList<QJsonIONodeType>
+{
+    template<typename type1, typename type2, typename... types>
+    QJsonIOPath(const type1 t1, const type2 t2, const types... ts)
+    {
+        AppendPath(t1);
+        AppendPath(t2);
+        (AppendPath(ts), ...);
+    }
+
+    void AppendPath(size_t index)
+    {
+        append({ QString::number(index), QJsonIOPathType::JSONIO_MODE_ARRAY });
+    }
+
+    void AppendPath(const QString &key)
+    {
+        append({ key, QJsonIOPathType::JSONIO_MODE_OBJECT });
+    }
+
+    template<typename t>
+    QJsonIOPath &operator<<(const t &str)
+    {
+        AppendPath(str);
+        return *this;
+    }
+
+    template<typename t>
+    QJsonIOPath &operator+=(const t &val)
+    {
+        AppendPath(val);
+        return *this;
+    }
+
+    QJsonIOPath &operator<<(const QJsonIOPath &other)
+    {
+        for (const auto &x : other)
+            this->append(x);
+        return *this;
+    }
+
+    template<typename t>
+    QJsonIOPath &operator<<(const t &val) const
+    {
+        auto _new = *this;
+        return _new << val;
+    }
+
+    template<typename t>
+    QJsonIOPath operator+(const t &val) const
+    {
+        auto _new = *this;
+        return _new << val;
+    }
+
+    QJsonIOPath operator+(const QJsonIOPath &other) const
+    {
+        auto _new = *this;
+        for (const auto &x : other)
+            _new.append(x);
+        return _new;
+    }
+};
+
+class QJsonIO
+{
+  public:
+    const static inline QJsonValue Null = QJsonValue::Null;
+    const static inline QJsonValue Undefined = QJsonValue::Undefined;
+
+    template<typename current_key_type, typename... t_other_types>
+    static QJsonValue GetValue(const QJsonValue &parent, const current_key_type &current, const t_other_types &...other)
+    {
+        if constexpr (sizeof...(t_other_types) == 0)
+            if constexpr (std::is_integral_v<current_key_type>)
+                return parent.toArray()[current];
+            else
+                return parent.toObject()[current];
+        else if constexpr (std::is_integral_v<current_key_type>)
+            return GetValue(parent.toArray()[current], other...);
+        else
+            return GetValue(parent.toObject()[current], other...);
+    }
+
+    template<typename... key_types_t>
+    static QJsonValue GetValue(QJsonValue value, const std::tuple<key_types_t...> &keys, const QJsonValue &defaultValue = Undefined)
+    {
+        std::apply([&](auto &&...args) { ((value = value[args]), ...); }, keys);
+        return value.isUndefined() ? defaultValue : value;
+    }
+
+    template<typename parent_type, typename t_value_type, typename current_key_type, typename... t_other_key_types>
+    static void SetValue(parent_type &parent, const t_value_type &val, const current_key_type &current, const t_other_key_types &...other)
+    {
+        // If current parent is an array, increase its size to fit the "key"
+        if constexpr (std::is_integral_v<current_key_type>)
+            for (auto i = parent.size(); i <= current; i++)
+                parent.insert(i, {});
+
+        // If the t_other_key_types has nothing....
+        // Means we have reached the end of recursion.
+        if constexpr (sizeof...(t_other_key_types) == 0)
+            parent[current] = val;
+        else if constexpr (std::is_integral_v<typename std::tuple_element_t<0, std::tuple<t_other_key_types...>>>)
+        {
+            // Means we still have many keys
+            // So this element is an array.
+            auto _array = parent[current].toArray();
+            SetValue(_array, val, other...);
+            parent[current] = _array;
+        }
+        else
+        {
+            auto _object = parent[current].toObject();
+            SetValue(_object, val, other...);
+            parent[current] = _object;
+        }
+    }
+
+    static QJsonValue GetValue(const QJsonValue &parent, const QJsonIOPath &path, const QJsonValue &defaultValue = QJsonIO::Undefined)
+    {
+        QJsonValue val = parent;
+        for (const auto &[k, t] : path)
+        {
+            if (t == QJsonIOPathType::JSONIO_MODE_ARRAY)
+                val = val.toArray()[k.toInt()];
+            else
+                val = val.toObject()[k];
+        }
+        return val.isUndefined() ? defaultValue : val;
+    }
+
+    template<typename parent_type, typename value_type>
+    static void SetValue(parent_type &parent, const value_type &t, const QJsonIOPath &path)
+    {
+        QList<std::tuple<QString, QJsonIOPathType, QJsonValue>> _stack;
+        QJsonValue lastNode = parent;
+        for (const auto &[key, type] : path)
+        {
+            _stack.prepend({ key, type, lastNode });
+            if (type == QJsonIOPathType::JSONIO_MODE_ARRAY)
+                lastNode = lastNode.toArray().at(key.toInt());
+            else
+                lastNode = lastNode.toObject()[key];
+        }
+
+        lastNode = t;
+
+        for (const auto &[key, type, node] : _stack)
+        {
+            if (type == QJsonIOPathType::JSONIO_MODE_ARRAY)
+            {
+                const auto index = key.toInt();
+                auto nodeArray = node.toArray();
+                for (auto i = nodeArray.size(); i <= index; i++)
+                    nodeArray.insert(i, {});
+                nodeArray[index] = lastNode;
+                lastNode = nodeArray;
+            }
+            else
+            {
+                auto nodeObject = node.toObject();
+                nodeObject[key] = lastNode;
+                lastNode = nodeObject;
+            }
+        }
+
+        if constexpr (std::is_same_v<parent_type, QJsonObject>)
+            parent = lastNode.toObject();
+        else if constexpr (std::is_same_v<parent_type, QJsonArray>)
+            parent = lastNode.toArray();
+        else
+            Q_UNREACHABLE();
+    }
+};

client/3rd/QJsonStruct/QJsonStruct.cmake

@@ -0,0 +1,5 @@
+include_directories(${CMAKE_CURRENT_LIST_DIR})
+
+set(QJSONSTRUCT_SOURCES
+    ${CMAKE_CURRENT_LIST_DIR}/QJsonStruct.hpp
+    ${CMAKE_CURRENT_LIST_DIR}/QJsonIO.hpp)

client/3rd/QJsonStruct/QJsonStruct.hpp

@@ -0,0 +1,215 @@
+#pragma once
+#include "macroexpansion.hpp"
+
+#ifndef _X
+    #include <QJsonArray>
+    #include <QJsonObject>
+    #include <QList>
+    #include <QVariant>
+#endif
+
+/// macro to define an operator==
+#define ___JSONSTRUCT_DEFAULT_COMPARE_IMPL(x) (this->x == ___another___instance__.x) &&
+#define JSONSTRUCT_COMPARE(CLASS, ...)                                                                                                               \
+    bool operator==(const CLASS &___another___instance__) const                                                                                      \
+    {                                                                                                                                                \
+        return FOR_EACH(___JSONSTRUCT_DEFAULT_COMPARE_IMPL, __VA_ARGS__) true;                                                                       \
+    }
+
+// ============================================================================================
+// Load JSON IMPL
+#define ___DESERIALIZE_FROM_JSON_CONVERT_B_FUNC_IMPL(name) name::loadJson(___json_object_);
+#define ___DESERIALIZE_FROM_JSON_CONVERT_A_FUNC(name) ___DESERIALIZE_FROM_JSON_CONVERT_F_FUNC(name)
+#define ___DESERIALIZE_FROM_JSON_CONVERT_B_FUNC(...) FOREACH_CALL_FUNC_3(___DESERIALIZE_FROM_JSON_CONVERT_B_FUNC_IMPL, __VA_ARGS__)
+#define ___DESERIALIZE_FROM_JSON_CONVERT_F_FUNC(name)                                                                                                \
+    if (___json_object_.toObject().contains(#name))                                                                                                  \
+    {                                                                                                                                                \
+        JsonStructHelper::Deserialize(this->name, ___json_object_.toObject()[#name]);                                                                \
+    }                                                                                                                                                \
+    else                                                                                                                                             \
+    {                                                                                                                                                \
+        this->name = ___qjsonstruct_default_check.name;                                                                                              \
+    }
+
+// ============================================================================================
+// To JSON IMPL
+#define ___SERIALIZE_TO_JSON_CONVERT_F_FUNC(name)                                                                                                    \
+    if (!(___qjsonstruct_default_check.name == this->name))                                                                                          \
+    {                                                                                                                                                \
+        ___json_object_.insert(#name, JsonStructHelper::Serialize(name));                                                                            \
+    }
+#define ___SERIALIZE_TO_JSON_CONVERT_A_FUNC(name) ___json_object_.insert(#name, JsonStructHelper::Serialize(name));
+#define ___SERIALIZE_TO_JSON_CONVERT_B_FUNC_IMPL(name) JsonStructHelper::MergeJson(___json_object_, name::toJson());
+#define ___SERIALIZE_TO_JSON_CONVERT_B_FUNC(...) FOREACH_CALL_FUNC_3(___SERIALIZE_TO_JSON_CONVERT_B_FUNC_IMPL, __VA_ARGS__)
+
+// ============================================================================================
+// Load JSON Wrapper
+#define ___DESERIALIZE_FROM_JSON_CONVERT_FUNC_DECL_A(...) FOREACH_CALL_FUNC_2(___DESERIALIZE_FROM_JSON_CONVERT_A_FUNC, __VA_ARGS__)
+#define ___DESERIALIZE_FROM_JSON_CONVERT_FUNC_DECL_F(...) FOREACH_CALL_FUNC_2(___DESERIALIZE_FROM_JSON_CONVERT_F_FUNC, __VA_ARGS__)
+#define ___DESERIALIZE_FROM_JSON_CONVERT_FUNC_DECL_B(...) FOREACH_CALL_FUNC_2(___DESERIALIZE_FROM_JSON_CONVERT_B_FUNC, __VA_ARGS__)
+#define ___DESERIALIZE_FROM_JSON_EXTRACT_B_F(name_option) ___DESERIALIZE_FROM_JSON_CONVERT_FUNC_DECL_##name_option
+
+// ============================================================================================
+// To JSON Wrapper
+#define ___SERIALIZE_TO_JSON_CONVERT_FUNC_DECL_A(...) FOREACH_CALL_FUNC_2(___SERIALIZE_TO_JSON_CONVERT_A_FUNC, __VA_ARGS__)
+#define ___SERIALIZE_TO_JSON_CONVERT_FUNC_DECL_F(...) FOREACH_CALL_FUNC_2(___SERIALIZE_TO_JSON_CONVERT_F_FUNC, __VA_ARGS__)
+#define ___SERIALIZE_TO_JSON_CONVERT_FUNC_DECL_B(...) FOREACH_CALL_FUNC_2(___SERIALIZE_TO_JSON_CONVERT_B_FUNC, __VA_ARGS__)
+#define ___SERIALIZE_TO_JSON_EXTRACT_B_F(name_option) ___SERIALIZE_TO_JSON_CONVERT_FUNC_DECL_##name_option
+
+// ============================================================================================
+#define JSONSTRUCT_REGISTER_NOCOPYMOVE(___class_type_, ...)                                                                                          \
+    void loadJson(const QJsonValue &___json_object_)                                                                                                 \
+    {                                                                                                                                                \
+        ___class_type_ ___qjsonstruct_default_check;                                                                                                 \
+        FOREACH_CALL_FUNC(___DESERIALIZE_FROM_JSON_EXTRACT_B_F, __VA_ARGS__);                                                                        \
+    }                                                                                                                                                \
+    [[nodiscard]] const QJsonObject toJson() const                                                                                                   \
+    {                                                                                                                                                \
+        ___class_type_ ___qjsonstruct_default_check;                                                                                                 \
+        QJsonObject ___json_object_;                                                                                                                 \
+        FOREACH_CALL_FUNC(___SERIALIZE_TO_JSON_EXTRACT_B_F, __VA_ARGS__);                                                                            \
+        return ___json_object_;                                                                                                                      \
+    }
+
+#define JSONSTRUCT_REGISTER(___class_type_, ...)                                                                                                     \
+    JSONSTRUCT_REGISTER_NOCOPYMOVE(___class_type_, __VA_ARGS__);                                                                                     \
+    [[nodiscard]] static auto fromJson(const QJsonValue &___json_object_)                                                                            \
+    {                                                                                                                                                \
+        ___class_type_ _t;                                                                                                                           \
+        _t.loadJson(___json_object_);                                                                                                                \
+        return _t;                                                                                                                                   \
+    }
+
+#define ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(type, convert_func)                                                                                \
+    static void Deserialize(type &t, const QJsonValue &d)                                                                                            \
+    {                                                                                                                                                \
+        t = d.convert_func;                                                                                                                          \
+    }
+
+class JsonStructHelper
+{
+  public:
+    static void MergeJson(QJsonObject &mergeTo, const QJsonObject &mergeIn)
+    {
+        for (const auto &key : mergeIn.keys())
+            mergeTo[key] = mergeIn.value(key);
+    }
+    //
+    template<typename T>
+    static void Deserialize(T &t, const QJsonValue &d)
+    {
+        if constexpr (std::is_enum_v<T>)
+            t = (T) d.toInt();
+        else if constexpr (std::is_same_v<T, QJsonObject>)
+            t = d.toObject();
+        else if constexpr (std::is_same_v<T, QJsonArray>)
+            t = d.toArray();
+        else
+            t.loadJson(d);
+    }
+
+    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(QString, toString());
+    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(QChar, toVariant().toChar());
+    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(std::string, toString().toStdString());
+    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(std::wstring, toString().toStdWString());
+    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(bool, toBool());
+    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(double, toDouble());
+    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(float, toVariant().toFloat());
+    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(int, toInt());
+    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(long, toVariant().toLongLong());
+    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(long long, toVariant().toLongLong());
+    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(unsigned int, toVariant().toUInt());
+    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(unsigned long, toVariant().toULongLong());
+    ___DECL_JSON_STRUCT_LOAD_SIMPLE_TYPE_FUNC(unsigned long long, toVariant().toULongLong());
+
+    template<typename T>
+    static void Deserialize(QList<T> &t, const QJsonValue &d)
+    {
+        t.clear();
+        for (const auto &val : d.toArray())
+        {
+            T data;
+            Deserialize(data, val);
+            t.push_back(data);
+        }
+    }
+
+    template<typename TKey, typename TValue>
+    static void Deserialize(QMap<TKey, TValue> &t, const QJsonValue &d)
+    {
+        t.clear();
+        const auto &jsonObject = d.toObject();
+        TKey keyVal;
+        TValue valueVal;
+        for (const auto &key : jsonObject.keys())
+        {
+            Deserialize(keyVal, key);
+            Deserialize(valueVal, jsonObject.value(key));
+            t.insert(keyVal, valueVal);
+        }
+    }
+
+    // =========================== Store Json Data ===========================
+
+    template<typename T>
+    static QJsonValue Serialize(const T &t)
+    {
+        if constexpr (std::is_enum_v<T>)
+            return (int) t;
+        else if constexpr (std::is_same_v<T, QJsonObject> || std::is_same_v<T, QJsonArray>)
+            return t;
+        else
+            return t.toJson();
+    }
+
+#define pure_func(x) (x)
+#define ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(type)                                                                                             \
+    static QJsonValue Serialize(const type &t)                                                                                                       \
+    {                                                                                                                                                \
+        return QJsonValue(t);                                                                                                                        \
+    }
+    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(int);
+    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(bool);
+    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(QJsonArray);
+    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(QJsonObject);
+    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(QString);
+    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(long long);
+    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(float);
+    ___DECL_JSON_STRUCT_STORE_SIMPLE_TYPE_FUNC(double);
+
+#define ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(type, func)                                                                                      \
+    static QJsonValue Serialize(const type &t)                                                                                                       \
+    {                                                                                                                                                \
+        return QJsonValue::fromVariant(func);                                                                                                        \
+    }
+
+    ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(std::string, QString::fromStdString(t))
+    ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(std::wstring, QString::fromStdWString(t))
+    ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(long, QVariant::fromValue<long>(t))
+    ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(unsigned int, QVariant::fromValue<unsigned int>(t))
+    ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(unsigned long, QVariant::fromValue<unsigned long>(t))
+    ___DECL_JSON_STRUCT_STORE_VARIANT_TYPE_FUNC(unsigned long long, QVariant::fromValue<unsigned long long>(t))
+
+    template<typename TValue>
+    static QJsonValue Serialize(const QMap<QString, TValue> &t)
+    {
+        QJsonObject mapObject;
+        for (const auto &key : t.keys())
+        {
+            auto valueVal = Serialize(t.value(key));
+            mapObject.insert(key, valueVal);
+        }
+        return mapObject;
+    }
+
+    template<typename T>
+    static QJsonValue Serialize(const QList<T> &t)
+    {
+        QJsonArray listObject;
+        for (const auto &item : t)
+        {
+            listObject.push_back(Serialize(item));
+        }
+        return listObject;
+    }
+};

client/3rd/QJsonStruct/macroexpansion.hpp

@@ -0,0 +1,74 @@
+#pragma once
+
+#define CONCATENATE1(arg1, arg2) CONCATENATE2(arg1, arg2)
+#define CONCATENATE2(arg1, arg2) arg1##arg2
+#define CONCATENATE(x, y) x##y
+
+#define EXPAND(...) __VA_ARGS__
+#define FOR_EACH_1(what, x, ...) what(x)
+#define FOR_EACH_2(what, x, ...) what(x) EXPAND(FOR_EACH_1(what, __VA_ARGS__))
+#define FOR_EACH_3(what, x, ...) what(x) EXPAND(FOR_EACH_2(what, __VA_ARGS__))
+#define FOR_EACH_4(what, x, ...) what(x) EXPAND(FOR_EACH_3(what, __VA_ARGS__))
+#define FOR_EACH_5(what, x, ...) what(x) EXPAND(FOR_EACH_4(what, __VA_ARGS__))
+#define FOR_EACH_6(what, x, ...) what(x) EXPAND(FOR_EACH_5(what, __VA_ARGS__))
+#define FOR_EACH_7(what, x, ...) what(x) EXPAND(FOR_EACH_6(what, __VA_ARGS__))
+#define FOR_EACH_8(what, x, ...) what(x) EXPAND(FOR_EACH_7(what, __VA_ARGS__))
+#define FOR_EACH_9(what, x, ...) what(x) EXPAND(FOR_EACH_8(what, __VA_ARGS__))
+#define FOR_EACH_10(what, x, ...) what(x) EXPAND(FOR_EACH_9(what, __VA_ARGS__))
+#define FOR_EACH_11(what, x, ...) what(x) EXPAND(FOR_EACH_10(what, __VA_ARGS__))
+#define FOR_EACH_12(what, x, ...) what(x) EXPAND(FOR_EACH_11(what, __VA_ARGS__))
+#define FOR_EACH_13(what, x, ...) what(x) EXPAND(FOR_EACH_12(what, __VA_ARGS__))
+#define FOR_EACH_14(what, x, ...) what(x) EXPAND(FOR_EACH_13(what, __VA_ARGS__))
+#define FOR_EACH_15(what, x, ...) what(x) EXPAND(FOR_EACH_14(what, __VA_ARGS__))
+#define FOR_EACH_16(what, x, ...) what(x) EXPAND(FOR_EACH_15(what, __VA_ARGS__))
+
+#define FOR_EACH_NARG(...) FOR_EACH_NARG_(__VA_ARGS__, FOR_EACH_RSEQ_N())
+#define FOR_EACH_NARG_(...) EXPAND(FOR_EACH_ARG_N(__VA_ARGS__))
+#define FOR_EACH_ARG_N(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, N, ...) N
+#define FOR_EACH_RSEQ_N() 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0
+
+#define FOR_EACH_(N, what, ...) EXPAND(CONCATENATE(FOR_EACH_, N)(what, __VA_ARGS__))
+#define FOR_EACH(what, ...) FOR_EACH_(FOR_EACH_NARG(__VA_ARGS__), what, __VA_ARGS__)
+#define FOREACH_CALL_FUNC(func, ...) FOR_EACH(func, __VA_ARGS__)
+
+// Bad hack ==========================================================================================================================
+#define _2X_FOR_EACH_1(what, x, ...) what(x)
+#define _2X_FOR_EACH_2(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_1(what, __VA_ARGS__))
+#define _2X_FOR_EACH_3(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_2(what, __VA_ARGS__))
+#define _2X_FOR_EACH_4(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_3(what, __VA_ARGS__))
+#define _2X_FOR_EACH_5(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_4(what, __VA_ARGS__))
+#define _2X_FOR_EACH_6(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_5(what, __VA_ARGS__))
+#define _2X_FOR_EACH_7(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_6(what, __VA_ARGS__))
+#define _2X_FOR_EACH_8(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_7(what, __VA_ARGS__))
+#define _2X_FOR_EACH_9(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_8(what, __VA_ARGS__))
+#define _2X_FOR_EACH_10(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_9(what, __VA_ARGS__))
+#define _2X_FOR_EACH_11(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_10(what, __VA_ARGS__))
+#define _2X_FOR_EACH_12(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_11(what, __VA_ARGS__))
+#define _2X_FOR_EACH_13(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_12(what, __VA_ARGS__))
+#define _2X_FOR_EACH_14(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_13(what, __VA_ARGS__))
+#define _2X_FOR_EACH_15(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_14(what, __VA_ARGS__))
+#define _2X_FOR_EACH_16(what, x, ...) what(x) EXPAND(_2X_FOR_EACH_15(what, __VA_ARGS__))
+#define _2X_FOR_EACH_(N, what, ...) EXPAND(CONCATENATE(_2X_FOR_EACH_, N)(what, __VA_ARGS__))
+#define _2X_FOR_EACH(what, ...) _2X_FOR_EACH_(FOR_EACH_NARG(__VA_ARGS__), what, __VA_ARGS__)
+#define FOREACH_CALL_FUNC_2(func, ...) _2X_FOR_EACH(func, __VA_ARGS__)
+
+// Bad hack ==========================================================================================================================
+#define _3X_FOR_EACH_1(what, x, ...) what(x)
+#define _3X_FOR_EACH_2(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_1(what, __VA_ARGS__))
+#define _3X_FOR_EACH_3(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_2(what, __VA_ARGS__))
+#define _3X_FOR_EACH_4(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_3(what, __VA_ARGS__))
+#define _3X_FOR_EACH_5(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_4(what, __VA_ARGS__))
+#define _3X_FOR_EACH_6(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_5(what, __VA_ARGS__))
+#define _3X_FOR_EACH_7(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_6(what, __VA_ARGS__))
+#define _3X_FOR_EACH_8(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_7(what, __VA_ARGS__))
+#define _3X_FOR_EACH_9(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_8(what, __VA_ARGS__))
+#define _3X_FOR_EACH_10(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_9(what, __VA_ARGS__))
+#define _3X_FOR_EACH_11(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_10(what, __VA_ARGS__))
+#define _3X_FOR_EACH_12(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_11(what, __VA_ARGS__))
+#define _3X_FOR_EACH_13(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_12(what, __VA_ARGS__))
+#define _3X_FOR_EACH_14(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_13(what, __VA_ARGS__))
+#define _3X_FOR_EACH_15(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_14(what, __VA_ARGS__))
+#define _3X_FOR_EACH_16(what, x, ...) what(x) EXPAND(_3X_FOR_EACH_15(what, __VA_ARGS__))
+#define _3X_FOR_EACH_(N, what, ...) EXPAND(CONCATENATE(_3X_FOR_EACH_, N)(what, __VA_ARGS__))
+#define _3X_FOR_EACH(what, ...) _3X_FOR_EACH_(FOR_EACH_NARG(__VA_ARGS__), what, __VA_ARGS__)
+#define FOREACH_CALL_FUNC_3(func, ...) _3X_FOR_EACH(func, __VA_ARGS__)

client/3rd/QJsonStruct/test/CMakeLists.txt

@@ -0,0 +1,16 @@
+function(QJSONSTRUCT_ADD_TEST TEST_NAME TEST_SOURCE)
+    add_executable(${TEST_NAME} ${TEST_SOURCE} catch.hpp ${QJSONSTRUCT_SOURCES})
+    target_include_directories(${TEST_NAME}
+        PRIVATE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+        )
+    target_link_libraries(
+        ${TEST_NAME}
+        PRIVATE
+        Qt::Core
+        )
+    add_test(NAME QJSONSTRUCT_TEST_${TEST_NAME} COMMAND $<TARGET_FILE:${TEST_NAME}> -s)
+endfunction()
+
+QJSONSTRUCT_ADD_TEST(serialization serialize/main.cpp)
+#QJSONSTRUCT_ADD_TEST(serialize_strings serialize/strings.cpp)

client/3rd/QJsonStruct/test/TestIO.hpp

@@ -0,0 +1,45 @@
+#pragma once
+#include "QJsonStruct.hpp"
+#ifndef _X
+    #include <QList>
+    #include <QString>
+    #include <QStringList>
+#endif
+
+struct BaseStruct
+{
+    QString baseStr;
+    int o;
+    JSONSTRUCT_REGISTER(BaseStruct, F(baseStr, o))
+};
+
+struct BaseStruct2
+{
+    QString baseStr2;
+    int o2;
+    JSONSTRUCT_REGISTER(BaseStruct, F(baseStr2, o2))
+};
+struct TestInnerStruct
+    : BaseStruct
+    , BaseStruct2
+{
+    QJsonObject jobj;
+    QJsonArray jarray;
+    QString str;
+    JSONSTRUCT_REGISTER(TestInnerStruct, B(BaseStruct, BaseStruct2), F(str, jobj, jarray))
+};
+
+struct JsonIOTest
+{
+    QString str;
+    QList<int> listOfNumber;
+    QList<bool> listOfBool;
+    QList<QString> listOfString;
+    QList<QList<QString>> listOfListOfString;
+
+    QMap<QString, QString> map;
+    TestInnerStruct inner;
+
+    JSONSTRUCT_REGISTER(JsonIOTest, F(str, listOfNumber, listOfBool, listOfString, listOfListOfString, map, inner));
+    JsonIOTest(){};
+};

client/3rd/QJsonStruct/test/TestOut.hpp

@@ -0,0 +1,19 @@
+#pragma once
+#include "QJsonStruct.hpp"
+
+struct SubData
+{
+    QString subString;
+    JSONSTRUCT_REGISTER_TOJSON(subString)
+};
+
+struct ToJsonOnlyData
+{
+    QString x;
+    int y;
+    int z;
+    QList<int> ints;
+    SubData sub;
+    QMap<QString, SubData> subs;
+    JSONSTRUCT_REGISTER_TOJSON(x, y, z, sub, ints, subs)
+};

client/3rd/QJsonStruct/test/main.cpp

@@ -0,0 +1,70 @@
+#include "QJsonIO.hpp"
+#include "QJsonStruct.hpp"
+#include "TestIO.hpp"
+#include "TestOut.hpp"
+
+#include <QCoreApplication>
+#include <QJsonDocument>
+#include <iostream>
+
+int main(int argc, char *argv[])
+{
+    Q_UNUSED(argc)
+    Q_UNUSED(argv)
+
+    {
+        ToJsonOnlyData data;
+        data.x = "1string";
+        data.y = 2;
+        data.ints << 0;
+        data.ints << 100;
+        data.ints << 900;
+        data.sub.subString = "subs";
+        data.subs["subs-1"] = { "subs1-data" };
+        data.subs["subs-2"] = { "subs2-data" };
+        data.subs["subs-3"] = { "subs3-data" };
+        data.z = 3;
+        auto x = data.toJson();
+        std::cout << QJsonDocument(x).toJson().toStdString() << std::endl;
+    }
+    //
+    {
+        auto f = JsonIOTest::fromJson( //
+            QJsonObject{
+                { "inner", QJsonObject{ { "str", "innerString" },                                 //
+                                        { "jobj", QJsonObject{ { "key", "value" } } },            //
+                                        { "jarray", QJsonArray{ "array0", "array1", "array2" } }, //
+                                        { "baseStr", "baseInnerString" } } },                     //
+                { "str", "data1" },                                                               //
+                { "map", QJsonObject{ { "mapStr", "mapData" } } },                                //
+                { "listOfString", QJsonArray{ "1", "2", "3", "4", "5" } },                        //
+                { "listOfNumber", QJsonArray{ 1, 2, 3, 4, 5 } },                                  //
+                { "listOfBool", QJsonArray{ true, false, false, true, true } },                   //
+                { "listOfListOfString", QJsonArray{ QJsonArray{ "1" },                            //
+                                                    QJsonArray{ "1", "2" },                       //
+                                                    QJsonArray{ "1", "2", "3" },                  //
+                                                    QJsonArray{ "1", "2", "3", "4" },             //
+                                                    QJsonArray{ "1", "2", "3", "4", "5" } } },    //
+            });
+        auto x = f.toJson();
+        std::cout << QJsonDocument(x).toJson().toStdString() << std::endl;
+    }
+    {
+        QJsonObject obj{
+            { "inner", QJsonObject{ { "str", "innerString" }, { "baseStr", "baseInnerString" } } }, //
+            { "str", "data1" },                                                                     //
+            { "map", QJsonObject{ { "mapStr", "mapData" } } },                                      //
+            { "listOfString", QJsonArray{ "1", "2", "3", "4", "5" } },                              //
+            { "listOfNumber", QJsonArray{ 1, 2, 3, 4, 5 } },                                        //
+            { "listOfBool", QJsonArray{ true, false, false, true, true } },                         //
+            { "listOfListOfString", QJsonArray{ QJsonArray{ "1" },                                  //
+                                                QJsonArray{ "1", "2" },                             //
+                                                QJsonArray{ "1", "2", "3" },                        //
+                                                QJsonArray{ "1", "2", "3", "4" },                   //
+                                                QJsonArray{ "1", "2", "3", "4", "5" } } },          //
+        };
+        auto y = QJsonIO::GetValue(obj, std::tuple{ "listOfListOfString", 2 });
+        y.toObject();
+    }
+    return 0;
+}

client/3rd/QJsonStruct/test/serialize/main.cpp

@@ -0,0 +1,181 @@
+#include "QJsonStruct.hpp"
+#define CATCH_CONFIG_MAIN
+#include "catch.hpp"
+
+const static inline auto INT_TEST_MAX = std::numeric_limits<int>::max() - 1;
+const static inline auto INT_TEST_MIN = -(std::numeric_limits<int>::min() + 1);
+
+#define SINGLE_ELEMENT_CLASS_DECL(CLASS, TYPE, field, defaultvalue, existance)                                                                       \
+    class CLASS                                                                                                                                      \
+    {                                                                                                                                                \
+      public:                                                                                                                                        \
+        TYPE field = defaultvalue;                                                                                                                   \
+        JSONSTRUCT_REGISTER(CLASS, existance(field));                                                                                                \
+    };
+
+// SINGLE_ELEMENT_REQUIRE( CLASS_NAME , TYPE , FIELD , DEFAULT_VALUE , SET VALUE , CHECK VALUE )
+#define SINGLE_ELEMENT_REQUIRE(CLASS, TYPE, field, defaultvalue, value, checkvalue, existance)                                                       \
+    SINGLE_ELEMENT_CLASS_DECL(CLASS, TYPE, field, defaultvalue, existance);                                                                          \
+    CLASS CLASS##_class;                                                                                                                             \
+    CLASS##_class.field = value;                                                                                                                     \
+    REQUIRE(CLASS##_class.toJson()[#field] == checkvalue);
+
+using namespace std;
+SCENARIO("Test Serialization", "[Serialize]")
+{
+    GIVEN("Single Element")
+    {
+        const static QList<QString> defaultList{ "entry 1", "entry 2" };
+        const static QMap<QString, QString> defaultMap{ { "key1", "value1" }, { "key2", "value2" } };
+        typedef QMap<QString, QString> QStringQStringMap;
+
+        WHEN("Serialize a single element")
+        {
+            const static QStringQStringMap setValueMap{ { "newkey1", "newvalue1" } };
+            const static QJsonObject setValueJson{ { "newkey1", QJsonValue{ "newvalue1" } } };
+
+            SINGLE_ELEMENT_REQUIRE(QStringTest_Empty, QString, a, "empty", "", "", F);
+            SINGLE_ELEMENT_REQUIRE(QStringTest, QString, a, "empty", "Some QString", "Some QString", F);
+            SINGLE_ELEMENT_REQUIRE(QStringTest_WithQoutes, QString, a, "empty", "\"", "\"", F);
+            SINGLE_ELEMENT_REQUIRE(QStringTest_zint, int, a, -10, 0, 0, F);
+            SINGLE_ELEMENT_REQUIRE(QStringTest_nint, int, a, -10, 1, 1, F);
+            SINGLE_ELEMENT_REQUIRE(QStringTest_pint, int, a, -10, -1, -1, F);
+            SINGLE_ELEMENT_REQUIRE(QStringTest_pmint, int, a, -1, INT_TEST_MAX, INT_TEST_MAX, F);
+            SINGLE_ELEMENT_REQUIRE(QStringTest_zmint, int, a, -1, INT_TEST_MIN, INT_TEST_MIN, F);
+            SINGLE_ELEMENT_REQUIRE(QStringTest_zuint, uint, a, -10, 0, 0, F);
+            SINGLE_ELEMENT_REQUIRE(QStringTest_puint, uint, a, -10, 1, 1, F);
+            SINGLE_ELEMENT_REQUIRE(BoolTest_True, bool, a, false, true, true, F);
+            SINGLE_ELEMENT_REQUIRE(BoolTest_False, bool, a, true, false, false, F);
+            SINGLE_ELEMENT_REQUIRE(StdStringTest, string, a, "def", "std::string _test", "std::string _test", F);
+            SINGLE_ELEMENT_REQUIRE(QListTest, QList<QString>, a, defaultList, { "newEntry" }, QJsonArray{ "newEntry" }, F);
+            SINGLE_ELEMENT_REQUIRE(QMapTest, QStringQStringMap, a, defaultMap, {}, QJsonObject{}, F);
+            SINGLE_ELEMENT_REQUIRE(QMapValueTest, QStringQStringMap, a, defaultMap, setValueMap, setValueJson, F);
+        }
+
+        WHEN("Serialize a default value")
+        {
+            SINGLE_ELEMENT_REQUIRE(DefaultQString, QString, a, "defaultvalue", "defaultvalue", QJsonValue::Undefined, F);
+            SINGLE_ELEMENT_REQUIRE(DefaultInteger, int, a, 12345, 12345, QJsonValue::Undefined, F);
+            SINGLE_ELEMENT_REQUIRE(DefaultList, QList<QString>, a, defaultList, defaultList, QJsonValue::Undefined, F);
+            SINGLE_ELEMENT_REQUIRE(DefaultMap, QStringQStringMap, a, defaultMap, defaultMap, QJsonValue::Undefined, F);
+        }
+
+        WHEN("Serialize a force existance default value")
+        {
+            const static QJsonArray defaultListJson{ "entry 1", "entry 2" };
+            const static QJsonObject defaultMapJson{ { "key1", "value1" }, { "key2", "value2" } };
+            SINGLE_ELEMENT_REQUIRE(DefaultQString, QString, a, "defaultvalue", "defaultvalue", "defaultvalue", A);
+            SINGLE_ELEMENT_REQUIRE(DefaultInteger, int, a, 12345, 12345, 12345, A);
+            SINGLE_ELEMENT_REQUIRE(DefaultList, QList<QString>, a, defaultList, defaultList, defaultListJson, A);
+            SINGLE_ELEMENT_REQUIRE(DefaultMap, QStringQStringMap, a, defaultMap, defaultMap, defaultMapJson, A);
+        }
+    }
+
+    GIVEN("Multiple Simple Elements")
+    {
+        WHEN("Can Omit Default Value")
+        {
+            class MultipleNonDefaultElementTestClass
+            {
+              public:
+                QString astring;
+                int integer = 0;
+                double adouble = 0.0;
+                QList<QString> myList;
+                JSONSTRUCT_REGISTER(MultipleNonDefaultElementTestClass, F(astring, integer, adouble, myList))
+            };
+            MultipleNonDefaultElementTestClass instance;
+            const auto json = instance.toJson();
+            REQUIRE(json["astring"] == QJsonValue::Undefined);
+            REQUIRE(json["integer"] == QJsonValue::Undefined);
+            REQUIRE(json["adouble"] == QJsonValue::Undefined);
+            REQUIRE(json["myList"] == QJsonValue::Undefined);
+        }
+
+        WHEN("Forcing Existance")
+        {
+            class MultipleNonDefaultExistanceElementTestClass
+            {
+              public:
+                QString astring;
+                int integer = 0;
+                double adouble = 0.0;
+                QList<QString> myList;
+                JSONSTRUCT_REGISTER(MultipleNonDefaultExistanceElementTestClass, A(astring, integer, adouble, myList))
+            };
+            MultipleNonDefaultExistanceElementTestClass instance;
+            const auto json = instance.toJson();
+            REQUIRE(json["astring"] == "");
+            REQUIRE(json["integer"] == 0);
+            REQUIRE(json["adouble"] == 0.0);
+            REQUIRE(json["myList"] == QJsonArray{});
+        }
+    }
+
+    GIVEN("Nested Elements")
+    {
+        WHEN("Can Omit Default Value")
+        {
+            class Parent
+            {
+                class NestedChild
+                {
+                    class NestedChild2
+                    {
+                      public:
+                        int childChildInt = 13579;
+                        JSONSTRUCT_COMPARE(NestedChild2, childChildInt)
+                        JSONSTRUCT_REGISTER(NestedChild2, F(childChildInt))
+                    };
+
+                  public:
+                    int childInt = 54321;
+                    QString childQString = "A QString";
+                    NestedChild2 anotherChild;
+                    JSONSTRUCT_COMPARE(NestedChild, childInt, childQString, anotherChild)
+                    JSONSTRUCT_REGISTER(NestedChild, F(childInt, childQString, anotherChild))
+                };
+
+              public:
+                int parentInt = 12345;
+                NestedChild child;
+                JSONSTRUCT_REGISTER(Parent, F(parentInt, child))
+            };
+
+            WHEN("Omitted whole child element")
+            {
+                Parent parent;
+                const auto json = parent.toJson();
+                REQUIRE(json["parentInt"] == QJsonValue::Undefined);
+                REQUIRE(json["child"] == QJsonValue::Undefined);
+            }
+
+            WHEN("Omitted one element in the child")
+            {
+                const auto childJson = QJsonObject{ { "childInt", 1314 } };
+                Parent parent;
+                parent.child.childInt = 1314;
+                const auto json = parent.toJson();
+                REQUIRE(json["parentInt"] == QJsonValue::Undefined);
+                REQUIRE(json["child"] == childJson);
+                REQUIRE(json["child"]["childInt"] == 1314);
+                REQUIRE(json["child"]["childQString"] == QJsonValue::Undefined);
+                REQUIRE(json["child"]["child"]["anotherChild"] == QJsonValue::Undefined);
+            }
+
+            WHEN("Omitted one element in the child child")
+            {
+                Parent parent;
+                parent.child.childInt = 1314;
+                parent.child.anotherChild.childChildInt = 97531;
+                const auto json = parent.toJson();
+                REQUIRE(json["parentInt"] == QJsonValue::Undefined);
+                REQUIRE(json["child"]["childInt"] == 1314);
+                REQUIRE(json["child"]["childQString"] == QJsonValue::Undefined);
+                const QJsonObject childChild{ { "childChildInt", 97531 } };
+                REQUIRE(json["child"]["anotherChild"] == childChild);
+                REQUIRE(json["child"]["anotherChild"]["childChildInt"] == 97531);
+            }
+        }
+    }
+}

client/3rd/QRCodeGenerator/QRCodeGenerator.h

@@ -1,129 +0,0 @@
-
-#if !defined(AFX_QR_ENCODE_H__AC886DF7_C0AE_4C9F_AC7A_FCDA8CB1DD37__INCLUDED_)
-#define AFX_QR_ENCODE_H__AC886DF7_C0AE_4C9F_AC7A_FCDA8CB1DD37__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-/////////////////////////////////////////////////////////////////////////////
-
-//
-#define QR_LEVEL_L	0
-#define QR_LEVEL_M	1
-#define QR_LEVEL_Q	2
-#define QR_LEVEL_H	3
-
-//
-#define QR_MODE_NUMERAL		0
-#define QR_MODE_ALPHABET	1
-#define QR_MODE_8BIT		2
-#define QR_MODE_KANJI		3
-
-// 
-#define QR_VRESION_S	0 
-#define QR_VRESION_M	1 
-#define QR_VRESION_L	2 
-
-#define MAX_ALLCODEWORD	 3706 
-#define MAX_DATACODEWORD 2956 
-#define MAX_CODEBLOCK	  153 
-#define MAX_MODULESIZE	  177 
-
-#define QR_MARGIN	0
-
-
-/////////////////////////////////////////////////////////////////////////////
-typedef struct tagRS_BLOCKINFO
-{
-	int ncRSBlock;		
-	int ncAllCodeWord;	
-	int ncDataCodeWord;	
-
-} RS_BLOCKINFO, *LPRS_BLOCKINFO;
-
-
-/////////////////////////////////////////////////////////////////////////////
-
-typedef struct tagQR_VERSIONINFO
-{
-	int nVersionNo;	   
-	int ncAllCodeWord; 
-
-	int ncDataCodeWord[4];	
-
-	int ncAlignPoint;	
-	int nAlignPoint[6];	
-
-	RS_BLOCKINFO RS_BlockInfo1[4]; 
-	RS_BLOCKINFO RS_BlockInfo2[4]; 
-
-} QR_VERSIONINFO, *LPQR_VERSIONINFO;
-
-
-/////////////////////////////////////////////////////////////////////////////
-
-class CQR_Encode
-{
-public:
-	CQR_Encode();
-	~CQR_Encode();
-
-public:
-	int m_nLevel;		
-	int m_nVersion;		
-	bool m_bAutoExtent;	
-	int m_nMaskingNo;	
-
-public:
-	int m_nSymbleSize;
-	unsigned char m_byModuleData[MAX_MODULESIZE][MAX_MODULESIZE]; // [x][y]
-
-private:
-	int m_ncDataCodeWordBit; 
-	unsigned char m_byDataCodeWord[MAX_DATACODEWORD]; 
-
-	int m_ncDataBlock;
-	unsigned char m_byBlockMode[MAX_DATACODEWORD];
-	int m_nBlockLength[MAX_DATACODEWORD];
-
-	int m_ncAllCodeWord; 
-	unsigned char m_byAllCodeWord[MAX_ALLCODEWORD]; 
-	unsigned char m_byRSWork[MAX_CODEBLOCK]; 
-
-public:
-	bool EncodeData(int nLevel, int nVersion, bool bAutoExtent, int nMaskingNo, char* lpsSource, int ncSource = 0);
-
-private:
-	int GetEncodeVersion(int nVersion, char* lpsSource, int ncLength);
-	bool EncodeSourceData(char* lpsSource, int ncLength, int nVerGroup);
-
-	int GetBitLength(unsigned char nMode, int ncData, int nVerGroup);
-
-	int SetBitStream(int nIndex, unsigned short wData, int ncData);
-
-	bool IsNumeralData(unsigned char c);
-	bool IsAlphabetData(unsigned char c);
-	bool IsKanjiData(unsigned char c1, unsigned char c2);
-
-	unsigned char AlphabetToBinaly(unsigned char c);
-	unsigned short KanjiToBinaly(unsigned short wc);
-
-	void GetRSCodeWord(unsigned char * lpbyRSWork, int ncDataCodeWord, int ncRSCodeWord);
-
-private:
-	void FormatModule();
-
-	void SetFunctionModule();
-	void SetFinderPattern(int x, int y);
-	void SetAlignmentPattern(int x, int y);
-	void SetVersionPattern();
-	void SetCodeWordPattern();
-	void SetMaskingPattern(int nPatternNo);
-	void SetFormatInfoPattern(int nPatternNo);
-	int CountPenalty();
-};
-
-/////////////////////////////////////////////////////////////////////////////
-
-#endif // !defined(AFX_QR_ENCODE_H__AC886DF7_C0AE_4C9F_AC7A_FCDA8CB1DD37__INCLUDED_)

client/3rd/QRCodeGenerator/QRCodeGenerator.pri

@@ -1,5 +0,0 @@
-HEADERS  += \
-   3rd/QRCodeGenerator/QRCodeGenerator.h \
-
-SOURCES  += \
-   3rd/QRCodeGenerator/QRCodeGenerator.cpp \

client/3rd/QtSsh/.gitignore

@@ -1,50 +0,0 @@
-# User settings
-*.user
-macOSPackage/
-
-# C++ objects and libs
-*.slo
-*.lo
-*.o
-*.a
-*.la
-*.lai
-*.so
-*.dll
-*.dylib
-
-# Qt-es
-/.qmake.cache
-/.qmake.stash
-*.pro.user
-*.pro.user.*
-*.qbs.user
-*.qbs.user.*
-*.moc
-moc_*.cpp
-qrc_*.cpp
-ui_*.h
-Makefile*
-*build-*
-
-# QtCreator
-
-*.autosave
-
-# QtCtreator Qml
-*.qmlproject.user
-*.qmlproject.user.*
-
-# QtCtreator CMake
-CMakeLists.txt.user*
-
-# MACOS files
-.DS_Store
-._.DS_Store
-._*
-
-# tmp files
-*.*~
-
-# Certificates
-*.p12

client/3rd/QtSsh/.qmake.conf

@@ -1,3 +0,0 @@
-load(qt_build_config)
-
-MODULE_VERSION = 4.3.1

client/3rd/QtSsh/QtSsh.pro

@@ -1 +0,0 @@
-load(qt_parts)

client/3rd/QtSsh/README.md

@@ -1,46 +0,0 @@
-# QSsh
-
-this project is base on Qt-creator-open-source-4.3.1
-project is at 
-
-`http://code.qt.io/cgit/qt-creator/qt-creator.git/`
-
-you can download code zip at 
-
-`http://download.qt.io/official_releases/qtcreator/4.3/4.3.1/`
-
-## Getting Started
-
-> * For linux user, if your Qt is installed through package manager tools such "apt-get", make sure that you have installed the Qt5 develop package *qtbase5-private-dev*
-
-### Usage(1): Use QtSsh as Qt5's addon module
-
-#### Building the module
-
-> **Note**: Perl is needed in this step.
-
-* Download the source code.
-
-* Put the source code in any directory you like
-
-* Go to top directory of the project in a terminal and run
-
-```
-    qmake
-    make
-    make install
-```
-
-The library, the header files, and others will be installed to your system.
-
-#### Import the module 
-
-`   QT += ssh`
-
-#### Include Headerfile
-
-`   #include<QtSsh/sshconnection.h>`
-
-#### Close qtc.ssh log
-
-`   QLoggingCategory::setFilterRules(QStringLiteral("qtc.ssh=false")`

client/3rd/QtSsh/examples/examples.pro

@@ -1,2 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS = gitlab

client/3rd/QtSsh/examples/gitlab/Qml.qrc

@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>Qml/Main.qml</file>
-    </qresource>
-</RCC>

client/3rd/QtSsh/examples/gitlab/Qml/Main.qml

@@ -1,51 +0,0 @@
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-import Ssh 1.0
-Item {
-    width: 1024
-    height: 768
-
-    TextField {
-        id: input
-        x: 104
-        y: 44
-        width: 482
-        height: 40
-        implicitWidth: 200
-        selectByMouse: true
-        text: "https://www.zhihu.com"
-    }
-    function get(url) {
-        var xhr = new XMLHttpRequest();
-        xhr.onreadystatechange = function() {
-            if (xhr.readyState === XMLHttpRequest.DONE) {
-                console.log(xhr.responseXML, xhr.responseText.toString())
-            } else if (xhr.readyState === XMLHttpRequest) {
-
-            }
-        }
-        xhr.open('GET', url)
-        xhr.send()
-    }
-    Button {
-        x: 627
-        y: 44
-        text: "get"
-        onClicked: {
-            get(input.text)
-        }
-    }
-
-    Button {
-        id: button
-        x: 104
-        y: 170
-        text: qsTr("Ssh")
-        onClicked: ssh.connectToHost()
-    }
-    Ssh {
-        id: ssh
-    }
-
-
-}

client/3rd/QtSsh/examples/gitlab/Src/Main.cpp

@@ -1,17 +0,0 @@
-#include <QGuiApplication>
-#include <QQmlApplicationEngine>
-#include <QQuickView>
-#include "Ssh.hpp"
-
-int main(int argc, char *argv[])
-{
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-    QGuiApplication app(argc, argv);
-
-    qmlRegisterType<Ssh> ("Ssh", 1, 0, "Ssh");
-
-    QQuickView view;
-    view.setSource(QUrl("qrc:/Qml/Main.qml"));
-    view.show();
-    return app.exec();
-}

client/3rd/QtSsh/examples/gitlab/Src/Ssh.cpp

@@ -1,61 +0,0 @@
-#include "Ssh.hpp"
-#include <QDir>
-#include <QDebug>
-#include <QLoggingCategory>
-
-Ssh::Ssh(QObject *parent) : QObject(parent) {
-    //关掉qtc.ssh中的各种打印信息
-    QLoggingCategory::setFilterRules(QStringLiteral("qtc.ssh=false"));
-
-    mParams.host="ftb.autoio.org";
-    mParams.userName = "ftb";
-    mParams.port = 11122;
-
-    mParams.privateKeyFile = QDir::homePath() +  QStringLiteral("/.ssh/id_rsa");
-    mParams.timeout = 5;
-    mParams.authenticationType = SshConnectionParameters::AuthenticationTypePublicKey;
-    mParams.options = SshIgnoreDefaultProxy;
-    mParams.hostKeyCheckingMode = SshHostKeyCheckingNone;
-
-    mConnections = std::make_shared<SshConnection>(mParams);
-    connect(mConnections.get(), &SshConnection::error, [&](QSsh::SshError){
-        qWarning() << "Error: " << mConnections->errorString();
-    });
-    connect(mConnections.get(), &SshConnection::connected, [&](){
-        qWarning() << "Connected";
-        create();
-    });
-    connect(mConnections.get(), &SshConnection::disconnected, [](){
-        qWarning() << "Disconnected";
-    });
-    connect(mConnections.get(), &SshConnection::dataAvailable, [](const QString &message){
-        qWarning() << "Message: " << message;
-    });
-}
-
-void Ssh::connectToHost() {
-    mConnections->connectToHost();
-}
-
-void Ssh::create() {
-    mRemoteProcess = mConnections->createRemoteProcess(QString::fromLatin1("/bin/ls -a").toUtf8());
-    if (!mRemoteProcess) {
-        qWarning() << QLatin1String("Error: UnmRemoteProcess SSH connection creates remote process.");
-        return;
-    }
-    connect(mRemoteProcess.data(), &SshRemoteProcess::started, [&](){
-        qWarning() << "started";
-    });
-    connect(mRemoteProcess.data(), &SshRemoteProcess::readyReadStandardOutput, [&](){
-        qWarning() << "StandardOutput";
-        qWarning() << QString::fromLatin1(mRemoteProcess->readAllStandardOutput()).split('\n');
-    });
-    connect(mRemoteProcess.data(), &SshRemoteProcess::readyReadStandardError, [&](){
-        qWarning() << "StandardError" << mRemoteProcess->readAllStandardError();
-    });
-    connect(mRemoteProcess.data(), &SshRemoteProcess::closed, [&](int exitStatus){
-        qWarning() << "Exit" << exitStatus;
-    });
-    mRemoteProcess->start();
-}
-

client/3rd/QtSsh/examples/gitlab/Src/Ssh.hpp

@@ -1,26 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <cstdlib>
-#include <functional>
-
-#include <QObject>
-#include <QtSsh/sshconnection.h>
-#include <QtSsh/sshremoteprocess.h>
-
-using namespace QSsh;
-
-class Ssh : public QObject {
-    Q_OBJECT
-public:
-    explicit Ssh(QObject *parent = nullptr);
-
-    Q_INVOKABLE void connectToHost();
-    void create();
-
-private:
-    SshConnectionParameters mParams;
-    std::shared_ptr<SshConnection> mConnections;
-    QSharedPointer<SshRemoteProcess> mRemoteProcess;
-};
-

client/3rd/QtSsh/examples/gitlab/gitlab.pro

@@ -1,29 +0,0 @@
-QT += quick network ssh
-CONFIG += c++11
-TEMPLATE = app
-# The following define makes your compiler emit warnings if you use
-# any feature of Qt which as been marked deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-#DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if you use deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
-SOURCES += Src/Main.cpp \
-    Src/Ssh.cpp
-
-RESOURCES += Qml.qrc
-
-# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH =
-
-# Additional import path used to resolve QML modules just for Qt Quick Designer
-QML_DESIGNER_IMPORT_PATH =
-
-HEADERS += \
-    Src/Ssh.hpp
-
-

client/3rd/QtSsh/src/botan/botan.pri

@@ -1,53 +0,0 @@
-INCLUDEPATH += $$PWD/include
-DEPENDPATH += $$PWD
-
-CONFIG += c++17
-
-INCLUDEPATH += $$PWD/include/external
-
-win32 {
-   QMAKE_CXXFLAGS += -bigobj
-   LIBS += \
-       -lcrypt32 \
-
-   !contains(QMAKE_TARGET.arch, x86_64) {
-      message("Windows x86 build")
-      INCLUDEPATH += $$PWD/windows/x86_64
-      HEADERS += $$PWD/windows/x86/botan_all.h
-      SOURCES += $$PWD/windows/x86/botan_all.cpp
-   }
-   else {
-      message("Windows x86_64 build")
-      INCLUDEPATH += $$PWD/windows/x86_64
-      HEADERS += $$PWD/windows/x86_64/botan_all.h
-      SOURCES += $$PWD/windows/x86_64/botan_all.cpp
-   }
-}
-
-macx {
-    message("macOS build")
-    INCLUDEPATH += $$PWD/macos
-    HEADERS += $$PWD/macos/botan_all.h
-    SOURCES += $$PWD/macos/botan_all.cpp
-}
-
-linux-g++ {
-    message("Linux build")
-    INCLUDEPATH += $$PWD/linux
-    HEADERS += $$PWD/linux/botan_all.h
-    SOURCES += $$PWD/linux/botan_all.cpp
-
-    LIBS += -ldl
-}
-
-android {
-   for (abi, ANDROID_ABIS): {
-      equals(ANDROID_TARGET_ARCH,$$abi) {
-         message("Android build for ANDROID_TARGET_ARCH" $$abi)
-         INCLUDEPATH += $$PWD/android/$${abi}
-         HEADERS += $$PWD/android/$${abi}/botan_all.h
-         SOURCES += $$PWD/android/$${abi}/botan_all.cpp
-      }
-   }
-}
-

client/3rd/QtSsh/src/botan/include/external/pkcs11.h

@@ -1,264 +0,0 @@
-/*
- * PKCS #11 Cryptographic Token Interface Base Specification Version 2.40 Errata 01
- * Committee Specification Draft 01 / Public Review Draft 01
- * 09 December 2015
- * Copyright (c) OASIS Open 2015. All Rights Reserved.
- * Source: http://docs.oasis-open.org/pkcs11/pkcs11-base/v2.40/errata01/csprd01/include/pkcs11-v2.40/
- * Latest version of the specification: http://docs.oasis-open.org/pkcs11/pkcs11-base/v2.40/pkcs11-base-v2.40.html
- * https://www.oasis-open.org/policies-guidelines/ipr
- */
-
-#ifndef _PKCS11_H_
-#define _PKCS11_H_ 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Before including this file (pkcs11.h) (or pkcs11t.h by
- * itself), 5 platform-specific macros must be defined.  These
- * macros are described below, and typical definitions for them
- * are also given.  Be advised that these definitions can depend
- * on both the platform and the compiler used (and possibly also
- * on whether a Cryptoki library is linked statically or
- * dynamically).
- *
- * In addition to defining these 5 macros, the packing convention
- * for Cryptoki structures should be set.  The Cryptoki
- * convention on packing is that structures should be 1-byte
- * aligned.
- *
- * If you're using Microsoft Developer Studio 5.0 to produce
- * Win32 stuff, this might be done by using the following
- * preprocessor directive before including pkcs11.h or pkcs11t.h:
- *
- * #pragma pack(push, cryptoki, 1)
- *
- * and using the following preprocessor directive after including
- * pkcs11.h or pkcs11t.h:
- *
- * #pragma pack(pop, cryptoki)
- *
- * If you're using an earlier version of Microsoft Developer
- * Studio to produce Win16 stuff, this might be done by using
- * the following preprocessor directive before including
- * pkcs11.h or pkcs11t.h:
- *
- * #pragma pack(1)
- *
- * In a UNIX environment, you're on your own for this.  You might
- * not need to do (or be able to do!) anything.
- *
- *
- * Now for the macros:
- *
- *
- * 1. CK_PTR: The indirection string for making a pointer to an
- * object.  It can be used like this:
- *
- * typedef CK_BYTE CK_PTR CK_BYTE_PTR;
- *
- * If you're using Microsoft Developer Studio 5.0 to produce
- * Win32 stuff, it might be defined by:
- *
- * #define CK_PTR *
- *
- * If you're using an earlier version of Microsoft Developer
- * Studio to produce Win16 stuff, it might be defined by:
- *
- * #define CK_PTR far *
- *
- * In a typical UNIX environment, it might be defined by:
- *
- * #define CK_PTR *
- *
- *
- * 2. CK_DECLARE_FUNCTION(returnType, name): A macro which makes
- * an importable Cryptoki library function declaration out of a
- * return type and a function name.  It should be used in the
- * following fashion:
- *
- * extern CK_DECLARE_FUNCTION(CK_RV, C_Initialize)(
- *   CK_VOID_PTR pReserved
- * );
- *
- * If you're using Microsoft Developer Studio 5.0 to declare a
- * function in a Win32 Cryptoki .dll, it might be defined by:
- *
- * #define CK_DECLARE_FUNCTION(returnType, name) \
- *   returnType __declspec(dllimport) name
- *
- * If you're using an earlier version of Microsoft Developer
- * Studio to declare a function in a Win16 Cryptoki .dll, it
- * might be defined by:
- *
- * #define CK_DECLARE_FUNCTION(returnType, name) \
- *   returnType __export _far _pascal name
- *
- * In a UNIX environment, it might be defined by:
- *
- * #define CK_DECLARE_FUNCTION(returnType, name) \
- *   returnType name
- *
- *
- * 3. CK_DECLARE_FUNCTION_POINTER(returnType, name): A macro
- * which makes a Cryptoki API function pointer declaration or
- * function pointer type declaration out of a return type and a
- * function name.  It should be used in the following fashion:
- *
- * // Define funcPtr to be a pointer to a Cryptoki API function
- * // taking arguments args and returning CK_RV.
- * CK_DECLARE_FUNCTION_POINTER(CK_RV, funcPtr)(args);
- *
- * or
- *
- * // Define funcPtrType to be the type of a pointer to a
- * // Cryptoki API function taking arguments args and returning
- * // CK_RV, and then define funcPtr to be a variable of type
- * // funcPtrType.
- * typedef CK_DECLARE_FUNCTION_POINTER(CK_RV, funcPtrType)(args);
- * funcPtrType funcPtr;
- *
- * If you're using Microsoft Developer Studio 5.0 to access
- * functions in a Win32 Cryptoki .dll, in might be defined by:
- *
- * #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
- *   returnType __declspec(dllimport) (* name)
- *
- * If you're using an earlier version of Microsoft Developer
- * Studio to access functions in a Win16 Cryptoki .dll, it might
- * be defined by:
- *
- * #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
- *   returnType __export _far _pascal (* name)
- *
- * In a UNIX environment, it might be defined by:
- *
- * #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
- *   returnType (* name)
- *
- *
- * 4. CK_CALLBACK_FUNCTION(returnType, name): A macro which makes
- * a function pointer type for an application callback out of
- * a return type for the callback and a name for the callback.
- * It should be used in the following fashion:
- *
- * CK_CALLBACK_FUNCTION(CK_RV, myCallback)(args);
- *
- * to declare a function pointer, myCallback, to a callback
- * which takes arguments args and returns a CK_RV.  It can also
- * be used like this:
- *
- * typedef CK_CALLBACK_FUNCTION(CK_RV, myCallbackType)(args);
- * myCallbackType myCallback;
- *
- * If you're using Microsoft Developer Studio 5.0 to do Win32
- * Cryptoki development, it might be defined by:
- *
- * #define CK_CALLBACK_FUNCTION(returnType, name) \
- *   returnType (* name)
- *
- * If you're using an earlier version of Microsoft Developer
- * Studio to do Win16 development, it might be defined by:
- *
- * #define CK_CALLBACK_FUNCTION(returnType, name) \
- *   returnType _far _pascal (* name)
- *
- * In a UNIX environment, it might be defined by:
- *
- * #define CK_CALLBACK_FUNCTION(returnType, name) \
- *   returnType (* name)
- *
- *
- * 5. NULL_PTR: This macro is the value of a NULL pointer.
- *
- * In any ANSI/ISO C environment (and in many others as well),
- * this should best be defined by
- *
- * #ifndef NULL_PTR
- * #define NULL_PTR 0
- * #endif
- */
-
-
-/* All the various Cryptoki types and #define'd values are in the
- * file pkcs11t.h.
- */
-#include "pkcs11t.h"
-
-#define __PASTE(x,y)      x##y
-
-
-/* ==============================================================
- * Define the "extern" form of all the entry points.
- * ==============================================================
- */
-
-#define CK_NEED_ARG_LIST  1
-#define CK_PKCS11_FUNCTION_INFO(name) \
-  extern CK_DECLARE_FUNCTION(CK_RV, name)
-
-/* pkcs11f.h has all the information about the Cryptoki
- * function prototypes.
- */
-#include "pkcs11f.h"
-
-#undef CK_NEED_ARG_LIST
-#undef CK_PKCS11_FUNCTION_INFO
-
-
-/* ==============================================================
- * Define the typedef form of all the entry points.  That is, for
- * each Cryptoki function C_XXX, define a type CK_C_XXX which is
- * a pointer to that kind of function.
- * ==============================================================
- */
-
-#define CK_NEED_ARG_LIST  1
-#define CK_PKCS11_FUNCTION_INFO(name) \
-  typedef CK_DECLARE_FUNCTION_POINTER(CK_RV, __PASTE(CK_,name))
-
-/* pkcs11f.h has all the information about the Cryptoki
- * function prototypes.
- */
-#include "pkcs11f.h"
-
-#undef CK_NEED_ARG_LIST
-#undef CK_PKCS11_FUNCTION_INFO
-
-
-/* ==============================================================
- * Define structed vector of entry points.  A CK_FUNCTION_LIST
- * contains a CK_VERSION indicating a library's Cryptoki version
- * and then a whole slew of function pointers to the routines in
- * the library.  This type was declared, but not defined, in
- * pkcs11t.h.
- * ==============================================================
- */
-
-#define CK_PKCS11_FUNCTION_INFO(name) \
-  __PASTE(CK_,name) name;
-
-struct CK_FUNCTION_LIST {
-
-  CK_VERSION    version;  /* Cryptoki version */
-
-/* Pile all the function pointers into the CK_FUNCTION_LIST. */
-/* pkcs11f.h has all the information about the Cryptoki
- * function prototypes.
- */
-#include "pkcs11f.h"
-
-};
-
-#undef CK_PKCS11_FUNCTION_INFO
-
-
-#undef __PASTE
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _PKCS11_H_ */
-

client/3rd/QtSsh/src/botan/include/external/pkcs11f.h

@@ -1,938 +0,0 @@
-/*
- * PKCS #11 Cryptographic Token Interface Base Specification Version 2.40 Errata 01
- * Committee Specification Draft 01 / Public Review Draft 01
- * 09 December 2015
- * Copyright (c) OASIS Open 2015. All Rights Reserved.
- * Source: http://docs.oasis-open.org/pkcs11/pkcs11-base/v2.40/errata01/csprd01/include/pkcs11-v2.40/
- * Latest version of the specification: http://docs.oasis-open.org/pkcs11/pkcs11-base/v2.40/pkcs11-base-v2.40.html
- * https://www.oasis-open.org/policies-guidelines/ipr
- */
-
-/* This header file contains pretty much everything about all the
- * Cryptoki function prototypes.  Because this information is
- * used for more than just declaring function prototypes, the
- * order of the functions appearing herein is important, and
- * should not be altered.
- */
-
-/* General-purpose */
-
-/* C_Initialize initializes the Cryptoki library. */
-CK_PKCS11_FUNCTION_INFO(C_Initialize)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_VOID_PTR   pInitArgs  /* if this is not NULL_PTR, it gets
-                            * cast to CK_C_INITIALIZE_ARGS_PTR
-                            * and dereferenced
-                            */
-);
-#endif
-
-
-/* C_Finalize indicates that an application is done with the
- * Cryptoki library.
- */
-CK_PKCS11_FUNCTION_INFO(C_Finalize)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_VOID_PTR   pReserved  /* reserved.  Should be NULL_PTR */
-);
-#endif
-
-
-/* C_GetInfo returns general information about Cryptoki. */
-CK_PKCS11_FUNCTION_INFO(C_GetInfo)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_INFO_PTR   pInfo  /* location that receives information */
-);
-#endif
-
-
-/* C_GetFunctionList returns the function list. */
-CK_PKCS11_FUNCTION_INFO(C_GetFunctionList)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_FUNCTION_LIST_PTR_PTR ppFunctionList  /* receives pointer to
-                                            * function list
-                                            */
-);
-#endif
-
-
-
-/* Slot and token management */
-
-/* C_GetSlotList obtains a list of slots in the system. */
-CK_PKCS11_FUNCTION_INFO(C_GetSlotList)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_BBOOL       tokenPresent,  /* only slots with tokens */
-  CK_SLOT_ID_PTR pSlotList,     /* receives array of slot IDs */
-  CK_ULONG_PTR   pulCount       /* receives number of slots */
-);
-#endif
-
-
-/* C_GetSlotInfo obtains information about a particular slot in
- * the system.
- */
-CK_PKCS11_FUNCTION_INFO(C_GetSlotInfo)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SLOT_ID       slotID,  /* the ID of the slot */
-  CK_SLOT_INFO_PTR pInfo    /* receives the slot information */
-);
-#endif
-
-
-/* C_GetTokenInfo obtains information about a particular token
- * in the system.
- */
-CK_PKCS11_FUNCTION_INFO(C_GetTokenInfo)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SLOT_ID        slotID,  /* ID of the token's slot */
-  CK_TOKEN_INFO_PTR pInfo    /* receives the token information */
-);
-#endif
-
-
-/* C_GetMechanismList obtains a list of mechanism types
- * supported by a token.
- */
-CK_PKCS11_FUNCTION_INFO(C_GetMechanismList)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SLOT_ID            slotID,          /* ID of token's slot */
-  CK_MECHANISM_TYPE_PTR pMechanismList,  /* gets mech. array */
-  CK_ULONG_PTR          pulCount         /* gets # of mechs. */
-);
-#endif
-
-
-/* C_GetMechanismInfo obtains information about a particular
- * mechanism possibly supported by a token.
- */
-CK_PKCS11_FUNCTION_INFO(C_GetMechanismInfo)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SLOT_ID            slotID,  /* ID of the token's slot */
-  CK_MECHANISM_TYPE     type,    /* type of mechanism */
-  CK_MECHANISM_INFO_PTR pInfo    /* receives mechanism info */
-);
-#endif
-
-
-/* C_InitToken initializes a token. */
-CK_PKCS11_FUNCTION_INFO(C_InitToken)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SLOT_ID      slotID,    /* ID of the token's slot */
-  CK_UTF8CHAR_PTR pPin,      /* the SO's initial PIN */
-  CK_ULONG        ulPinLen,  /* length in bytes of the PIN */
-  CK_UTF8CHAR_PTR pLabel     /* 32-byte token label (blank padded) */
-);
-#endif
-
-
-/* C_InitPIN initializes the normal user's PIN. */
-CK_PKCS11_FUNCTION_INFO(C_InitPIN)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,  /* the session's handle */
-  CK_UTF8CHAR_PTR   pPin,      /* the normal user's PIN */
-  CK_ULONG          ulPinLen   /* length in bytes of the PIN */
-);
-#endif
-
-
-/* C_SetPIN modifies the PIN of the user who is logged in. */
-CK_PKCS11_FUNCTION_INFO(C_SetPIN)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,  /* the session's handle */
-  CK_UTF8CHAR_PTR   pOldPin,   /* the old PIN */
-  CK_ULONG          ulOldLen,  /* length of the old PIN */
-  CK_UTF8CHAR_PTR   pNewPin,   /* the new PIN */
-  CK_ULONG          ulNewLen   /* length of the new PIN */
-);
-#endif
-
-
-
-/* Session management */
-
-/* C_OpenSession opens a session between an application and a
- * token.
- */
-CK_PKCS11_FUNCTION_INFO(C_OpenSession)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SLOT_ID            slotID,        /* the slot's ID */
-  CK_FLAGS              flags,         /* from CK_SESSION_INFO */
-  CK_VOID_PTR           pApplication,  /* passed to callback */
-  CK_NOTIFY             Notify,        /* callback function */
-  CK_SESSION_HANDLE_PTR phSession      /* gets session handle */
-);
-#endif
-
-
-/* C_CloseSession closes a session between an application and a
- * token.
- */
-CK_PKCS11_FUNCTION_INFO(C_CloseSession)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession  /* the session's handle */
-);
-#endif
-
-
-/* C_CloseAllSessions closes all sessions with a token. */
-CK_PKCS11_FUNCTION_INFO(C_CloseAllSessions)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SLOT_ID     slotID  /* the token's slot */
-);
-#endif
-
-
-/* C_GetSessionInfo obtains information about the session. */
-CK_PKCS11_FUNCTION_INFO(C_GetSessionInfo)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE   hSession,  /* the session's handle */
-  CK_SESSION_INFO_PTR pInfo      /* receives session info */
-);
-#endif
-
-
-/* C_GetOperationState obtains the state of the cryptographic operation
- * in a session.
- */
-CK_PKCS11_FUNCTION_INFO(C_GetOperationState)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,             /* session's handle */
-  CK_BYTE_PTR       pOperationState,      /* gets state */
-  CK_ULONG_PTR      pulOperationStateLen  /* gets state length */
-);
-#endif
-
-
-/* C_SetOperationState restores the state of the cryptographic
- * operation in a session.
- */
-CK_PKCS11_FUNCTION_INFO(C_SetOperationState)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,            /* session's handle */
-  CK_BYTE_PTR      pOperationState,      /* holds state */
-  CK_ULONG         ulOperationStateLen,  /* holds state length */
-  CK_OBJECT_HANDLE hEncryptionKey,       /* en/decryption key */
-  CK_OBJECT_HANDLE hAuthenticationKey    /* sign/verify key */
-);
-#endif
-
-
-/* C_Login logs a user into a token. */
-CK_PKCS11_FUNCTION_INFO(C_Login)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,  /* the session's handle */
-  CK_USER_TYPE      userType,  /* the user type */
-  CK_UTF8CHAR_PTR   pPin,      /* the user's PIN */
-  CK_ULONG          ulPinLen   /* the length of the PIN */
-);
-#endif
-
-
-/* C_Logout logs a user out from a token. */
-CK_PKCS11_FUNCTION_INFO(C_Logout)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession  /* the session's handle */
-);
-#endif
-
-
-
-/* Object management */
-
-/* C_CreateObject creates a new object. */
-CK_PKCS11_FUNCTION_INFO(C_CreateObject)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,    /* the session's handle */
-  CK_ATTRIBUTE_PTR  pTemplate,   /* the object's template */
-  CK_ULONG          ulCount,     /* attributes in template */
-  CK_OBJECT_HANDLE_PTR phObject  /* gets new object's handle. */
-);
-#endif
-
-
-/* C_CopyObject copies an object, creating a new object for the
- * copy.
- */
-CK_PKCS11_FUNCTION_INFO(C_CopyObject)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE    hSession,    /* the session's handle */
-  CK_OBJECT_HANDLE     hObject,     /* the object's handle */
-  CK_ATTRIBUTE_PTR     pTemplate,   /* template for new object */
-  CK_ULONG             ulCount,     /* attributes in template */
-  CK_OBJECT_HANDLE_PTR phNewObject  /* receives handle of copy */
-);
-#endif
-
-
-/* C_DestroyObject destroys an object. */
-CK_PKCS11_FUNCTION_INFO(C_DestroyObject)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,  /* the session's handle */
-  CK_OBJECT_HANDLE  hObject    /* the object's handle */
-);
-#endif
-
-
-/* C_GetObjectSize gets the size of an object in bytes. */
-CK_PKCS11_FUNCTION_INFO(C_GetObjectSize)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,  /* the session's handle */
-  CK_OBJECT_HANDLE  hObject,   /* the object's handle */
-  CK_ULONG_PTR      pulSize    /* receives size of object */
-);
-#endif
-
-
-/* C_GetAttributeValue obtains the value of one or more object
- * attributes.
- */
-CK_PKCS11_FUNCTION_INFO(C_GetAttributeValue)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,   /* the session's handle */
-  CK_OBJECT_HANDLE  hObject,    /* the object's handle */
-  CK_ATTRIBUTE_PTR  pTemplate,  /* specifies attrs; gets vals */
-  CK_ULONG          ulCount     /* attributes in template */
-);
-#endif
-
-
-/* C_SetAttributeValue modifies the value of one or more object
- * attributes.
- */
-CK_PKCS11_FUNCTION_INFO(C_SetAttributeValue)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,   /* the session's handle */
-  CK_OBJECT_HANDLE  hObject,    /* the object's handle */
-  CK_ATTRIBUTE_PTR  pTemplate,  /* specifies attrs and values */
-  CK_ULONG          ulCount     /* attributes in template */
-);
-#endif
-
-
-/* C_FindObjectsInit initializes a search for token and session
- * objects that match a template.
- */
-CK_PKCS11_FUNCTION_INFO(C_FindObjectsInit)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,   /* the session's handle */
-  CK_ATTRIBUTE_PTR  pTemplate,  /* attribute values to match */
-  CK_ULONG          ulCount     /* attrs in search template */
-);
-#endif
-
-
-/* C_FindObjects continues a search for token and session
- * objects that match a template, obtaining additional object
- * handles.
- */
-CK_PKCS11_FUNCTION_INFO(C_FindObjects)
-#ifdef CK_NEED_ARG_LIST
-(
- CK_SESSION_HANDLE    hSession,          /* session's handle */
- CK_OBJECT_HANDLE_PTR phObject,          /* gets obj. handles */
- CK_ULONG             ulMaxObjectCount,  /* max handles to get */
- CK_ULONG_PTR         pulObjectCount     /* actual # returned */
-);
-#endif
-
-
-/* C_FindObjectsFinal finishes a search for token and session
- * objects.
- */
-CK_PKCS11_FUNCTION_INFO(C_FindObjectsFinal)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession  /* the session's handle */
-);
-#endif
-
-
-
-/* Encryption and decryption */
-
-/* C_EncryptInit initializes an encryption operation. */
-CK_PKCS11_FUNCTION_INFO(C_EncryptInit)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,    /* the session's handle */
-  CK_MECHANISM_PTR  pMechanism,  /* the encryption mechanism */
-  CK_OBJECT_HANDLE  hKey         /* handle of encryption key */
-);
-#endif
-
-
-/* C_Encrypt encrypts single-part data. */
-CK_PKCS11_FUNCTION_INFO(C_Encrypt)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,            /* session's handle */
-  CK_BYTE_PTR       pData,               /* the plaintext data */
-  CK_ULONG          ulDataLen,           /* bytes of plaintext */
-  CK_BYTE_PTR       pEncryptedData,      /* gets ciphertext */
-  CK_ULONG_PTR      pulEncryptedDataLen  /* gets c-text size */
-);
-#endif
-
-
-/* C_EncryptUpdate continues a multiple-part encryption
- * operation.
- */
-CK_PKCS11_FUNCTION_INFO(C_EncryptUpdate)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,           /* session's handle */
-  CK_BYTE_PTR       pPart,              /* the plaintext data */
-  CK_ULONG          ulPartLen,          /* plaintext data len */
-  CK_BYTE_PTR       pEncryptedPart,     /* gets ciphertext */
-  CK_ULONG_PTR      pulEncryptedPartLen /* gets c-text size */
-);
-#endif
-
-
-/* C_EncryptFinal finishes a multiple-part encryption
- * operation.
- */
-CK_PKCS11_FUNCTION_INFO(C_EncryptFinal)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,                /* session handle */
-  CK_BYTE_PTR       pLastEncryptedPart,      /* last c-text */
-  CK_ULONG_PTR      pulLastEncryptedPartLen  /* gets last size */
-);
-#endif
-
-
-/* C_DecryptInit initializes a decryption operation. */
-CK_PKCS11_FUNCTION_INFO(C_DecryptInit)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,    /* the session's handle */
-  CK_MECHANISM_PTR  pMechanism,  /* the decryption mechanism */
-  CK_OBJECT_HANDLE  hKey         /* handle of decryption key */
-);
-#endif
-
-
-/* C_Decrypt decrypts encrypted data in a single part. */
-CK_PKCS11_FUNCTION_INFO(C_Decrypt)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,           /* session's handle */
-  CK_BYTE_PTR       pEncryptedData,     /* ciphertext */
-  CK_ULONG          ulEncryptedDataLen, /* ciphertext length */
-  CK_BYTE_PTR       pData,              /* gets plaintext */
-  CK_ULONG_PTR      pulDataLen          /* gets p-text size */
-);
-#endif
-
-
-/* C_DecryptUpdate continues a multiple-part decryption
- * operation.
- */
-CK_PKCS11_FUNCTION_INFO(C_DecryptUpdate)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,            /* session's handle */
-  CK_BYTE_PTR       pEncryptedPart,      /* encrypted data */
-  CK_ULONG          ulEncryptedPartLen,  /* input length */
-  CK_BYTE_PTR       pPart,               /* gets plaintext */
-  CK_ULONG_PTR      pulPartLen           /* p-text size */
-);
-#endif
-
-
-/* C_DecryptFinal finishes a multiple-part decryption
- * operation.
- */
-CK_PKCS11_FUNCTION_INFO(C_DecryptFinal)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,       /* the session's handle */
-  CK_BYTE_PTR       pLastPart,      /* gets plaintext */
-  CK_ULONG_PTR      pulLastPartLen  /* p-text size */
-);
-#endif
-
-
-
-/* Message digesting */
-
-/* C_DigestInit initializes a message-digesting operation. */
-CK_PKCS11_FUNCTION_INFO(C_DigestInit)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,   /* the session's handle */
-  CK_MECHANISM_PTR  pMechanism  /* the digesting mechanism */
-);
-#endif
-
-
-/* C_Digest digests data in a single part. */
-CK_PKCS11_FUNCTION_INFO(C_Digest)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,     /* the session's handle */
-  CK_BYTE_PTR       pData,        /* data to be digested */
-  CK_ULONG          ulDataLen,    /* bytes of data to digest */
-  CK_BYTE_PTR       pDigest,      /* gets the message digest */
-  CK_ULONG_PTR      pulDigestLen  /* gets digest length */
-);
-#endif
-
-
-/* C_DigestUpdate continues a multiple-part message-digesting
- * operation.
- */
-CK_PKCS11_FUNCTION_INFO(C_DigestUpdate)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,  /* the session's handle */
-  CK_BYTE_PTR       pPart,     /* data to be digested */
-  CK_ULONG          ulPartLen  /* bytes of data to be digested */
-);
-#endif
-
-
-/* C_DigestKey continues a multi-part message-digesting
- * operation, by digesting the value of a secret key as part of
- * the data already digested.
- */
-CK_PKCS11_FUNCTION_INFO(C_DigestKey)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,  /* the session's handle */
-  CK_OBJECT_HANDLE  hKey       /* secret key to digest */
-);
-#endif
-
-
-/* C_DigestFinal finishes a multiple-part message-digesting
- * operation.
- */
-CK_PKCS11_FUNCTION_INFO(C_DigestFinal)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,     /* the session's handle */
-  CK_BYTE_PTR       pDigest,      /* gets the message digest */
-  CK_ULONG_PTR      pulDigestLen  /* gets byte count of digest */
-);
-#endif
-
-
-
-/* Signing and MACing */
-
-/* C_SignInit initializes a signature (private key encryption)
- * operation, where the signature is (will be) an appendix to
- * the data, and plaintext cannot be recovered from the
- * signature.
- */
-CK_PKCS11_FUNCTION_INFO(C_SignInit)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,    /* the session's handle */
-  CK_MECHANISM_PTR  pMechanism,  /* the signature mechanism */
-  CK_OBJECT_HANDLE  hKey         /* handle of signature key */
-);
-#endif
-
-
-/* C_Sign signs (encrypts with private key) data in a single
- * part, where the signature is (will be) an appendix to the
- * data, and plaintext cannot be recovered from the signature.
- */
-CK_PKCS11_FUNCTION_INFO(C_Sign)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,        /* the session's handle */
-  CK_BYTE_PTR       pData,           /* the data to sign */
-  CK_ULONG          ulDataLen,       /* count of bytes to sign */
-  CK_BYTE_PTR       pSignature,      /* gets the signature */
-  CK_ULONG_PTR      pulSignatureLen  /* gets signature length */
-);
-#endif
-
-
-/* C_SignUpdate continues a multiple-part signature operation,
- * where the signature is (will be) an appendix to the data,
- * and plaintext cannot be recovered from the signature.
- */
-CK_PKCS11_FUNCTION_INFO(C_SignUpdate)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,  /* the session's handle */
-  CK_BYTE_PTR       pPart,     /* the data to sign */
-  CK_ULONG          ulPartLen  /* count of bytes to sign */
-);
-#endif
-
-
-/* C_SignFinal finishes a multiple-part signature operation,
- * returning the signature.
- */
-CK_PKCS11_FUNCTION_INFO(C_SignFinal)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,        /* the session's handle */
-  CK_BYTE_PTR       pSignature,      /* gets the signature */
-  CK_ULONG_PTR      pulSignatureLen  /* gets signature length */
-);
-#endif
-
-
-/* C_SignRecoverInit initializes a signature operation, where
- * the data can be recovered from the signature.
- */
-CK_PKCS11_FUNCTION_INFO(C_SignRecoverInit)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,   /* the session's handle */
-  CK_MECHANISM_PTR  pMechanism, /* the signature mechanism */
-  CK_OBJECT_HANDLE  hKey        /* handle of the signature key */
-);
-#endif
-
-
-/* C_SignRecover signs data in a single operation, where the
- * data can be recovered from the signature.
- */
-CK_PKCS11_FUNCTION_INFO(C_SignRecover)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,        /* the session's handle */
-  CK_BYTE_PTR       pData,           /* the data to sign */
-  CK_ULONG          ulDataLen,       /* count of bytes to sign */
-  CK_BYTE_PTR       pSignature,      /* gets the signature */
-  CK_ULONG_PTR      pulSignatureLen  /* gets signature length */
-);
-#endif
-
-
-
-/* Verifying signatures and MACs */
-
-/* C_VerifyInit initializes a verification operation, where the
- * signature is an appendix to the data, and plaintext cannot
- * cannot be recovered from the signature (e.g. DSA).
- */
-CK_PKCS11_FUNCTION_INFO(C_VerifyInit)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,    /* the session's handle */
-  CK_MECHANISM_PTR  pMechanism,  /* the verification mechanism */
-  CK_OBJECT_HANDLE  hKey         /* verification key */
-);
-#endif
-
-
-/* C_Verify verifies a signature in a single-part operation,
- * where the signature is an appendix to the data, and plaintext
- * cannot be recovered from the signature.
- */
-CK_PKCS11_FUNCTION_INFO(C_Verify)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,       /* the session's handle */
-  CK_BYTE_PTR       pData,          /* signed data */
-  CK_ULONG          ulDataLen,      /* length of signed data */
-  CK_BYTE_PTR       pSignature,     /* signature */
-  CK_ULONG          ulSignatureLen  /* signature length*/
-);
-#endif
-
-
-/* C_VerifyUpdate continues a multiple-part verification
- * operation, where the signature is an appendix to the data,
- * and plaintext cannot be recovered from the signature.
- */
-CK_PKCS11_FUNCTION_INFO(C_VerifyUpdate)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,  /* the session's handle */
-  CK_BYTE_PTR       pPart,     /* signed data */
-  CK_ULONG          ulPartLen  /* length of signed data */
-);
-#endif
-
-
-/* C_VerifyFinal finishes a multiple-part verification
- * operation, checking the signature.
- */
-CK_PKCS11_FUNCTION_INFO(C_VerifyFinal)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,       /* the session's handle */
-  CK_BYTE_PTR       pSignature,     /* signature to verify */
-  CK_ULONG          ulSignatureLen  /* signature length */
-);
-#endif
-
-
-/* C_VerifyRecoverInit initializes a signature verification
- * operation, where the data is recovered from the signature.
- */
-CK_PKCS11_FUNCTION_INFO(C_VerifyRecoverInit)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,    /* the session's handle */
-  CK_MECHANISM_PTR  pMechanism,  /* the verification mechanism */
-  CK_OBJECT_HANDLE  hKey         /* verification key */
-);
-#endif
-
-
-/* C_VerifyRecover verifies a signature in a single-part
- * operation, where the data is recovered from the signature.
- */
-CK_PKCS11_FUNCTION_INFO(C_VerifyRecover)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,        /* the session's handle */
-  CK_BYTE_PTR       pSignature,      /* signature to verify */
-  CK_ULONG          ulSignatureLen,  /* signature length */
-  CK_BYTE_PTR       pData,           /* gets signed data */
-  CK_ULONG_PTR      pulDataLen       /* gets signed data len */
-);
-#endif
-
-
-
-/* Dual-function cryptographic operations */
-
-/* C_DigestEncryptUpdate continues a multiple-part digesting
- * and encryption operation.
- */
-CK_PKCS11_FUNCTION_INFO(C_DigestEncryptUpdate)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,            /* session's handle */
-  CK_BYTE_PTR       pPart,               /* the plaintext data */
-  CK_ULONG          ulPartLen,           /* plaintext length */
-  CK_BYTE_PTR       pEncryptedPart,      /* gets ciphertext */
-  CK_ULONG_PTR      pulEncryptedPartLen  /* gets c-text length */
-);
-#endif
-
-
-/* C_DecryptDigestUpdate continues a multiple-part decryption and
- * digesting operation.
- */
-CK_PKCS11_FUNCTION_INFO(C_DecryptDigestUpdate)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,            /* session's handle */
-  CK_BYTE_PTR       pEncryptedPart,      /* ciphertext */
-  CK_ULONG          ulEncryptedPartLen,  /* ciphertext length */
-  CK_BYTE_PTR       pPart,               /* gets plaintext */
-  CK_ULONG_PTR      pulPartLen           /* gets plaintext len */
-);
-#endif
-
-
-/* C_SignEncryptUpdate continues a multiple-part signing and
- * encryption operation.
- */
-CK_PKCS11_FUNCTION_INFO(C_SignEncryptUpdate)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,            /* session's handle */
-  CK_BYTE_PTR       pPart,               /* the plaintext data */
-  CK_ULONG          ulPartLen,           /* plaintext length */
-  CK_BYTE_PTR       pEncryptedPart,      /* gets ciphertext */
-  CK_ULONG_PTR      pulEncryptedPartLen  /* gets c-text length */
-);
-#endif
-
-
-/* C_DecryptVerifyUpdate continues a multiple-part decryption and
- * verify operation.
- */
-CK_PKCS11_FUNCTION_INFO(C_DecryptVerifyUpdate)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,            /* session's handle */
-  CK_BYTE_PTR       pEncryptedPart,      /* ciphertext */
-  CK_ULONG          ulEncryptedPartLen,  /* ciphertext length */
-  CK_BYTE_PTR       pPart,               /* gets plaintext */
-  CK_ULONG_PTR      pulPartLen           /* gets p-text length */
-);
-#endif
-
-
-
-/* Key management */
-
-/* C_GenerateKey generates a secret key, creating a new key
- * object.
- */
-CK_PKCS11_FUNCTION_INFO(C_GenerateKey)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE    hSession,    /* the session's handle */
-  CK_MECHANISM_PTR     pMechanism,  /* key generation mech. */
-  CK_ATTRIBUTE_PTR     pTemplate,   /* template for new key */
-  CK_ULONG             ulCount,     /* # of attrs in template */
-  CK_OBJECT_HANDLE_PTR phKey        /* gets handle of new key */
-);
-#endif
-
-
-/* C_GenerateKeyPair generates a public-key/private-key pair,
- * creating new key objects.
- */
-CK_PKCS11_FUNCTION_INFO(C_GenerateKeyPair)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE    hSession,                    /* session handle */
-  CK_MECHANISM_PTR     pMechanism,                  /* key-gen mech. */
-  CK_ATTRIBUTE_PTR     pPublicKeyTemplate,          /* template for pub. key */
-  CK_ULONG             ulPublicKeyAttributeCount,   /* # pub. attrs. */
-  CK_ATTRIBUTE_PTR     pPrivateKeyTemplate,         /* template for priv. key */
-  CK_ULONG             ulPrivateKeyAttributeCount,  /* # priv.  attrs. */
-  CK_OBJECT_HANDLE_PTR phPublicKey,                 /* gets pub. key handle */
-  CK_OBJECT_HANDLE_PTR phPrivateKey                 /* gets priv. key handle */
-);
-#endif
-
-
-/* C_WrapKey wraps (i.e., encrypts) a key. */
-CK_PKCS11_FUNCTION_INFO(C_WrapKey)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,        /* the session's handle */
-  CK_MECHANISM_PTR  pMechanism,      /* the wrapping mechanism */
-  CK_OBJECT_HANDLE  hWrappingKey,    /* wrapping key */
-  CK_OBJECT_HANDLE  hKey,            /* key to be wrapped */
-  CK_BYTE_PTR       pWrappedKey,     /* gets wrapped key */
-  CK_ULONG_PTR      pulWrappedKeyLen /* gets wrapped key size */
-);
-#endif
-
-
-/* C_UnwrapKey unwraps (decrypts) a wrapped key, creating a new
- * key object.
- */
-CK_PKCS11_FUNCTION_INFO(C_UnwrapKey)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE    hSession,          /* session's handle */
-  CK_MECHANISM_PTR     pMechanism,        /* unwrapping mech. */
-  CK_OBJECT_HANDLE     hUnwrappingKey,    /* unwrapping key */
-  CK_BYTE_PTR          pWrappedKey,       /* the wrapped key */
-  CK_ULONG             ulWrappedKeyLen,   /* wrapped key len */
-  CK_ATTRIBUTE_PTR     pTemplate,         /* new key template */
-  CK_ULONG             ulAttributeCount,  /* template length */
-  CK_OBJECT_HANDLE_PTR phKey              /* gets new handle */
-);
-#endif
-
-
-/* C_DeriveKey derives a key from a base key, creating a new key
- * object.
- */
-CK_PKCS11_FUNCTION_INFO(C_DeriveKey)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE    hSession,          /* session's handle */
-  CK_MECHANISM_PTR     pMechanism,        /* key deriv. mech. */
-  CK_OBJECT_HANDLE     hBaseKey,          /* base key */
-  CK_ATTRIBUTE_PTR     pTemplate,         /* new key template */
-  CK_ULONG             ulAttributeCount,  /* template length */
-  CK_OBJECT_HANDLE_PTR phKey              /* gets new handle */
-);
-#endif
-
-
-
-/* Random number generation */
-
-/* C_SeedRandom mixes additional seed material into the token's
- * random number generator.
- */
-CK_PKCS11_FUNCTION_INFO(C_SeedRandom)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,  /* the session's handle */
-  CK_BYTE_PTR       pSeed,     /* the seed material */
-  CK_ULONG          ulSeedLen  /* length of seed material */
-);
-#endif
-
-
-/* C_GenerateRandom generates random data. */
-CK_PKCS11_FUNCTION_INFO(C_GenerateRandom)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,    /* the session's handle */
-  CK_BYTE_PTR       RandomData,  /* receives the random data */
-  CK_ULONG          ulRandomLen  /* # of bytes to generate */
-);
-#endif
-
-
-
-/* Parallel function management */
-
-/* C_GetFunctionStatus is a legacy function; it obtains an
- * updated status of a function running in parallel with an
- * application.
- */
-CK_PKCS11_FUNCTION_INFO(C_GetFunctionStatus)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession  /* the session's handle */
-);
-#endif
-
-
-/* C_CancelFunction is a legacy function; it cancels a function
- * running in parallel.
- */
-CK_PKCS11_FUNCTION_INFO(C_CancelFunction)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession  /* the session's handle */
-);
-#endif
-
-
-/* C_WaitForSlotEvent waits for a slot event (token insertion,
- * removal, etc.) to occur.
- */
-CK_PKCS11_FUNCTION_INFO(C_WaitForSlotEvent)
-#ifdef CK_NEED_ARG_LIST
-(
-  CK_FLAGS flags,        /* blocking/nonblocking flag */
-  CK_SLOT_ID_PTR pSlot,  /* location that receives the slot ID */
-  CK_VOID_PTR pRserved   /* reserved.  Should be NULL_PTR */
-);
-#endif
-

client/3rd/QtSsh/src/ssh/opensshkeyfilereader.cpp

@@ -1,200 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#include "opensshkeyfilereader_p.h"
-
-#include "sshcapabilities_p.h"
-#include "ssherrors.h"
-#include "sshexception_p.h"
-#include "sshlogging_p.h"
-#include "sshpacketparser_p.h"
-#include "ssh_global.h"
-
-#include <botan_all.h>
-
-#include <memory>
-
-namespace QSsh {
-namespace Internal {
-
-using namespace Botan;
-
-bool OpenSshKeyFileReader::parseKey(const QByteArray &privKeyFileContents)
-{
-    static const QByteArray magicPrefix = "-----BEGIN OPENSSH PRIVATE KEY-----\n";
-    static const QByteArray magicSuffix = "-----END OPENSSH PRIVATE KEY-----\n";
-    if (!privKeyFileContents.startsWith(magicPrefix)) {
-        qCDebug(sshLog) << "not an OpenSSH key file: prefix does not match";
-        return false;
-    }
-    if (!privKeyFileContents.endsWith(magicSuffix))
-        throwException(SSH_TR("Unexpected end-of-file marker."));
-    const QByteArray payload = QByteArray::fromBase64
-            (privKeyFileContents.mid(magicPrefix.size(), privKeyFileContents.size()
-                                     - magicPrefix.size() - magicSuffix.size()));
-    doParse(payload);
-    return true;
-}
-
-std::unique_ptr<Private_Key> OpenSshKeyFileReader::privateKey() const
-{
-    if (m_keyType == SshCapabilities::PubKeyRsa) {
-        QSSH_ASSERT_AND_RETURN_VALUE(m_parameters.size() == 5, nullptr);
-        const BigInt &e = m_parameters.at(0);
-        const BigInt &n = m_parameters.at(1);
-        const BigInt &p = m_parameters.at(2);
-        const BigInt &q = m_parameters.at(3);
-        const BigInt &d = m_parameters.at(4);
-        return std::make_unique<RSA_PrivateKey>(p, q, e, d, n);
-    } else if (m_keyType == SshCapabilities::PubKeyDss) {
-        QSSH_ASSERT_AND_RETURN_VALUE(m_parameters.size() == 5, nullptr);
-        const BigInt &p = m_parameters.at(0);
-        const BigInt &q = m_parameters.at(1);
-        const BigInt &g = m_parameters.at(2);
-        const BigInt &x = m_parameters.at(4);
-        return std::make_unique<DSA_PrivateKey>(m_rng, DL_Group(p, q, g), x);
-    } else if (m_keyType.startsWith(SshCapabilities::PubKeyEcdsaPrefix)) {
-        QSSH_ASSERT_AND_RETURN_VALUE(m_parameters.size() == 1, nullptr);
-        const BigInt &value = m_parameters.first();
-        const EC_Group group(SshCapabilities::oid(m_keyType));
-        return std::make_unique<ECDSA_PrivateKey>(m_rng, group, value);
-    }
-    QSSH_ASSERT_AND_RETURN_VALUE(false, nullptr);
-}
-
-QList<BigInt> OpenSshKeyFileReader::publicParameters() const
-{
-    if (m_keyType == SshCapabilities::PubKeyRsa)
-        return m_parameters.mid(0, 2);
-    if (m_keyType == SshCapabilities::PubKeyDss)
-        return m_parameters.mid(0, 4);
-    if (m_keyType.startsWith(SshCapabilities::PubKeyEcdsaPrefix))
-        return QList<BigInt>();
-    QSSH_ASSERT_AND_RETURN_VALUE(false, QList<BigInt>());
-}
-
-void OpenSshKeyFileReader::doParse(const QByteArray &payload)
-{
-    // See PROTOCOL.key in OpenSSH sources.
-    static const QByteArray magicString = "openssh-key-v1";
-    if (!payload.startsWith(magicString))
-        throwException(SSH_TR("Unexpected magic string."));
-    try {
-        quint32 offset = magicString.size() + 1; // null byte
-        m_cipherName = SshPacketParser::asString(payload, &offset);
-        qCDebug(sshLog) << "cipher:" << m_cipherName;
-        m_kdf = SshPacketParser::asString(payload, &offset);
-        qCDebug(sshLog) << "kdf:" << m_kdf;
-        parseKdfOptions(SshPacketParser::asString(payload, &offset));
-        const quint32 keyCount = SshPacketParser::asUint32(payload, &offset);
-        if (keyCount != 1) {
-            qCWarning(sshLog) << "more than one key found in OpenSSH private key file, ignoring "
-                                 "all but the first one";
-        }
-        for (quint32 i = 0; i < keyCount; ++i) // Skip the public key blob(s).
-            SshPacketParser::asString(payload, &offset);
-        m_privateKeyList = SshPacketParser::asString(payload, &offset);
-        decryptPrivateKeyList();
-        parsePrivateKeyList();
-    } catch (const SshPacketParseException &) {
-        throwException(SSH_TR("Parse error."));
-    } catch (const Exception &e) {
-        throwException(QLatin1String(e.what()));
-    }
-}
-
-void OpenSshKeyFileReader::parseKdfOptions(const QByteArray &kdfOptions)
-{
-    if (m_cipherName == "none")
-        return;
-    quint32 offset = 0;
-    m_salt = SshPacketParser::asString(kdfOptions, &offset);
-    if (m_salt.size() != 16)
-        throwException(SSH_TR("Invalid salt size %1.").arg(m_salt.size()));
-    m_rounds = SshPacketParser::asUint32(kdfOptions, &offset);
-    qCDebug(sshLog) << "salt:" << m_salt.toHex();
-    qCDebug(sshLog) << "rounds:" << m_rounds;
-}
-
-void OpenSshKeyFileReader::decryptPrivateKeyList()
-{
-    if (m_cipherName == "none")
-        return;
-    if (m_kdf != "bcrypt") {
-        throwException(SSH_TR("Unexpected key derivation function '%1'.")
-                       .arg(QLatin1String(m_kdf)));
-    }
-
-    // OpenSSH uses a proprietary algorithm for the key derivation. We'd basically have to
-    // copy the code.
-    // TODO: If the lower-level operations (hashing primitives, blowfish stuff) can be taken
-    //       over by Botan, that might be feasible. Investigate.
-    throwException(SSH_TR("Encrypted keys are currently not supported in this format."));
-}
-
-void OpenSshKeyFileReader::parsePrivateKeyList()
-{
-    quint32 offset = 0;
-    const quint32 checkInt1 = SshPacketParser::asUint32(m_privateKeyList, &offset);
-    const quint32 checkInt2 = SshPacketParser::asUint32(m_privateKeyList, &offset);
-    if (checkInt1 != checkInt2)
-        throwException(SSH_TR("Verification failed."));
-    m_keyType = SshPacketParser::asString(m_privateKeyList, &offset);
-    qCDebug(sshLog) << "key type:" << m_keyType;
-    if (m_keyType == SshCapabilities::PubKeyRsa) {
-        const BigInt n = SshPacketParser::asBigInt(m_privateKeyList, &offset);
-        const BigInt e = SshPacketParser::asBigInt(m_privateKeyList, &offset);
-        const BigInt d = SshPacketParser::asBigInt(m_privateKeyList, &offset);
-        SshPacketParser::asBigInt(m_privateKeyList, &offset); // iqmp
-        const BigInt p = SshPacketParser::asBigInt(m_privateKeyList, &offset);
-        const BigInt q = SshPacketParser::asBigInt(m_privateKeyList, &offset);
-        m_parameters = QList<BigInt>{e, n, p, q, d};
-    } else if (m_keyType == SshCapabilities::PubKeyDss) {
-        const BigInt p = SshPacketParser::asBigInt(m_privateKeyList, &offset);
-        const BigInt q = SshPacketParser::asBigInt(m_privateKeyList, &offset);
-        const BigInt g = SshPacketParser::asBigInt(m_privateKeyList, &offset);
-        const BigInt y = SshPacketParser::asBigInt(m_privateKeyList, &offset);
-        const BigInt x = SshPacketParser::asBigInt(m_privateKeyList, &offset);
-        m_parameters = QList<BigInt>{p, q, g, y, x};
-    } else if (m_keyType.startsWith(SshCapabilities::PubKeyEcdsaPrefix)) {
-        SshPacketParser::asString(m_privateKeyList, &offset); // name
-        SshPacketParser::asString(m_privateKeyList, &offset); // pubkey representation
-        m_parameters = {SshPacketParser::asBigInt(m_privateKeyList, &offset)};
-    } else {
-        throwException(SSH_TR("Private key type '%1' is not supported.")
-                       .arg(QString::fromLatin1(m_keyType)));
-    }
-    const QByteArray comment = SshPacketParser::asString(m_privateKeyList, &offset);
-    qCDebug(sshLog) << "comment:" << comment;
-}
-
-void OpenSshKeyFileReader::throwException(const QString &reason)
-{
-    throw SshClientException(SshKeyFileError,
-                             SSH_TR("Processing OpenSSH private key file failed: %1").arg(reason));
-}
-
-} // namespace Internal
-} // namespace QSsh

client/3rd/QtSsh/src/ssh/opensshkeyfilereader_p.h

@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2018 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#pragma once
-
-#include <QByteArray>
-#include <QList>
-
-#include <botan_all.h>
-
-#include <memory>
-
-namespace Botan {
-class Private_Key;
-class RandomNumberGenerator;
-}
-
-namespace QSsh {
-namespace Internal {
-
-class OpenSshKeyFileReader
-{
-public:
-    OpenSshKeyFileReader(Botan::RandomNumberGenerator &rng) : m_rng(rng) {}
-
-    bool parseKey(const QByteArray &privKeyFileContents);
-    QByteArray keyType() const { return m_keyType; }
-    std::unique_ptr<Botan::Private_Key> privateKey() const;
-    QList<Botan::BigInt> allParameters() const { return m_parameters; }
-    QList<Botan::BigInt> publicParameters() const;
-
-private:
-    void doParse(const QByteArray &payload);
-    void parseKdfOptions(const QByteArray &kdfOptions);
-    void decryptPrivateKeyList();
-    void parsePrivateKeyList();
-    [[noreturn]] void throwException(const QString &reason);
-
-    Botan::RandomNumberGenerator &m_rng;
-    QByteArray m_keyType;
-    QList<Botan::BigInt> m_parameters;
-    QByteArray m_cipherName;
-    QByteArray m_kdf;
-    QByteArray m_salt;
-    quint32 m_rounds;
-    QByteArray m_privateKeyList;
-};
-
-} // namespace Internal
-} // namespace QSsh
-

client/3rd/QtSsh/src/ssh/qssh.pri

@@ -1,97 +0,0 @@
-QT += gui network widgets
-
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-
-#!win32-msvc* {
-#    QMAKE_CXXFLAGS += -Wextra -pedantic
-#}
-
-#contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-
-SOURCES = $$PWD/sshsendfacility.cpp \
-    $$PWD/sshremoteprocess.cpp \
-    $$PWD/sshpacketparser.cpp \
-    $$PWD/sshpacket.cpp \
-    $$PWD/sshoutgoingpacket.cpp \
-    $$PWD/sshkeygenerator.cpp \
-    $$PWD/sshkeyexchange.cpp \
-    $$PWD/sshincomingpacket.cpp \
-    $$PWD/sshcryptofacility.cpp \
-    $$PWD/sshconnection.cpp \
-    $$PWD/sshchannelmanager.cpp \
-    $$PWD/sshchannel.cpp \
-    $$PWD/sshcapabilities.cpp \
-    $$PWD/sftppacket.cpp \
-    $$PWD/sftpoutgoingpacket.cpp \
-    $$PWD/sftpoperation.cpp \
-    $$PWD/sftpincomingpacket.cpp \
-    $$PWD/sftpdefs.cpp \
-    $$PWD/sftpchannel.cpp \
-    $$PWD/sshremoteprocessrunner.cpp \
-    $$PWD/sshconnectionmanager.cpp \
-    $$PWD/sshkeypasswordretriever.cpp \
-    $$PWD/sftpfilesystemmodel.cpp \
-    $$PWD/sshdirecttcpiptunnel.cpp \
-    $$PWD/sshhostkeydatabase.cpp \
-    $$PWD/sshlogging.cpp \
-    $$PWD/sshtcpipforwardserver.cpp \
-    $$PWD/sshtcpiptunnel.cpp \
-    $$PWD/sshforwardedtcpiptunnel.cpp \
-    $$PWD/sshagent.cpp \
-    $$PWD/sshx11channel.cpp \
-    $$PWD/sshx11inforetriever.cpp \
-    $$PWD/opensshkeyfilereader.cpp \
-
-PUBLIC_HEADERS = \
-    $$PWD/sftpdefs.h \
-    $$PWD/ssherrors.h \
-    $$PWD/sshremoteprocess.h \
-    $$PWD/sftpchannel.h \
-    $$PWD/sshkeygenerator.h \
-    $$PWD/sshremoteprocessrunner.h \
-    $$PWD/sshconnectionmanager.h \
-    $$PWD/sshpseudoterminal.h \
-    $$PWD/sftpfilesystemmodel.h \
-    $$PWD/sshdirecttcpiptunnel.h \
-    $$PWD/sshtcpipforwardserver.h \
-    $$PWD/sshhostkeydatabase.h \
-    $$PWD/sshforwardedtcpiptunnel.h \
-    $$PWD/ssh_global.h \
-    $$PWD/sshconnection.h \
-
-HEADERS = $$PUBLIC_HEADERS \
-    $$PWD/sshsendfacility_p.h \
-    $$PWD/sshremoteprocess_p.h \
-    $$PWD/sshpacketparser_p.h \
-    $$PWD/sshpacket_p.h \
-    $$PWD/sshoutgoingpacket_p.h \
-    $$PWD/sshkeyexchange_p.h \
-    $$PWD/sshincomingpacket_p.h \
-    $$PWD/sshexception_p.h \
-    $$PWD/sshcryptofacility_p.h \
-    $$PWD/sshconnection_p.h \
-    $$PWD/sshchannelmanager_p.h \
-    $$PWD/sshchannel_p.h \
-    $$PWD/sshcapabilities_p.h \
-    $$PWD/sshbotanconversions_p.h \
-    $$PWD/sftppacket_p.h \
-    $$PWD/sftpoutgoingpacket_p.h \
-    $$PWD/sftpoperation_p.h \
-    $$PWD/sftpincomingpacket_p.h \
-    $$PWD/sftpchannel_p.h \
-    $$PWD/sshkeypasswordretriever_p.h \
-    $$PWD/sshdirecttcpiptunnel_p.h \
-    $$PWD/sshlogging_p.h \
-    $$PWD/sshtcpipforwardserver_p.h \
-    $$PWD/sshtcpiptunnel_p.h \
-    $$PWD/sshforwardedtcpiptunnel_p.h \
-    $$PWD/sshagent_p.h \
-    $$PWD/sshx11channel_p.h \
-    $$PWD/sshx11displayinfo_p.h \
-    $$PWD/sshx11inforetriever_p.h \
-    $$PWD/opensshkeyfilereader_p.h \
-
-RESOURCES += $$PWD/qssh.qrc
-
-

client/3rd/QtSsh/src/ssh/qssh.qrc

@@ -1,7 +0,0 @@
-<RCC>
-    <qresource prefix="/ssh">
-        <file>images/dir.png</file>
-        <file>images/help.png</file>
-        <file>images/unknownfile.png</file>
-    </qresource>
-</RCC>

client/3rd/QtSsh/src/ssh/sftpchannel.h

@@ -1,263 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#ifndef SFTCHANNEL_H
-#define SFTCHANNEL_H
-
-#include "sftpdefs.h"
-
-#include "ssh_global.h"
-
-#include <QByteArray>
-#include <QObject>
-#include <QSharedPointer>
-#include <QString>
-
-namespace QSsh {
-
-namespace Internal {
-class SftpChannelPrivate;
-class SshChannelManager;
-class SshSendFacility;
-} // namespace Internal
-
-
-/*!
-    \class QSsh::SftpChannel
-
-    \brief This class provides SFTP operations.
-
-    Objects are created via SshConnection::createSftpChannel().
-    The channel needs to be initialized with
-    a call to initialize() and is closed via closeChannel(). After closing
-    a channel, no more operations are possible. It cannot be re-opened
-    using initialize(); use SshConnection::createSftpChannel() if you need
-    a new one.
-
-    After the initialized() signal has been emitted, operations can be started.
-    All SFTP operations are asynchronous (non-blocking) and can be in-flight
-    simultaneously (though callers must ensure that concurrently running jobs
-    are independent of each other, e.g. they must not write to the same file).
-    Operations are identified by their job id, which is returned by
-    the respective member function. If the function can right away detect that
-    the operation cannot succeed, it returns SftpInvalidJob. If an error occurs
-    later, the finished() signal is emitted for the respective job with a
-    non-empty error string.
-
-    Note that directory names must not have a trailing slash.
-*/
-
-class QSSH_EXPORT SftpChannel : public QObject
-{
-    Q_OBJECT
-
-    friend class Internal::SftpChannelPrivate;
-    friend class Internal::SshChannelManager;
-public:
-    /// Convenience typedef
-    typedef QSharedPointer<SftpChannel> Ptr;
-
-    /// \see state
-    enum State { Uninitialized, Initializing, Initialized, Closing, Closed };
-
-    /// Current state of this channel
-    State state() const;
-
-    /*!
-     * @brief Makes this channel ready to use.
-     */
-    void initialize();
-
-    /*!
-     * @brief Call this when you are done with the channel.
-     */
-    void closeChannel();
-
-    /*!
-     * \brief Get information about a remote path, file or directory
-     * \param path Remote path to state
-     * \return A unique ID identifying this job
-     */
-    SftpJobId statFile(const QString &path);
-
-    /*!
-     * \brief Get list of contents of a directory
-     * \param dirPath Remote path of directory
-     * \return A unique ID identifying this job
-     */
-    SftpJobId listDirectory(const QString &dirPath);
-
-    /*!
-     * \brief Create remote directory
-     * \param dirPath Remote path of directory
-     * \return A unique ID identifying this job
-     */
-    SftpJobId createDirectory(const QString &dirPath);
-
-    /*!
-     * \brief Remove remote directory
-     * \param dirPath Remote path of directory
-     * \return A unique ID identifying this job
-     */
-    SftpJobId removeDirectory(const QString &dirPath);
-
-    /*!
-     * \brief Remove remote file
-     * \param filePath Remote path of file
-     * \return A unique ID identifying this job
-     */
-    SftpJobId removeFile(const QString &filePath);
-
-    /*!
-     * \brief Rename or move a remote file or directory
-     * \param oldPath Path of existing file or directory
-     * \param newPath New path the file or directory should be available as
-     * \return A unique ID identifying this job
-     */
-    SftpJobId renameFileOrDirectory(const QString &oldPath,
-        const QString &newPath);
-
-    /*!
-     * \brief Create a new empty file.
-     * \param filePath Remote path of the file.
-     * \param mode The behavior if the file already exists.
-     * \return A unique ID identifying this job
-     */
-    SftpJobId createFile(const QString &filePath, SftpOverwriteMode mode);
-
-    /*!
-     * \brief Creates a symbolic link pointing to another file.
-     * \param filePath The path of the symbolic
-     * \param target The path the symbolic link should point to
-     * \return A unique ID identifying this job
-     */
-    SftpJobId createLink(const QString &filePath, const QString &target);
-
-    /*!
-     * \brief Creates a remote file and fills it with data from \a device
-     * \param device If this is not open already it will be opened in \a QIODevice::ReadOnly mode
-     * \param remoteFilePath The path on the server to upload the file to
-     * \param mode #QSsh::SftpOverwriteMode defines the behavior if the file already exists
-     * \return A unique ID identifying this job
-     */
-    SftpJobId uploadFile(QSharedPointer<QIODevice> device,
-        const QString &remoteFilePath, SftpOverwriteMode mode);
-
-    /*!
-     * \brief Uploads a local file to the remote host.
-     * \param localFilePath The local path to an existing file
-     * \param remoteFilePath The remote path the file should be uploaded to
-     * \param mode What it will do if the file already exists
-     * \return A unique ID identifying this job
-     */
-    SftpJobId uploadFile(const QString &localFilePath,
-        const QString &remoteFilePath, SftpOverwriteMode mode);
-
-    /*!
-     * \brief Downloads a remote file to a local path
-     * \param remoteFilePath The remote path to the file to be downloaded
-     * \param localFilePath The local path for where to download the file
-     * \param mode Controls what happens if the local file already exists
-     * \return A unique ID identifying this job
-     */
-    SftpJobId downloadFile(const QString &remoteFilePath,
-        const QString &localFilePath, SftpOverwriteMode mode);
-
-    /*!
-     * \brief Retrieves the contents of a remote file and writes it to \a device
-     * \param remoteFilePath The remote path of the file to retrieve the contents of
-     * \param device The QIODevice to write the data to, this needs to be open in a writable mode
-     * \return A unique ID identifying this job
-     */
-    SftpJobId downloadFile(const QString &remoteFilePath,
-        QSharedPointer<QIODevice> device);
-
-    /*!
-     * \brief Uploads a local directory (recursively) with files to the remote host
-     * \param localDirPath The path to an existing local directory
-     * \param remoteParentDirPath The remote path to upload it to, the name of the local directory will be appended to this
-     * \return A unique ID identifying this job
-     */
-    SftpJobId uploadDir(const QString &localDirPath,
-        const QString &remoteParentDirPath);
-
-    /*!
-     * \brief Downloads a remote directory (recursively) to a local path
-     * \param remoteDirPath The remote path of an existing directory to download
-     * \param localDirPath The local path to download the directory to
-     * \param mode
-     * \return
-     */
-    SftpJobId downloadDir(const QString &remoteDirPath,
-        const QString &localDirPath, SftpOverwriteMode mode);
-
-    ~SftpChannel();
-
-signals:
-    /// Emitted when you can start using the channel
-    void initialized();
-
-    /// Emitted when an error happened
-    void channelError(const QString &reason);
-
-    /// Emitted when the channel has closed for some reason, either an error occured or it was asked for.
-    void closed();
-
-    /// error.isEmpty means it finished successfully
-    void finished(QSsh::SftpJobId job, const SftpError errorType = SftpError::NoError, const QString &error = QString());
-
-    /*!
-     * Continously emitted during data transfer.
-     * Does not emit for each file copied by uploadDir().
-     */
-    void dataAvailable(QSsh::SftpJobId job, const QString &data);
-
-    /*!
-     * This signal is emitted as a result of:
-     *     - statFile() (with the list having exactly one element)
-     *     - listDirectory() (potentially more than once)
-     * It will continously be emitted as data is discovered, not only when the job is done.
-     */
-    void fileInfoAvailable(QSsh::SftpJobId job, const QList<QSsh::SftpFileInfo> &fileInfoList);
-
-    /*!
-     * Emitted during upload or download
-     */
-    void transferProgress(QSsh::SftpJobId job, quint64 progress, quint64 total);
-
-private:
-    SftpChannel(quint32 channelId, Internal::SshSendFacility &sendFacility);
-
-    Internal::SftpChannelPrivate *d;
-};
-
-} // namespace QSsh
-
-#endif // SFTPCHANNEL_H

client/3rd/QtSsh/src/ssh/sftpchannel_p.h

@@ -1,135 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#ifndef SFTCHANNEL_P_H
-#define SFTCHANNEL_P_H
-
-#include "sftpdefs.h"
-#include "sftpincomingpacket_p.h"
-#include "sftpoperation_p.h"
-#include "sftpoutgoingpacket_p.h"
-#include "sshchannel_p.h"
-
-#include <QByteArray>
-#include <QMap>
-
-namespace QSsh {
-class SftpChannel;
-namespace Internal {
-
-class SftpChannelPrivate : public AbstractSshChannel
-{
-    Q_OBJECT
-    friend class QSsh::SftpChannel;
-public:
-    enum SftpState { Inactive, SubsystemRequested, InitSent, Initialized };
-
-signals:
-    void initialized();
-    void channelError(const QString &reason);
-    void closed();
-    void finished(QSsh::SftpJobId job, const SftpError errorType = SftpError::NoError, const QString &error = QString());
-    void dataAvailable(QSsh::SftpJobId job, const QString &data);
-    void fileInfoAvailable(QSsh::SftpJobId job, const QList<QSsh::SftpFileInfo> &fileInfoList);
-    void transferProgress(QSsh::SftpJobId job, quint64 progress, quint64 total);
-
-private:
-    typedef QMap<SftpJobId, AbstractSftpOperation::Ptr> JobMap;
-
-    SftpChannelPrivate(quint32 channelId, SshSendFacility &sendFacility,
-        SftpChannel *sftp);
-    SftpJobId createJob(const AbstractSftpOperation::Ptr &job);
-
-    virtual void handleChannelSuccess();
-    virtual void handleChannelFailure();
-
-    virtual void handleOpenSuccessInternal();
-    virtual void handleOpenFailureInternal(const QString &reason);
-    virtual void handleChannelDataInternal(const QByteArray &data);
-    virtual void handleChannelExtendedDataInternal(quint32 type,
-        const QByteArray &data);
-    virtual void handleExitStatus(const SshChannelExitStatus &exitStatus);
-    virtual void handleExitSignal(const SshChannelExitSignal &signal);
-
-    virtual void closeHook();
-
-    void handleCurrentPacket();
-    void handleServerVersion();
-    void handleHandle();
-    void handleStatus();
-    void handleName();
-    void handleReadData();
-    void handleAttrs();
-
-    void handleDownloadDir(SftpListDir::Ptr op, const QList<SftpFileInfo> & fileInfoList);
-
-    void handleStatusGeneric(JobMap::Iterator it,
-        const SftpStatusResponse &response);
-    void handleMkdirStatus(JobMap::Iterator it,
-        const SftpStatusResponse &response);
-    void handleLsStatus(JobMap::Iterator it,
-        const SftpStatusResponse &response);
-    void handleGetStatus(JobMap::Iterator it,
-        const SftpStatusResponse &response);
-    void handlePutStatus(JobMap::Iterator it,
-        const SftpStatusResponse &response);
-
-    void handleLsHandle(JobMap::Iterator it);
-    void handleCreateFileHandle(JobMap::Iterator it);
-    void handleGetHandle(JobMap::Iterator it);
-    void handlePutHandle(JobMap::Iterator it);
-
-    void spawnReadRequests(const SftpDownload::Ptr &job);
-    void spawnWriteRequests(JobMap::Iterator it);
-    void sendReadRequest(const SftpDownload::Ptr &job, quint32 requestId);
-    void sendWriteRequest(JobMap::Iterator it);
-    void finishTransferRequest(JobMap::Iterator it);
-    void removeTransferRequest(JobMap::Iterator it);
-    void reportRequestError(const AbstractSftpOperationWithHandle::Ptr &job, const SftpError errorType,
-        const QString &error);
-    void sendTransferCloseHandle(const AbstractSftpTransfer::Ptr &job,
-        quint32 requestId);
-
-    void attributesToFileInfo(const SftpFileAttributes &attributes, SftpFileInfo &fileInfo) const;
-
-    JobMap::Iterator lookupJob(SftpJobId id);
-    JobMap m_jobs;
-    SftpOutgoingPacket m_outgoingPacket;
-    SftpIncomingPacket m_incomingPacket;
-    QByteArray m_incomingData;
-    SftpJobId m_nextJobId;
-    SftpState m_sftpState;
-    SftpChannel *m_sftp;
-};
-
-} // namespace Internal
-} // namespace QSsh
-
-#endif // SFTPCHANNEL_P_H

client/3rd/QtSsh/src/ssh/sftpdefs.cpp

@@ -1,33 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#include "sftpdefs.h"
-
-namespace QSsh { const SftpJobId SftpInvalidJob = 0; }

client/3rd/QtSsh/src/ssh/sftpdefs.h

@@ -1,119 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#ifndef SFTPDEFS_H
-#define SFTPDEFS_H
-
-#include "ssh_global.h"
-
-#include <QFile>
-#include <QString>
-
-/*!
- * \namespace QSsh
- * \brief The namespace used for the entire library
- */
-namespace QSsh {
-
-
-/*!
- *\brief Unique ID used for tracking individual jobs.
- */
-typedef quint32 SftpJobId;
-
-/*!
-    Special ID representing an invalid job, e. g. if a requested job could not be started.
-*/
-QSSH_EXPORT extern const SftpJobId SftpInvalidJob;
-
-
-/*!
- * \brief The behavior when uploading a file and the remote path already exists
- */
-enum SftpOverwriteMode {
-    /*! Overwrite any existing files */
-    SftpOverwriteExisting,
-
-    /*! Append new content if the file already exists */
-    SftpAppendToExisting,
-
-    /*! If the file or directory already exists skip it */
-    SftpSkipExisting
-};
-
-/*!
- * \brief The type of a remote file.
- */
-enum SftpFileType { FileTypeRegular, FileTypeDirectory, FileTypeOther, FileTypeUnknown };
-
-/*!
- * \brief Possible errors.
-*/
-enum SftpError { NoError, EndOfFile, FileNotFound, PermissionDenied, GenericFailure, BadMessage, NoConnection, ConnectionLost, UnsupportedOperation  };
-
-/*!
-    \brief Contains information about a remote file.
-*/
-class QSSH_EXPORT SftpFileInfo
-{
-public:
-    SftpFileInfo() : type(FileTypeUnknown), sizeValid(false), permissionsValid(false) { }
-
-    /// The remote file name, only file attribute required by the RFC to be present so this is always set
-    QString name;
-
-    /// The type of file
-    SftpFileType type = FileTypeUnknown;
-
-    /// The remote file size in bytes.
-    quint64 size = 0;
-
-    /// The permissions set on the file, might be empty as the RFC allows an SFTP server not to support any file attributes beyond the name.
-    QFileDevice::Permissions permissions{};
-
-    /// Last time file was accessed.
-    quint32 atime = 0;
-
-    /// Last time file was modified.
-    quint32 mtime = 0;
-
-    /// If the timestamps (\ref atime and \ref mtime) are valid, the RFC allows an SFTP server not to support any file attributes beyond the name.
-    bool timestampsValid = false;
-
-    /// The RFC allows an SFTP server not to support any file attributes beyond the name.
-    bool sizeValid = false;
-
-    /// The RFC allows an SFTP server not to support any file attributes beyond the name.
-    bool permissionsValid = false;
-};
-
-} // namespace QSsh
-
-#endif // SFTPDEFS_H

client/3rd/QtSsh/src/ssh/sftpfilesystemmodel.cpp

@@ -1,401 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-#include "sftpfilesystemmodel.h"
-
-#include "sftpchannel.h"
-#include "sshconnection.h"
-#include "sshconnectionmanager.h"
-
-#include <QFileInfo>
-#include <QHash>
-#include <QIcon>
-#include <QList>
-#include <QString>
-
-namespace QSsh {
-namespace Internal {
-namespace {
-
-class SftpDirNode;
-class SftpFileNode
-{
-public:
-    SftpFileNode() : parent(nullptr) { }
-    virtual ~SftpFileNode() { }
-
-    QString path;
-    SftpFileInfo fileInfo;
-    SftpDirNode *parent;
-};
-
-class SftpDirNode : public SftpFileNode
-{
-public:
-    SftpDirNode() : lsState(LsNotYetCalled) { }
-    ~SftpDirNode() { qDeleteAll(children); }
-
-    enum { LsNotYetCalled, LsRunning, LsFinished } lsState;
-    QList<SftpFileNode *> children;
-};
-
-typedef QHash<SftpJobId, SftpDirNode *> DirNodeHash;
-
-SftpFileNode *indexToFileNode(const QModelIndex &index)
-{
-    return static_cast<SftpFileNode *>(index.internalPointer());
-}
-
-SftpDirNode *indexToDirNode(const QModelIndex &index)
-{
-    SftpFileNode * const fileNode = indexToFileNode(index);
-    QSSH_ASSERT(fileNode);
-    return dynamic_cast<SftpDirNode *>(fileNode);
-}
-
-} // anonymous namespace
-
-class SftpFileSystemModelPrivate
-{
-public:
-    SshConnection *sshConnection;
-    SftpChannel::Ptr sftpChannel;
-    QString rootDirectory;
-    SftpFileNode *rootNode;
-    SftpJobId statJobId;
-    DirNodeHash lsOps;
-    QList<SftpJobId> externalJobs;
-};
-} // namespace Internal
-
-using namespace Internal;
-
-SftpFileSystemModel::SftpFileSystemModel(QObject *parent)
-    : QAbstractItemModel(parent), d(new SftpFileSystemModelPrivate)
-{
-    d->sshConnection = nullptr;
-    d->rootDirectory = QLatin1Char('/');
-    d->rootNode = nullptr;
-    d->statJobId = SftpInvalidJob;
-}
-
-SftpFileSystemModel::~SftpFileSystemModel()
-{
-    shutDown();
-    delete d;
-}
-
-void SftpFileSystemModel::setSshConnection(const SshConnectionParameters &sshParams)
-{
-    QSSH_ASSERT_AND_RETURN(!d->sshConnection);
-    d->sshConnection = QSsh::acquireConnection(sshParams);
-    connect(d->sshConnection, &SshConnection::error,
-            this, &SftpFileSystemModel::handleSshConnectionFailure);
-    if (d->sshConnection->state() == SshConnection::Connected) {
-        handleSshConnectionEstablished();
-        return;
-    }
-    connect(d->sshConnection, &SshConnection::connected,
-            this, &SftpFileSystemModel::handleSshConnectionEstablished);
-    if (d->sshConnection->state() == SshConnection::Unconnected)
-        d->sshConnection->connectToHost();
-}
-
-void SftpFileSystemModel::setRootDirectory(const QString &path)
-{
-    beginResetModel();
-    d->rootDirectory = path;
-    delete d->rootNode;
-    d->rootNode = nullptr;
-    d->lsOps.clear();
-    d->statJobId = SftpInvalidJob;
-    endResetModel();
-    statRootDirectory();
-}
-
-QString SftpFileSystemModel::rootDirectory() const
-{
-    return d->rootDirectory;
-}
-
-SftpJobId SftpFileSystemModel::downloadFile(const QModelIndex &index, const QString &targetFilePath)
-{
-    QSSH_ASSERT_AND_RETURN_VALUE(d->rootNode, SftpInvalidJob);
-    const SftpFileNode * const fileNode = indexToFileNode(index);
-    QSSH_ASSERT_AND_RETURN_VALUE(fileNode, SftpInvalidJob);
-    QSSH_ASSERT_AND_RETURN_VALUE(fileNode->fileInfo.type == FileTypeRegular, SftpInvalidJob);
-    const SftpJobId jobId = d->sftpChannel->downloadFile(fileNode->path, targetFilePath,
-        SftpOverwriteExisting);
-    if (jobId != SftpInvalidJob)
-        d->externalJobs << jobId;
-    return jobId;
-}
-
-int SftpFileSystemModel::columnCount(const QModelIndex &parent) const
-{
-    Q_UNUSED(parent);
-    return 2; // type + name
-}
-
-QVariant SftpFileSystemModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.internalPointer()) {
-        return QVariant();
-    }
-
-    const SftpFileNode * const node = indexToFileNode(index);
-    if (index.column() == 0 && role == Qt::DecorationRole) {
-        switch (node->fileInfo.type) {
-        case FileTypeRegular:
-        case FileTypeOther:
-            return QIcon(QStringLiteral(":/ssh/images/unknownfile.png"));
-        case FileTypeDirectory:
-            return QIcon(QStringLiteral(":/ssh/images/dir.png"));
-        case FileTypeUnknown:
-            return QIcon(QStringLiteral(":/ssh/images/help.png")); // Shows a question mark.
-        }
-    }
-    if (index.column() == 1) {
-        if (role == Qt::DisplayRole)
-            return node->fileInfo.name;
-        if (role == PathRole)
-            return node->path;
-    }
-    return QVariant();
-}
-
-Qt::ItemFlags SftpFileSystemModel::flags(const QModelIndex &index) const
-{
-    if (!index.isValid())
-        return Qt::NoItemFlags;
-    return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
-}
-
-QVariant SftpFileSystemModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-    if (orientation != Qt::Horizontal)
-        return QVariant();
-    if (role != Qt::DisplayRole)
-        return QVariant();
-    if (section == 0)
-        return tr("File Type");
-    if (section == 1)
-        return tr("File Name");
-    return QVariant();
-}
-
-QModelIndex SftpFileSystemModel::index(int row, int column, const QModelIndex &parent) const
-{
-    if (row < 0 || row >= rowCount(parent) || column < 0 || column >= columnCount(parent))
-        return QModelIndex();
-    if (!d->rootNode)
-        return QModelIndex();
-    if (!parent.isValid())
-        return createIndex(row, column, d->rootNode);
-    const SftpDirNode * const parentNode = indexToDirNode(parent);
-    QSSH_ASSERT_AND_RETURN_VALUE(parentNode, QModelIndex());
-    QSSH_ASSERT_AND_RETURN_VALUE(row < parentNode->children.count(), QModelIndex());
-    SftpFileNode * const childNode = parentNode->children.at(row);
-    return createIndex(row, column, childNode);
-}
-
-QModelIndex SftpFileSystemModel::parent(const QModelIndex &child) const
-{
-    if (!child.isValid()) // Don't assert on this, since the model tester tries it.
-        return QModelIndex();
-
-    const SftpFileNode * const childNode = indexToFileNode(child);
-    QSSH_ASSERT_AND_RETURN_VALUE(childNode, QModelIndex());
-    if (childNode == d->rootNode)
-        return QModelIndex();
-    SftpDirNode * const parentNode = childNode->parent;
-    if (parentNode == d->rootNode)
-        return createIndex(0, 0, d->rootNode);
-    const SftpDirNode * const grandParentNode = parentNode->parent;
-    QSSH_ASSERT_AND_RETURN_VALUE(grandParentNode, QModelIndex());
-    return createIndex(grandParentNode->children.indexOf(parentNode), 0, parentNode);
-}
-
-int SftpFileSystemModel::rowCount(const QModelIndex &parent) const
-{
-    if (!d->rootNode)
-        return 1; // fake it until we make it, otherwise QTreeView isn't happy
-    if (!parent.isValid())
-        return 1;
-    if (parent.column() != 0)
-        return 0;
-    SftpDirNode * const dirNode = indexToDirNode(parent);
-    if (!dirNode)
-        return 0;
-    if (dirNode->lsState != SftpDirNode::LsNotYetCalled)
-        return dirNode->children.count();
-    d->lsOps.insert(d->sftpChannel->listDirectory(dirNode->path), dirNode);
-    dirNode->lsState = SftpDirNode::LsRunning;
-    return 0;
-}
-
-void SftpFileSystemModel::statRootDirectory()
-{
-    if (!d->sftpChannel) {
-        return;
-    }
-
-    d->statJobId = d->sftpChannel->statFile(d->rootDirectory);
-}
-
-void SftpFileSystemModel::shutDown()
-{
-    if (d->sftpChannel) {
-        disconnect(d->sftpChannel.data(), nullptr, this, nullptr);
-        d->sftpChannel->closeChannel();
-        d->sftpChannel.clear();
-    }
-    if (d->sshConnection) {
-        disconnect(d->sshConnection, nullptr, this, nullptr);
-        QSsh::releaseConnection(d->sshConnection);
-        d->sshConnection = nullptr;
-    }
-    delete d->rootNode;
-    d->rootNode = nullptr;
-}
-
-void SftpFileSystemModel::handleSshConnectionFailure()
-{
-    emit connectionError(d->sshConnection->errorString());
-    beginResetModel();
-    shutDown();
-    endResetModel();
-}
-
-void SftpFileSystemModel::handleSftpChannelInitialized()
-{
-    connect(d->sftpChannel.data(),
-        &SftpChannel::fileInfoAvailable,
-        this, &SftpFileSystemModel::handleFileInfo);
-    connect(d->sftpChannel.data(), &SftpChannel::finished,
-        this, &SftpFileSystemModel::handleSftpJobFinished);
-    statRootDirectory();
-}
-
-void SftpFileSystemModel::handleSshConnectionEstablished()
-{
-    d->sftpChannel = d->sshConnection->createSftpChannel();
-    connect(d->sftpChannel.data(), &SftpChannel::initialized,
-            this, &SftpFileSystemModel::handleSftpChannelInitialized);
-    connect(d->sftpChannel.data(), &SftpChannel::channelError,
-            this, &SftpFileSystemModel::handleSftpChannelError);
-    d->sftpChannel->initialize();
-}
-
-void SftpFileSystemModel::handleSftpChannelError(const QString &reason)
-{
-    emit connectionError(reason);
-    beginResetModel();
-    shutDown();
-    endResetModel();
-}
-
-void SftpFileSystemModel::handleFileInfo(SftpJobId jobId, const QList<SftpFileInfo> &fileInfoList)
-{
-    if (jobId == d->statJobId) {
-        QSSH_ASSERT_AND_RETURN(!d->rootNode);
-        beginInsertRows(QModelIndex(), 0, 0);
-        d->rootNode = new SftpDirNode;
-        d->rootNode->path = d->rootDirectory;
-        d->rootNode->fileInfo = fileInfoList.first();
-        d->rootNode->fileInfo.name = d->rootDirectory == QLatin1String("/")
-            ? d->rootDirectory : QFileInfo(d->rootDirectory).fileName();
-        endInsertRows();
-        return;
-    }
-    SftpDirNode * const parentNode = d->lsOps.value(jobId);
-    QSSH_ASSERT_AND_RETURN(parentNode);
-    QList<SftpFileInfo> filteredList;
-    foreach (const SftpFileInfo &fi, fileInfoList) {
-        if (fi.name != QLatin1String(".") && fi.name != QLatin1String(".."))
-            filteredList << fi;
-    }
-    if (filteredList.isEmpty())
-        return;
-
-    if (parentNode->parent) {
-        QModelIndex parentIndex = createIndex(parentNode->parent->children.indexOf(parentNode), 0, parentNode);
-        beginInsertRows(parentIndex, rowCount(parentIndex), rowCount(parentIndex) + filteredList.count());
-    } else {
-        // root node
-        beginInsertRows(QModelIndex(), 0, 1);
-    }
-
-    foreach (const SftpFileInfo &fileInfo, filteredList) {
-        SftpFileNode *childNode;
-        if (fileInfo.type == FileTypeDirectory)
-            childNode = new SftpDirNode;
-        else
-            childNode = new SftpFileNode;
-        childNode->path = parentNode->path;
-        if (!childNode->path.endsWith(QLatin1Char('/')))
-            childNode->path += QLatin1Char('/');
-        childNode->path += fileInfo.name;
-        childNode->fileInfo = fileInfo;
-        childNode->parent = parentNode;
-        parentNode->children << childNode;
-    }
-    endInsertRows();
-}
-
-void SftpFileSystemModel::handleSftpJobFinished(SftpJobId jobId, const SftpError error, const QString &errorMessage)
-{
-    Q_UNUSED(error);
-
-    if (jobId == d->statJobId) {
-        d->statJobId = SftpInvalidJob;
-        if (!errorMessage.isEmpty())
-            emit sftpOperationFailed(tr("Error getting \"stat\" info about \"%1\": %2")
-                .arg(rootDirectory(), errorMessage));
-        return;
-    }
-
-    DirNodeHash::Iterator it = d->lsOps.find(jobId);
-    if (it != d->lsOps.end()) {
-        QSSH_ASSERT(it.value()->lsState == SftpDirNode::LsRunning);
-        it.value()->lsState = SftpDirNode::LsFinished;
-        if (!errorMessage.isEmpty())
-            emit sftpOperationFailed(tr("Error listing contents of directory \"%1\": %2")
-                .arg(it.value()->path, errorMessage));
-        d->lsOps.erase(it);
-        return;
-    }
-
-    const int jobIndex = d->externalJobs.indexOf(jobId);
-    QSSH_ASSERT_AND_RETURN(jobIndex != -1);
-    d->externalJobs.removeAt(jobIndex);
-    emit sftpOperationFinished(jobId, errorMessage);
-}
-
-} // namespace QSsh

client/3rd/QtSsh/src/ssh/sftpfilesystemmodel.h

@@ -1,107 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-#ifndef SFTPFILESYSTEMMODEL_H
-#define SFTPFILESYSTEMMODEL_H
-
-#include "sftpdefs.h"
-
-#include "ssh_global.h"
-
-#include <QAbstractItemModel>
-
-namespace QSsh {
-class SshConnectionParameters;
-
-namespace Internal { class SftpFileSystemModelPrivate; }
-
-// Very simple read-only model. Symbolic links are not followed.
-class QSSH_EXPORT SftpFileSystemModel : public QAbstractItemModel
-{
-    Q_OBJECT
-public:
-    explicit SftpFileSystemModel(QObject *parent = nullptr);
-    ~SftpFileSystemModel();
-
-    /*
-     * Once this is called, an SFTP connection is established and the model is populated.
-     * The effect of additional calls is undefined.
-     */
-    void setSshConnection(const SshConnectionParameters &sshParams);
-
-    void setRootDirectory(const QString &path); // Default is "/".
-    QString rootDirectory() const;
-
-    SftpJobId downloadFile(const QModelIndex &index, const QString &targetFilePath);
-
-    // Use this to get the full path of a file or directory.
-    static const int PathRole = Qt::UserRole;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-
-signals:
-     /*
-      * E.g. "Permission denied". Note that this can happen without direct user intervention,
-      * due to e.g. the view calling rowCount() on a non-readable directory. This signal should
-      * therefore not result in a message box or similar, since it might occur very often.
-      */
-    void sftpOperationFailed(const QString &errorMessage);
-
-    /*
-     * This error is not recoverable. The model will not have any content after
-     * the signal has been emitted.
-     */
-    void connectionError(const QString &errorMessage);
-
-    // Success <=> error.isEmpty().
-    void sftpOperationFinished(QSsh::SftpJobId, const QString &error);
-
-private:
-    void handleSshConnectionEstablished();
-    void handleSshConnectionFailure();
-    void handleSftpChannelInitialized();
-    void handleSftpChannelError(const QString &reason);
-    void handleFileInfo(QSsh::SftpJobId jobId, const QList<QSsh::SftpFileInfo> &fileInfoList);
-    void handleSftpJobFinished(QSsh::SftpJobId jobId, const SftpError error, const QString &errorMessage);
-
-    int columnCount(const QModelIndex &parent = QModelIndex()) const;
-    Qt::ItemFlags flags(const QModelIndex &index) const;
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
-    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
-    QModelIndex parent(const QModelIndex &child) const;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-
-    void statRootDirectory();
-    void shutDown();
-
-    Internal::SftpFileSystemModelPrivate * const d;
-};
-
-} // namespace QSsh;
-
-#endif // SFTPFILESYSTEMMODEL_H

client/3rd/QtSsh/src/ssh/sftpincomingpacket.cpp

@@ -1,223 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#include "sftpincomingpacket_p.h"
-
-#include "sshexception_p.h"
-#include "sshlogging_p.h"
-#include "sshpacketparser_p.h"
-
-namespace QSsh {
-namespace Internal {
-
-SftpIncomingPacket::SftpIncomingPacket() : m_length(0)
-{
-}
-
-void SftpIncomingPacket::consumeData(QByteArray &newData)
-{
-    qCDebug(sshLog, "%s: current data size = %d, new data size = %d", Q_FUNC_INFO,
-        m_data.size(), newData.size());
-
-    if (isComplete() || dataSize() + newData.size() < sizeof m_length)
-        return;
-
-    if (dataSize() < sizeof m_length) {
-        moveFirstBytes(m_data, newData, sizeof m_length - m_data.size());
-        m_length = SshPacketParser::asUint32(m_data, static_cast<quint32>(0));
-        if (m_length < static_cast<quint32>(TypeOffset + 1)
-            || m_length > MaxPacketSize) {
-            throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR,
-                "Invalid length field in SFTP packet.");
-        }
-    }
-
-    moveFirstBytes(m_data, newData,
-        qMin<quint32>(m_length - dataSize() + 4, newData.size()));
-}
-
-void SftpIncomingPacket::moveFirstBytes(QByteArray &target, QByteArray &source,
-    int n)
-{
-    target.append(source.left(n));
-    source.remove(0, n);
-}
-
-bool SftpIncomingPacket::isComplete() const
-{
-    return m_length == dataSize() - 4;
-}
-
-void SftpIncomingPacket::clear()
-{
-    m_data.clear();
-    m_length = 0;
-}
-
-quint32 SftpIncomingPacket::extractServerVersion() const
-{
-    Q_ASSERT(isComplete());
-    Q_ASSERT(type() == SSH_FXP_VERSION);
-    try {
-        return SshPacketParser::asUint32(m_data, TypeOffset + 1);
-    } catch (const SshPacketParseException &) {
-        throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR,
-            "Invalid SSH_FXP_VERSION packet.");
-    }
-}
-
-SftpHandleResponse SftpIncomingPacket::asHandleResponse() const
-{
-    Q_ASSERT(isComplete());
-    Q_ASSERT(type() == SSH_FXP_HANDLE);
-    try {
-        SftpHandleResponse response;
-        quint32 offset = RequestIdOffset;
-        response.requestId = SshPacketParser::asUint32(m_data, &offset);
-        response.handle = SshPacketParser::asString(m_data, &offset);
-        return response;
-    } catch (const SshPacketParseException &) {
-        throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR,
-            "Invalid SSH_FXP_HANDLE packet");
-    }
-}
-
-SftpStatusResponse SftpIncomingPacket::asStatusResponse() const
-{
-    Q_ASSERT(isComplete());
-    Q_ASSERT(type() == SSH_FXP_STATUS);
-    try {
-        SftpStatusResponse response;
-        quint32 offset = RequestIdOffset;
-        response.requestId = SshPacketParser::asUint32(m_data, &offset);
-        response.status = static_cast<SftpStatusCode>(SshPacketParser::asUint32(m_data, &offset));
-        response.errorString = SshPacketParser::asUserString(m_data, &offset);
-        response.language = SshPacketParser::asString(m_data, &offset);
-        return response;
-    } catch (const SshPacketParseException &) {
-        throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR,
-            "Invalid SSH_FXP_STATUS packet.");
-    }
-}
-
-SftpNameResponse SftpIncomingPacket::asNameResponse() const
-{
-    Q_ASSERT(isComplete());
-    Q_ASSERT(type() == SSH_FXP_NAME);
-    try {
-        SftpNameResponse response;
-        quint32 offset = RequestIdOffset;
-        response.requestId = SshPacketParser::asUint32(m_data, &offset);
-        const quint32 count = SshPacketParser::asUint32(m_data, &offset);
-        for (quint32 i = 0; i < count; ++i)
-            response.files << asFile(offset);
-        return response;
-    } catch (const SshPacketParseException &) {
-        throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR,
-            "Invalid SSH_FXP_NAME packet.");
-    }
-}
-
-SftpDataResponse SftpIncomingPacket::asDataResponse() const
-{
-    Q_ASSERT(isComplete());
-    Q_ASSERT(type() == SSH_FXP_DATA);
-    try {
-        SftpDataResponse response;
-        quint32 offset = RequestIdOffset;
-        response.requestId = SshPacketParser::asUint32(m_data, &offset);
-        response.data = SshPacketParser::asString(m_data, &offset);
-        return response;
-    } catch (const SshPacketParseException &) {
-        throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR,
-            "Invalid SSH_FXP_DATA packet.");
-    }
-}
-
-SftpAttrsResponse SftpIncomingPacket::asAttrsResponse() const
-{
-    Q_ASSERT(isComplete());
-    Q_ASSERT(type() == SSH_FXP_ATTRS);
-    try {
-        SftpAttrsResponse response;
-        quint32 offset = RequestIdOffset;
-        response.requestId = SshPacketParser::asUint32(m_data, &offset);
-        response.attrs = asFileAttributes(offset);
-        return response;
-    } catch (const SshPacketParseException &) {
-        throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR,
-            "Invalid SSH_FXP_ATTRS packet.");
-    }
-}
-
-SftpFile SftpIncomingPacket::asFile(quint32 &offset) const
-{
-    SftpFile file;
-    file.fileName
-        = QString::fromUtf8(SshPacketParser::asString(m_data, &offset));
-    file.longName
-        = QString::fromUtf8(SshPacketParser::asString(m_data, &offset));
-    file.attributes = asFileAttributes(offset);
-    return file;
-}
-
-SftpFileAttributes SftpIncomingPacket::asFileAttributes(quint32 &offset) const
-{
-    SftpFileAttributes attributes;
-    const quint32 flags = SshPacketParser::asUint32(m_data, &offset);
-    attributes.sizePresent = flags & SSH_FILEXFER_ATTR_SIZE;
-    attributes.timesPresent = flags & SSH_FILEXFER_ATTR_ACMODTIME;
-    attributes.uidAndGidPresent = flags & SSH_FILEXFER_ATTR_UIDGID;
-    attributes.permissionsPresent = flags & SSH_FILEXFER_ATTR_PERMISSIONS;
-    if (attributes.sizePresent) {
-        attributes.size = SshPacketParser::asUint64(m_data, &offset);
-    }
-    if (attributes.uidAndGidPresent) {
-        attributes.uid = SshPacketParser::asUint32(m_data, &offset);
-        attributes.gid = SshPacketParser::asUint32(m_data, &offset);
-    }
-    if (attributes.permissionsPresent)
-        attributes.permissions = SshPacketParser::asUint32(m_data, &offset);
-    if (attributes.timesPresent) {
-        attributes.atime = SshPacketParser::asUint32(m_data, &offset);
-        attributes.mtime = SshPacketParser::asUint32(m_data, &offset);
-    }
-    if (flags & SSH_FILEXFER_ATTR_EXTENDED) {
-        const quint32 count = SshPacketParser::asUint32(m_data, &offset);
-        for (quint32 i = 0; i < count; ++i) {
-            SshPacketParser::asString(m_data, &offset);
-            SshPacketParser::asString(m_data, &offset);
-        }
-    }
-    return attributes;
-}
-
-} // namespace Internal
-} // namespace QSsh

client/3rd/QtSsh/src/ssh/sftpincomingpacket_p.h

@@ -1,112 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#ifndef SFTPINCOMINGPACKET_P_H
-#define SFTPINCOMINGPACKET_P_H
-
-#include "sftppacket_p.h"
-
-namespace QSsh {
-namespace Internal {
-
-struct SftpHandleResponse {
-    quint32 requestId;
-    QByteArray handle;
-};
-
-struct SftpStatusResponse {
-    quint32 requestId;
-    SftpStatusCode status;
-    QString errorString;
-    QByteArray language;
-};
-
-struct SftpFileAttributes {
-    bool sizePresent;
-    bool timesPresent;
-    bool uidAndGidPresent;
-    bool permissionsPresent;
-    quint64 size;
-    quint32 uid;
-    quint32 gid;
-    quint32 permissions;
-    quint32 atime;
-    quint32 mtime;
-};
-
-struct SftpFile {
-    QString fileName;
-    QString longName; // Not present in later RFCs, so we don't expose this to the user.
-    SftpFileAttributes attributes;
-};
-
-struct SftpNameResponse {
-    quint32 requestId;
-    QList<SftpFile> files;
-};
-
-struct SftpDataResponse {
-    quint32 requestId;
-    QByteArray data;
-};
-
-struct SftpAttrsResponse {
-    quint32 requestId;
-    SftpFileAttributes attrs;
-};
-
-class SftpIncomingPacket : public AbstractSftpPacket
-{
-public:
-    SftpIncomingPacket();
-
-    void consumeData(QByteArray &data);
-    void clear();
-    bool isComplete() const;
-    quint32 extractServerVersion() const;
-    SftpHandleResponse asHandleResponse() const;
-    SftpStatusResponse asStatusResponse() const;
-    SftpNameResponse asNameResponse() const;
-    SftpDataResponse asDataResponse() const;
-    SftpAttrsResponse asAttrsResponse() const;
-
-private:
-    void moveFirstBytes(QByteArray &target, QByteArray &source, int n);
-
-    SftpFileAttributes asFileAttributes(quint32 &offset) const;
-    SftpFile asFile(quint32 &offset) const;
-
-    quint32 m_length;
-};
-
-} // namespace Internal
-} // namespace QSsh
-
-#endif // SFTPINCOMINGPACKET_P_H

client/3rd/QtSsh/src/ssh/sftpoperation.cpp

@@ -1,236 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#include "sftpoperation_p.h"
-
-#include "sftpoutgoingpacket_p.h"
-
-#include <QFile>
-
-namespace QSsh {
-namespace Internal {
-
-AbstractSftpOperation::AbstractSftpOperation(SftpJobId jobId) : jobId(jobId)
-{
-}
-
-AbstractSftpOperation::~AbstractSftpOperation() { }
-
-
-SftpStatFile::SftpStatFile(SftpJobId jobId, const QString &path)
-    : AbstractSftpOperation(jobId), path(path)
-{
-}
-
-SftpOutgoingPacket &SftpStatFile::initialPacket(SftpOutgoingPacket &packet)
-{
-    return packet.generateStat(path, jobId);
-}
-
-SftpMakeDir::SftpMakeDir(SftpJobId jobId, const QString &path,
-    const SftpUploadDir::Ptr &parentJob)
-    : AbstractSftpOperation(jobId), parentJob(parentJob), remoteDir(path)
-{
-}
-
-SftpOutgoingPacket &SftpMakeDir::initialPacket(SftpOutgoingPacket &packet)
-{
-    return packet.generateMkDir(remoteDir, jobId);
-}
-
-
-SftpRmDir::SftpRmDir(SftpJobId id, const QString &path)
-    : AbstractSftpOperation(id), remoteDir(path)
-{
-}
-
-SftpOutgoingPacket &SftpRmDir::initialPacket(SftpOutgoingPacket &packet)
-{
-    return packet.generateRmDir(remoteDir, jobId);
-}
-
-
-SftpRm::SftpRm(SftpJobId jobId, const QString &path)
-    : AbstractSftpOperation(jobId), remoteFile(path) {}
-
-SftpOutgoingPacket &SftpRm::initialPacket(SftpOutgoingPacket &packet)
-{
-    return packet.generateRm(remoteFile, jobId);
-}
-
-
-SftpRename::SftpRename(SftpJobId jobId, const QString &oldPath,
-    const QString &newPath)
-    : AbstractSftpOperation(jobId), oldPath(oldPath), newPath(newPath)
-{
-}
-
-SftpOutgoingPacket &SftpRename::initialPacket(SftpOutgoingPacket &packet)
-{
-    return packet.generateRename(oldPath, newPath, jobId);
-}
-
-
-SftpCreateLink::SftpCreateLink(SftpJobId jobId, const QString &filePath, const QString &target)
-    : AbstractSftpOperation(jobId), filePath(filePath), target(target)
-{
-}
-
-SftpOutgoingPacket &SftpCreateLink::initialPacket(SftpOutgoingPacket &packet)
-{
-    return packet.generateCreateLink(filePath, target, jobId);
-}
-
-
-AbstractSftpOperationWithHandle::AbstractSftpOperationWithHandle(SftpJobId jobId,
-    const QString &remotePath)
-    : AbstractSftpOperation(jobId),
-      remotePath(remotePath), state(Inactive), hasError(false)
-{
-}
-
-AbstractSftpOperationWithHandle::~AbstractSftpOperationWithHandle() { }
-
-
-SftpListDir::SftpListDir(SftpJobId jobId, const QString &path,
-    const QSharedPointer<SftpDownloadDir> &parentJob)
-    : AbstractSftpOperationWithHandle(jobId, path), parentJob(parentJob)
-{
-}
-
-SftpOutgoingPacket &SftpListDir::initialPacket(SftpOutgoingPacket &packet)
-{
-    state = OpenRequested;
-    return packet.generateOpenDir(remotePath, jobId);
-}
-
-
-SftpCreateFile::SftpCreateFile(SftpJobId jobId, const QString &path,
-    SftpOverwriteMode mode)
-    : AbstractSftpOperationWithHandle(jobId, path), mode(mode)
-{
-}
-
-SftpOutgoingPacket & SftpCreateFile::initialPacket(SftpOutgoingPacket &packet)
-{
-    state = OpenRequested;
-    return packet.generateOpenFileForWriting(remotePath, mode,
-        SftpOutgoingPacket::DefaultPermissions, jobId);
-}
-
-
-const int AbstractSftpTransfer::MaxInFlightCount = 10; // Experimentally found to be enough.
-
-AbstractSftpTransfer::AbstractSftpTransfer(SftpJobId jobId, const QString &remotePath,
-    const QSharedPointer<QIODevice> &localFile)
-    : AbstractSftpOperationWithHandle(jobId, remotePath),
-      localFile(localFile), fileSize(0), offset(0), inFlightCount(0),
-      statRequested(false)
-{
-}
-
-AbstractSftpTransfer::~AbstractSftpTransfer() {}
-
-void AbstractSftpTransfer::calculateInFlightCount(quint32 chunkSize)
-{
-    if (fileSize == 0) {
-        inFlightCount = 1;
-    } else {
-        inFlightCount = fileSize / chunkSize;
-        if (fileSize % chunkSize)
-            ++inFlightCount;
-        if (inFlightCount > MaxInFlightCount)
-            inFlightCount = MaxInFlightCount;
-    }
-}
-
-
-SftpDownload::SftpDownload(SftpJobId jobId, const QString &remotePath,
-    const QSharedPointer<QIODevice> &localFile, SftpOverwriteMode mode,
-    const QSharedPointer<QSsh::Internal::SftpDownloadDir> &parentJob)
-    : AbstractSftpTransfer(jobId, remotePath, localFile), eofId(SftpInvalidJob), mode(mode),
-      parentJob(parentJob)
-{
-}
-
-SftpOutgoingPacket &SftpDownload::initialPacket(SftpOutgoingPacket &packet)
-{
-    state = OpenRequested;
-    return packet.generateOpenFileForReading(remotePath, jobId);
-}
-
-
-SftpUploadFile::SftpUploadFile(SftpJobId jobId, const QString &remotePath,
-    const QSharedPointer<QIODevice> &localFile, SftpOverwriteMode mode,
-    const SftpUploadDir::Ptr &parentJob)
-    : AbstractSftpTransfer(jobId, remotePath, localFile),
-      parentJob(parentJob), mode(mode)
-{
-    fileSize = localFile->size();
-}
-
-SftpOutgoingPacket &SftpUploadFile::initialPacket(SftpOutgoingPacket &packet)
-{
-    state = OpenRequested;
-    quint32 permissions = 0;
-    QFileDevice *fileDevice = qobject_cast<QFileDevice*>(localFile.data());
-    if (fileDevice) {
-        const QFile::Permissions &qtPermissions = fileDevice->permissions();
-        if (qtPermissions & QFile::ExeOther)
-            permissions |= 1 << 0;
-        if (qtPermissions & QFile::WriteOther)
-            permissions |= 1 << 1;
-        if (qtPermissions & QFile::ReadOther)
-            permissions |= 1 << 2;
-        if (qtPermissions & QFile::ExeGroup)
-            permissions |= 1<< 3;
-        if (qtPermissions & QFile::WriteGroup)
-            permissions |= 1<< 4;
-        if (qtPermissions & QFile::ReadGroup)
-            permissions |= 1<< 5;
-        if (qtPermissions & QFile::ExeOwner)
-            permissions |= 1<< 6;
-        if (qtPermissions & QFile::WriteOwner)
-            permissions |= 1<< 7;
-        if (qtPermissions & QFile::ReadOwner)
-            permissions |= 1<< 8;
-    } else {
-        // write owner
-        permissions |= 1<< 7;
-        // read owner
-        permissions |= 1<< 8;
-    }
-    return packet.generateOpenFileForWriting(remotePath, mode, permissions, jobId);
-}
-
-SftpUploadDir::~SftpUploadDir() {}
-
-} // namespace Internal
-} // namespace QSsh

client/3rd/QtSsh/src/ssh/sftpoperation_p.h

@@ -1,290 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#ifndef SFTPOPERATION_P_H
-#define SFTPOPERATION_P_H
-
-#include "sftpdefs.h"
-
-#include <QByteArray>
-#include <QList>
-#include <QMap>
-#include <QSharedPointer>
-
-QT_BEGIN_NAMESPACE
-class QIODevice;
-QT_END_NAMESPACE
-
-namespace QSsh {
-namespace Internal {
-
-class SftpOutgoingPacket;
-
-struct AbstractSftpOperation
-{
-    typedef QSharedPointer<AbstractSftpOperation> Ptr;
-    enum Type {
-        StatFile, ListDir, MakeDir, RmDir, Rm, Rename, CreateLink, CreateFile, Download, UploadFile
-    };
-
-    AbstractSftpOperation(SftpJobId jobId);
-    virtual ~AbstractSftpOperation();
-    virtual Type type() const = 0;
-    virtual SftpOutgoingPacket &initialPacket(SftpOutgoingPacket &packet) = 0;
-
-    const SftpJobId jobId;
-
-private:
-    AbstractSftpOperation(const AbstractSftpOperation &);
-    AbstractSftpOperation &operator=(const AbstractSftpOperation &);
-};
-
-struct SftpUploadDir;
-struct SftpDownloadDir;
-
-struct SftpStatFile : public AbstractSftpOperation
-{
-    typedef QSharedPointer<SftpStatFile> Ptr;
-
-    SftpStatFile(SftpJobId jobId, const QString &path);
-    virtual Type type() const { return StatFile; }
-    virtual SftpOutgoingPacket &initialPacket(SftpOutgoingPacket &packet);
-
-    const QString path;
-};
-
-struct SftpMakeDir : public AbstractSftpOperation
-{
-    typedef QSharedPointer<SftpMakeDir> Ptr;
-
-    SftpMakeDir(SftpJobId jobId, const QString &path,
-        const QSharedPointer<SftpUploadDir> &parentJob = QSharedPointer<SftpUploadDir>());
-    virtual Type type() const { return MakeDir; }
-    virtual SftpOutgoingPacket &initialPacket(SftpOutgoingPacket &packet);
-
-    const QSharedPointer<SftpUploadDir> parentJob;
-    const QString remoteDir;
-};
-
-struct SftpRmDir : public AbstractSftpOperation
-{
-    typedef QSharedPointer<SftpRmDir> Ptr;
-
-    SftpRmDir(SftpJobId id, const QString &path);
-    virtual Type type() const { return RmDir; }
-    virtual SftpOutgoingPacket &initialPacket(SftpOutgoingPacket &packet);
-
-    const QString remoteDir;
-};
-
-struct SftpRm : public AbstractSftpOperation
-{
-    typedef QSharedPointer<SftpRm> Ptr;
-
-    SftpRm(SftpJobId jobId, const QString &path);
-    virtual Type type() const { return Rm; }
-    virtual SftpOutgoingPacket &initialPacket(SftpOutgoingPacket &packet);
-
-    const QString remoteFile;
-};
-
-struct SftpRename : public AbstractSftpOperation
-{
-    typedef QSharedPointer<SftpRename> Ptr;
-
-    SftpRename(SftpJobId jobId, const QString &oldPath, const QString &newPath);
-    virtual Type type() const { return Rename; }
-    virtual SftpOutgoingPacket &initialPacket(SftpOutgoingPacket &packet);
-
-    const QString oldPath;
-    const QString newPath;
-};
-
-struct SftpCreateLink : public AbstractSftpOperation
-{
-    typedef QSharedPointer<SftpCreateLink> Ptr;
-
-    SftpCreateLink(SftpJobId jobId, const QString &filePath, const QString &target);
-    virtual Type type() const { return CreateLink; }
-    virtual SftpOutgoingPacket &initialPacket(SftpOutgoingPacket &packet);
-
-    const QString filePath;
-    const QString target;
-};
-
-
-struct AbstractSftpOperationWithHandle : public AbstractSftpOperation
-{
-    typedef QSharedPointer<AbstractSftpOperationWithHandle> Ptr;
-    enum State { Inactive, OpenRequested, Open, CloseRequested };
-
-    AbstractSftpOperationWithHandle(SftpJobId jobId, const QString &remotePath);
-    ~AbstractSftpOperationWithHandle();
-
-    const QString remotePath;
-    QByteArray remoteHandle;
-    State state;
-    bool hasError;
-};
-
-
-struct SftpListDir : public AbstractSftpOperationWithHandle
-{
-    typedef QSharedPointer<SftpListDir> Ptr;
-
-    SftpListDir(SftpJobId jobId, const QString &path,
-        const QSharedPointer<SftpDownloadDir> &parentJob = QSharedPointer<SftpDownloadDir>());
-    virtual Type type() const { return ListDir; }
-    virtual SftpOutgoingPacket &initialPacket(SftpOutgoingPacket &packet);
-
-    const QSharedPointer<SftpDownloadDir> parentJob;
-};
-
-
-struct SftpCreateFile : public AbstractSftpOperationWithHandle
-{
-    typedef QSharedPointer<SftpCreateFile> Ptr;
-
-    SftpCreateFile(SftpJobId jobId, const QString &path, SftpOverwriteMode mode);
-    virtual Type type() const { return CreateFile; }
-    virtual SftpOutgoingPacket &initialPacket(SftpOutgoingPacket &packet);
-
-    const SftpOverwriteMode mode;
-};
-
-struct AbstractSftpTransfer : public AbstractSftpOperationWithHandle
-{
-    typedef QSharedPointer<AbstractSftpTransfer> Ptr;
-
-    AbstractSftpTransfer(SftpJobId jobId, const QString &remotePath,
-        const QSharedPointer<QIODevice> &localFile);
-    ~AbstractSftpTransfer();
-    void calculateInFlightCount(quint32 chunkSize);
-
-    static const int MaxInFlightCount;
-
-    const QSharedPointer<QIODevice> localFile;
-    quint64 fileSize;
-    quint64 offset;
-    int inFlightCount;
-    bool statRequested;
-};
-
-struct SftpDownload : public AbstractSftpTransfer
-{
-    typedef QSharedPointer<SftpDownload> Ptr;
-    SftpDownload(SftpJobId jobId, const QString &remotePath,
-        const QSharedPointer<QIODevice> &localFile, SftpOverwriteMode mode,
-        const QSharedPointer<SftpDownloadDir> &parentJob = QSharedPointer<SftpDownloadDir>());
-    virtual Type type() const { return Download; }
-    virtual SftpOutgoingPacket &initialPacket(SftpOutgoingPacket &packet);
-
-    QMap<quint32, quint64> offsets;
-    SftpJobId eofId;
-    SftpOverwriteMode mode;
-    const QSharedPointer<QSsh::Internal::SftpDownloadDir> parentJob;
-};
-
-struct SftpUploadFile : public AbstractSftpTransfer
-{
-    typedef QSharedPointer<SftpUploadFile> Ptr;
-
-    SftpUploadFile(SftpJobId jobId, const QString &remotePath,
-        const QSharedPointer<QIODevice> &localFile, SftpOverwriteMode mode,
-        const QSharedPointer<SftpUploadDir> &parentJob = QSharedPointer<SftpUploadDir>());
-    virtual Type type() const { return UploadFile; }
-    virtual SftpOutgoingPacket &initialPacket(SftpOutgoingPacket &packet);
-
-    const QSharedPointer<SftpUploadDir> parentJob;
-    SftpOverwriteMode mode;
-};
-
-// Composite operation.
-struct SftpUploadDir
-{
-    typedef QSharedPointer<SftpUploadDir> Ptr;
-
-    struct Dir {
-        Dir(const QString &l, const QString &r) : localDir(l), remoteDir(r) {}
-        QString localDir;
-        QString remoteDir;
-    };
-
-    SftpUploadDir(SftpJobId jobId) : jobId(jobId), hasError(false) {}
-    ~SftpUploadDir();
-
-    void setError()
-    {
-        hasError = true;
-        uploadsInProgress.clear();
-        mkdirsInProgress.clear();
-    }
-
-    const SftpJobId jobId;
-    bool hasError;
-    QList<SftpUploadFile::Ptr> uploadsInProgress;
-    QMap<SftpMakeDir::Ptr, Dir> mkdirsInProgress;
-};
-
-// Composite operation.
-struct SftpDownloadDir
-{
-    typedef QSharedPointer<SftpDownloadDir> Ptr;
-
-    struct Dir {
-        Dir() {}
-        Dir(const QString &l, const QString &r) : localDir(l), remoteDir(r) {}
-        QString localDir;
-        QString remoteDir;
-    };
-
-    SftpDownloadDir(SftpJobId jobId, SftpOverwriteMode mode)
-        : jobId(jobId), hasError(false), mode(mode) {}
-
-    ~SftpDownloadDir() {}
-
-    void setError()
-    {
-        hasError = true;
-        downloadsInProgress.clear();
-        lsdirsInProgress.clear();
-    }
-
-    const SftpJobId jobId;
-    bool hasError;
-    SftpOverwriteMode mode;
-    QList<SftpDownload::Ptr> downloadsInProgress;
-    QMap<SftpListDir::Ptr, Dir> lsdirsInProgress;
-};
-
-} // namespace Internal
-} // namespace QSsh
-
-#endif // SFTPOPERATION_P_H

client/3rd/QtSsh/src/ssh/sftpoutgoingpacket.cpp

@@ -1,225 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#include "sftpoutgoingpacket_p.h"
-
-#include "sshlogging_p.h"
-#include "sshpacket_p.h"
-
-#include <QtEndian>
-
-#include <limits>
-
-namespace QSsh {
-namespace Internal {
-
-namespace {
-    const quint32 DefaultAttributes = 0;
-    const quint32 SSH_FXF_READ = 0x00000001;
-    const quint32 SSH_FXF_WRITE = 0x00000002;
-    const quint32 SSH_FXF_APPEND = 0x00000004;
-    const quint32 SSH_FXF_CREAT = 0x00000008;
-    const quint32 SSH_FXF_TRUNC = 0x00000010;
-    const quint32 SSH_FXF_EXCL = 0x00000020;
-}
-
-SftpOutgoingPacket::SftpOutgoingPacket()
-{
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::generateInit(quint32 version)
-{
-    return init(SSH_FXP_INIT, 0).appendInt(version).finalize();
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::generateStat(const QString &path, quint32 requestId)
-{
-    return init(SSH_FXP_LSTAT, requestId).appendString(path).finalize();
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::generateOpenDir(const QString &path,
-    quint32 requestId)
-{
-    return init(SSH_FXP_OPENDIR, requestId).appendString(path).finalize();
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::generateReadDir(const QByteArray &handle,
-    quint32 requestId)
-{
-    return init(SSH_FXP_READDIR, requestId).appendString(handle).finalize();
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::generateCloseHandle(const QByteArray &handle,
-    quint32 requestId)
-{
-    return init(SSH_FXP_CLOSE, requestId).appendString(handle).finalize();
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::generateMkDir(const QString &path,
-    quint32 requestId)
-{
-    return init(SSH_FXP_MKDIR, requestId).appendString(path)
-        .appendInt(DefaultAttributes).finalize();
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::generateRmDir(const QString &path,
-    quint32 requestId)
-{
-    return init(SSH_FXP_RMDIR, requestId).appendString(path).finalize();
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::generateRm(const QString &path,
-    quint32 requestId)
-{
-    return init(SSH_FXP_REMOVE, requestId).appendString(path).finalize();
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::generateRename(const QString &oldPath,
-    const QString &newPath, quint32 requestId)
-{
-    return init(SSH_FXP_RENAME, requestId).appendString(oldPath)
-        .appendString(newPath).finalize();
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::generateOpenFileForWriting(const QString &path,
-    SftpOverwriteMode mode, quint32 permissions, quint32 requestId)
-{
-    QList<quint32> attributes;
-    if (permissions != DefaultPermissions)
-        attributes << SSH_FILEXFER_ATTR_PERMISSIONS << permissions;
-    else
-        attributes << DefaultAttributes;
-    return generateOpenFile(path, Write, mode, attributes, requestId);
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::generateOpenFileForReading(const QString &path,
-    quint32 requestId)
-{
-    // Note: Overwrite mode is irrelevant and will be ignored.
-    return generateOpenFile(path, Read, SftpSkipExisting, QList<quint32>() << DefaultAttributes,
-        requestId);
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::generateReadFile(const QByteArray &handle,
-    quint64 offset, quint32 length, quint32 requestId)
-{
-    return init(SSH_FXP_READ, requestId).appendString(handle).appendInt64(offset)
-        .appendInt(length).finalize();
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::generateFstat(const QByteArray &handle,
-    quint32 requestId)
-{
-    return init(SSH_FXP_FSTAT, requestId).appendString(handle).finalize();
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::generateWriteFile(const QByteArray &handle,
-    quint64 offset, const QByteArray &data, quint32 requestId)
-{
-    return init(SSH_FXP_WRITE, requestId).appendString(handle)
-        .appendInt64(offset).appendString(data).finalize();
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::generateCreateLink(const QString &filePath,
-    const QString &target, quint32 requestId)
-{
-    return init(SSH_FXP_SYMLINK, requestId).appendString(filePath).appendString(target).finalize();
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::generateOpenFile(const QString &path,
-    OpenType openType, SftpOverwriteMode mode, const QList<quint32> &attributes, quint32 requestId)
-{
-    quint32 pFlags = 0;
-    switch (openType) {
-    case Read:
-        pFlags = SSH_FXF_READ;
-        break;
-    case Write:
-        pFlags = SSH_FXF_WRITE | SSH_FXF_CREAT;
-        switch (mode) {
-        case SftpOverwriteExisting: pFlags |= SSH_FXF_TRUNC; break;
-        case SftpAppendToExisting: pFlags |= SSH_FXF_APPEND; break;
-        case SftpSkipExisting: pFlags |= SSH_FXF_EXCL; break;
-        }
-        break;
-    }
-
-    init(SSH_FXP_OPEN, requestId).appendString(path).appendInt(pFlags);
-    foreach (const quint32 attribute, attributes)
-        appendInt(attribute);
-    return finalize();
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::init(SftpPacketType type,
-    quint32 requestId)
-{
-    m_data.resize(TypeOffset + 1);
-    m_data[TypeOffset] = type;
-    if (type != SSH_FXP_INIT) {
-        appendInt(requestId);
-        qCDebug(sshLog, "Generating SFTP packet of type %d with request id %u", type, requestId);
-    }
-    return *this;
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::appendInt(quint32 val)
-{
-    m_data.append(AbstractSshPacket::encodeInt(val));
-    return *this;
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::appendInt64(quint64 value)
-{
-    m_data.append(AbstractSshPacket::encodeInt(value));
-    return *this;
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::appendString(const QString &string)
-{
-    m_data.append(AbstractSshPacket::encodeString(string.toUtf8()));
-    return *this;
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::appendString(const QByteArray &string)
-{
-    m_data += AbstractSshPacket::encodeString(string);
-    return *this;
-}
-
-SftpOutgoingPacket &SftpOutgoingPacket::finalize()
-{
-    AbstractSshPacket::setLengthField(m_data);
-    return *this;
-}
-
-const quint32 SftpOutgoingPacket::DefaultPermissions = std::numeric_limits<quint32>::max();
-
-} // namespace Internal
-} // namespace QSsh

client/3rd/QtSsh/src/ssh/sftpoutgoingpacket_p.h

@@ -1,92 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#ifndef SFTPOUTGOINGPACKET_P_H
-#define SFTPOUTGOINGPACKET_P_H
-
-#include "sftppacket_p.h"
-#include "sftpdefs.h"
-
-namespace QSsh {
-namespace Internal {
-
-class SftpOutgoingPacket : public AbstractSftpPacket
-{
-public:
-    SftpOutgoingPacket();
-    SftpOutgoingPacket &generateInit(quint32 version);
-    SftpOutgoingPacket &generateStat(const QString &path, quint32 requestId);
-    SftpOutgoingPacket &generateOpenDir(const QString &path, quint32 requestId);
-    SftpOutgoingPacket &generateReadDir(const QByteArray &handle,
-        quint32 requestId);
-    SftpOutgoingPacket &generateCloseHandle(const QByteArray &handle,
-        quint32 requestId);
-    SftpOutgoingPacket &generateMkDir(const QString &path, quint32 requestId);
-    SftpOutgoingPacket &generateRmDir(const QString &path, quint32 requestId);
-    SftpOutgoingPacket &generateRm(const QString &path, quint32 requestId);
-    SftpOutgoingPacket &generateRename(const QString &oldPath,
-        const QString &newPath, quint32 requestId);
-    SftpOutgoingPacket &generateOpenFileForWriting(const QString &path,
-         SftpOverwriteMode mode, quint32 permissions, quint32 requestId);
-    SftpOutgoingPacket &generateOpenFileForReading(const QString &path,
-        quint32 requestId);
-    SftpOutgoingPacket &generateReadFile(const QByteArray &handle,
-        quint64 offset, quint32 length, quint32 requestId);
-    SftpOutgoingPacket &generateFstat(const QByteArray &handle,
-        quint32 requestId);
-    SftpOutgoingPacket &generateWriteFile(const QByteArray &handle,
-        quint64 offset, const QByteArray &data, quint32 requestId);
-
-    // Note: OpenSSH's SFTP server has a bug that reverses the filePath and target
-    //       arguments, so this operation is not portable.
-    SftpOutgoingPacket &generateCreateLink(const QString &filePath, const QString &target,
-        quint32 requestId);
-
-    static const quint32 DefaultPermissions;
-
-private:
-    static QByteArray encodeString(const QString &string);
-
-    enum OpenType { Read, Write };
-    SftpOutgoingPacket &generateOpenFile(const QString &path, OpenType openType,
-        SftpOverwriteMode mode, const QList<quint32> &attributes, quint32 requestId);
-
-    SftpOutgoingPacket &init(SftpPacketType type, quint32 requestId);
-    SftpOutgoingPacket &appendInt(quint32 value);
-    SftpOutgoingPacket &appendInt64(quint64 value);
-    SftpOutgoingPacket &appendString(const QString &string);
-    SftpOutgoingPacket &appendString(const QByteArray &string);
-    SftpOutgoingPacket &finalize();
-};
-
-} // namespace Internal
-} // namespace QSsh
-
-#endif // SFTPOUTGOINGPACKET_P_H

client/3rd/QtSsh/src/ssh/sftppacket.cpp

@@ -1,57 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#include "sftppacket_p.h"
-
-#include "sshpacketparser_p.h"
-
-namespace QSsh {
-namespace Internal {
-
-// There's no "standard" or negotiation between server and client for this, so
-// just use the same as openssh's sftp implementation
-const quint32 AbstractSftpPacket::MaxDataSize = 32768;
-const quint32 AbstractSftpPacket::MaxPacketSize = 256 * 1024;
-
-const int AbstractSftpPacket::TypeOffset = 4;
-const int AbstractSftpPacket::RequestIdOffset = TypeOffset + 1;
-const int AbstractSftpPacket::PayloadOffset = RequestIdOffset + 4;
-
-AbstractSftpPacket::AbstractSftpPacket()
-{
-}
-
-quint32 AbstractSftpPacket::requestId() const
-{
-    return SshPacketParser::asUint32(m_data, RequestIdOffset);
-}
-
-} // namespace Internal
-} // namespace QSsh

client/3rd/QtSsh/src/ssh/sftppacket_p.h

@@ -1,117 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#ifndef SFTPPACKET_P_H
-#define SFTPPACKET_P_H
-
-#include <QByteArray>
-#include <QList>
-#include <QString>
-
-namespace QSsh {
-namespace Internal {
-
-enum SftpPacketType {
-    SSH_FXP_INIT = 1,
-    SSH_FXP_VERSION = 2,
-    SSH_FXP_OPEN = 3,
-    SSH_FXP_CLOSE = 4,
-    SSH_FXP_READ = 5,
-    SSH_FXP_WRITE = 6,
-    SSH_FXP_LSTAT = 7,
-    SSH_FXP_FSTAT = 8,
-    SSH_FXP_SETSTAT = 9,
-    SSH_FXP_FSETSTAT = 10,
-    SSH_FXP_OPENDIR = 11,
-    SSH_FXP_READDIR = 12,
-    SSH_FXP_REMOVE = 13,
-    SSH_FXP_MKDIR = 14,
-    SSH_FXP_RMDIR = 15,
-    SSH_FXP_REALPATH = 16,
-    SSH_FXP_STAT = 17,
-    SSH_FXP_RENAME = 18,
-    SSH_FXP_READLINK = 19,
-    SSH_FXP_SYMLINK = 20, // Removed from later protocol versions. Try not to use.
-
-    SSH_FXP_STATUS = 101,
-    SSH_FXP_HANDLE = 102,
-    SSH_FXP_DATA = 103,
-    SSH_FXP_NAME = 104,
-    SSH_FXP_ATTRS = 105,
-
-    SSH_FXP_EXTENDED = 200,
-    SSH_FXP_EXTENDED_REPLY = 201
-};
-
-enum SftpStatusCode {
-    SSH_FX_OK = 0,
-    SSH_FX_EOF = 1,
-    SSH_FX_NO_SUCH_FILE = 2,
-    SSH_FX_PERMISSION_DENIED = 3,
-    SSH_FX_FAILURE = 4,
-    SSH_FX_BAD_MESSAGE = 5,
-    SSH_FX_NO_CONNECTION = 6,
-    SSH_FX_CONNECTION_LOST = 7,
-    SSH_FX_OP_UNSUPPORTED = 8
-};
-
-enum SftpAttributeType {
-    SSH_FILEXFER_ATTR_SIZE = 0x00000001,
-    SSH_FILEXFER_ATTR_UIDGID = 0x00000002,
-    SSH_FILEXFER_ATTR_PERMISSIONS = 0x00000004,
-    SSH_FILEXFER_ATTR_ACMODTIME = 0x00000008,
-    SSH_FILEXFER_ATTR_EXTENDED = 0x80000000
-};
-
-class AbstractSftpPacket
-{
-public:
-    AbstractSftpPacket();
-    quint32 requestId() const;
-    const QByteArray &rawData() const { return m_data; }
-    SftpPacketType type() const { return static_cast<SftpPacketType>(m_data.at(TypeOffset)); }
-
-    static const quint32 MaxDataSize; // "Pure" data size per read/writepacket.
-    static const quint32 MaxPacketSize;
-
-protected:
-    quint32 dataSize() const { return static_cast<quint32>(m_data.size()); }
-
-    static const int TypeOffset;
-    static const int RequestIdOffset;
-    static const int PayloadOffset;
-
-    QByteArray m_data;
-};
-
-} // namespace Internal
-} // namespace QSsh
-
-#endif // SFTPPACKET_P_H

client/3rd/QtSsh/src/ssh/ssh_global.h

@@ -1,54 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#ifndef SSH_GLOBAL_H
-#define SSH_GLOBAL_H
-
-#include <QtGlobal>
-
-#ifdef _MSC_VER
-// For static cmake building removing dll export/import
-#  define QSSH_EXPORT
-#else
-
-#if defined(QTCSSH_LIBRARY)
-#  define QSSH_EXPORT Q_DECL_EXPORT
-#else
-#  define QSSH_EXPORT Q_DECL_IMPORT
-#endif
-
-#endif
-
-#define QSSH_PRINT_WARNING qWarning("Soft assert at %s:%d", __FILE__, __LINE__)
-#define QSSH_ASSERT(cond) do { if (!(cond)) { QSSH_PRINT_WARNING; } } while (false)
-#define QSSH_ASSERT_AND_RETURN(cond) do { if (!(cond)) { QSSH_PRINT_WARNING; return; } } while (false)
-#define QSSH_ASSERT_AND_RETURN_VALUE(cond, value) do { if (!(cond)) { QSSH_PRINT_WARNING; return value; } } while (false)
-
-#endif // SSH_GLOBAL_H

client/3rd/QtSsh/src/ssh/sshagent.cpp

@@ -1,313 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-#include "sshagent_p.h"
-
-#include "sshlogging_p.h"
-#include "sshpacket_p.h"
-#include "sshpacketparser_p.h"
-#include "ssh_global.h"
-
-#include <QTimer>
-#include <QtEndian>
-
-#include <algorithm>
-
-namespace QSsh {
-namespace Internal {
-
-// https://github.com/openssh/openssh-portable/blob/V_7_2/PROTOCOL.agent
-enum PacketType {
-    SSH_AGENT_FAILURE = 5,
-    SSH2_AGENTC_REQUEST_IDENTITIES = 11,
-    SSH2_AGENTC_SIGN_REQUEST = 13,
-    SSH2_AGENT_IDENTITIES_ANSWER = 12,
-    SSH2_AGENT_SIGN_RESPONSE = 14,
-};
-
-// TODO: Remove once we require 5.7, where the endianness functions have a sane input type.
-template<typename T> static T fromBigEndian(const QByteArray &ba)
-{
-    return qFromBigEndian<T>(reinterpret_cast<const uchar *>(ba.constData()));
-}
-
-void SshAgent::refreshKeysImpl()
-{
-    if (state() != Connected)
-        return;
-    const auto keysRequestIt = std::find_if(m_pendingRequests.constBegin(),
-            m_pendingRequests.constEnd(), [](const Request &r) { return r.isKeysRequest(); });
-    if (keysRequestIt != m_pendingRequests.constEnd()) {
-        qCDebug(sshLog) << "keys request already pending, not adding another one";
-        return;
-    }
-    qCDebug(sshLog) << "queueing keys request";
-    m_pendingRequests << Request();
-    sendNextRequest();
-}
-
-void SshAgent::requestSignatureImpl(const QByteArray &key, uint token)
-{
-    if (state() != Connected)
-        return;
-    const QByteArray data = m_dataToSign.take(qMakePair(key, token));
-    QSSH_ASSERT(!data.isEmpty());
-    qCDebug(sshLog) << "queueing signature request";
-    m_pendingRequests.enqueue(Request(key, data, token));
-    sendNextRequest();
-}
-
-void SshAgent::sendNextRequest()
-{
-    if (m_pendingRequests.isEmpty())
-        return;
-    if (m_outgoingPacket.isComplete())
-        return;
-    if (hasError())
-        return;
-    const Request &request = m_pendingRequests.head();
-    m_outgoingPacket = request.isKeysRequest() ? generateKeysPacket() : generateSigPacket(request);
-    sendPacket();
-}
-
-SshAgent::Packet SshAgent::generateKeysPacket()
-{
-    qCDebug(sshLog) << "requesting keys from agent";
-    Packet p;
-    p.size = 1;
-    p.data += char(SSH2_AGENTC_REQUEST_IDENTITIES);
-    return p;
-}
-
-SshAgent::Packet SshAgent::generateSigPacket(const SshAgent::Request &request)
-{
-    qCDebug(sshLog) << "requesting signature from agent for key" << request.key << "and token"
-                    << request.token;
-    Packet p;
-    p.data += char(SSH2_AGENTC_SIGN_REQUEST);
-    p.data += AbstractSshPacket::encodeString(request.key);
-    p.data += AbstractSshPacket::encodeString(request.dataToSign);
-    p.data += AbstractSshPacket::encodeInt(quint32(0));
-    p.size = p.data.count();
-    return p;
-}
-
-SshAgent::~SshAgent()
-{
-    m_agentSocket.disconnect(this);
-}
-
-void SshAgent::storeDataToSign(const QByteArray &key, const QByteArray &data, uint token)
-{
-    instance().m_dataToSign.insert(qMakePair(key, token), data);
-}
-
-void SshAgent::removeDataToSign(const QByteArray &key, uint token)
-{
-    instance().m_dataToSign.remove(qMakePair(key, token));
-}
-
-SshAgent &QSsh::Internal::SshAgent::instance()
-{
-    static SshAgent agent;
-    return agent;
-}
-
-SshAgent::SshAgent()
-{
-    connect(&m_agentSocket, &QLocalSocket::connected, this, &SshAgent::handleConnected);
-    connect(&m_agentSocket, &QLocalSocket::disconnected, this, &SshAgent::handleDisconnected);
-    connect(&m_agentSocket, SIGNAL(error(QAbstractSocket::SocketError)), this,
-        SLOT(handleSocketError()));
-    connect(&m_agentSocket, &QLocalSocket::readyRead, this, &SshAgent::handleIncomingData);
-    QTimer::singleShot(0, this, &SshAgent::connectToServer);
-}
-
-void SshAgent::connectToServer()
-{
-    const QByteArray serverAddress = qgetenv("SSH_AUTH_SOCK");
-    if (serverAddress.isEmpty()) {
-        qCDebug(sshLog) << "agent failure: socket address unknown";
-        m_error = tr("Cannot connect to ssh-agent: SSH_AUTH_SOCK is not set.");
-        emit errorOccurred();
-        return;
-    }
-    qCDebug(sshLog) << "connecting to ssh-agent socket" << serverAddress;
-    m_state = Connecting;
-    m_agentSocket.connectToServer(QString::fromLocal8Bit(serverAddress));
-}
-
-void SshAgent::handleConnected()
-{
-    m_state = Connected;
-    qCDebug(sshLog) << "connection to ssh-agent established";
-    refreshKeys();
-}
-
-void SshAgent::handleDisconnected()
-{
-    qCDebug(sshLog) << "lost connection to ssh-agent";
-    m_error = tr("Lost connection to ssh-agent for unknown reason.");
-    setDisconnected();
-}
-
-void SshAgent::handleSocketError()
-{
-    qCDebug(sshLog) << "agent socket error" << m_agentSocket.error();
-    m_error = m_agentSocket.errorString();
-    setDisconnected();
-}
-
-void SshAgent::handleIncomingData()
-{
-    qCDebug(sshLog) << "getting data from agent";
-    m_incomingData += m_agentSocket.readAll();
-    while (!hasError() && !m_incomingData.isEmpty()) {
-        if (m_incomingPacket.size == 0) {
-            if (m_incomingData.count() < int(sizeof m_incomingPacket.size))
-                break;
-            m_incomingPacket.size = fromBigEndian<quint32>(m_incomingData);
-            m_incomingData.remove(0, sizeof m_incomingPacket.size);
-        }
-        const int bytesToTake = qMin<quint32>(m_incomingPacket.size - m_incomingPacket.data.count(),
-                                              m_incomingData.count());
-        m_incomingPacket.data += m_incomingData.left(bytesToTake);
-        m_incomingData.remove(0, bytesToTake);
-        if (m_incomingPacket.isComplete())
-            handleIncomingPacket();
-        else
-            break;
-    }
-}
-
-void SshAgent::handleIncomingPacket()
-{
-    try {
-        qCDebug(sshLog) << "received packet from agent:" << m_incomingPacket.data.toHex();
-        const char messageType = m_incomingPacket.data.at(0);
-        switch (messageType) {
-        case SSH2_AGENT_IDENTITIES_ANSWER:
-            handleIdentitiesPacket();
-            break;
-        case SSH2_AGENT_SIGN_RESPONSE:
-            handleSignaturePacket();
-            break;
-        case SSH_AGENT_FAILURE:
-            if (m_pendingRequests.isEmpty()) {
-                qCWarning(sshLog) << "unexpected failure message from agent";
-            } else {
-                const Request request = m_pendingRequests.dequeue();
-                if (request.isSignatureRequest()) {
-                    qCWarning(sshLog) << "agent failed to sign message for key"
-                                      << request.key.toHex();
-                    emit signatureAvailable(request.key, QByteArray(), request.token);
-                } else {
-                    qCWarning(sshLog) << "agent failed to retrieve key list";
-                    if (m_keys.isEmpty()) {
-                        m_error = tr("ssh-agent failed to retrieve keys.");
-                        setDisconnected();
-                    }
-                }
-            }
-            break;
-        default:
-            qCWarning(sshLog) << "unexpected message type from agent:" << messageType;
-        }
-    } catch (const SshPacketParseException &) {
-        qCWarning(sshLog()) << "received malformed packet from agent";
-        handleProtocolError();
-    }
-    m_incomingPacket.invalidate();
-    m_incomingPacket.size = 0;
-    m_outgoingPacket.invalidate();
-    sendNextRequest();
-}
-
-void SshAgent::handleIdentitiesPacket()
-{
-    qCDebug(sshLog) << "got keys packet from agent";
-    if (m_pendingRequests.isEmpty() || !m_pendingRequests.dequeue().isKeysRequest()) {
-        qCDebug(sshLog) << "packet was not requested";
-        handleProtocolError();
-        return;
-    }
-    quint32 offset = 1;
-    const auto keyCount = SshPacketParser::asUint32(m_incomingPacket.data, &offset);
-    qCDebug(sshLog) << "packet contains" << keyCount << "keys";
-    QList<QByteArray> newKeys;
-    for (quint32 i = 0; i < keyCount; ++i) {
-        const QByteArray key = SshPacketParser::asString(m_incomingPacket.data, &offset);
-        quint32 keyOffset = 0;
-        const QByteArray algoName = SshPacketParser::asString(key, &keyOffset);
-        SshPacketParser::asString(key, &keyOffset); // rest of key blob
-        SshPacketParser::asString(m_incomingPacket.data, &offset); // comment
-        qCDebug(sshLog) << "adding key of type" << algoName;
-        newKeys << key;
-    }
-
-    m_keys = newKeys;
-    emit keysUpdated();
-}
-
-void SshAgent::handleSignaturePacket()
-{
-    qCDebug(sshLog) << "got signature packet from agent";
-    if (m_pendingRequests.isEmpty()) {
-        qCDebug(sshLog) << "signature packet was not requested";
-        handleProtocolError();
-        return;
-    }
-    const Request request = m_pendingRequests.dequeue();
-    if (!request.isSignatureRequest()) {
-        qCDebug(sshLog) << "signature packet was not requested";
-        handleProtocolError();
-        return;
-    }
-    const QByteArray signature = SshPacketParser::asString(m_incomingPacket.data, 1);
-    qCDebug(sshLog) << "signature for key" << request.key.toHex() << "is" << signature.toHex();
-    emit signatureAvailable(request.key, signature, request.token);
-}
-
-void SshAgent::handleProtocolError()
-{
-    m_error = tr("Protocol error when talking to ssh-agent.");
-    setDisconnected();
-}
-
-void SshAgent::setDisconnected()
-{
-    m_state = Unconnected;
-    m_agentSocket.disconnect(this);
-    emit errorOccurred();
-}
-
-void SshAgent::sendPacket()
-{
-    const quint32 sizeMsb = qToBigEndian(m_outgoingPacket.size);
-    m_agentSocket.write(reinterpret_cast<const char *>(&sizeMsb), sizeof sizeMsb);
-    m_agentSocket.write(m_outgoingPacket.data);
-}
-
-} // namespace Internal
-} // namespace QSsh

client/3rd/QtSsh/src/ssh/sshagent_p.h

@@ -1,125 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#pragma once
-
-#include <QByteArray>
-#include <QHash>
-#include <QList>
-#include <QLocalSocket>
-#include <QObject>
-#include <QPair>
-#include <QQueue>
-#include <QString>
-
-namespace QSsh {
-namespace Internal {
-
-class SshAgent : public QObject
-{
-    Q_OBJECT
-public:
-    enum State { Unconnected, Connecting, Connected, };
-
-    ~SshAgent();
-    static State state() { return instance().m_state; }
-    static bool hasError() { return !instance().m_error.isEmpty(); }
-    static QString errorString() { return instance().m_error; }
-    static QList<QByteArray> publicKeys() { return instance().m_keys; }
-
-    static void refreshKeys() { instance().refreshKeysImpl(); }
-    static void storeDataToSign(const QByteArray &key, const QByteArray &data, uint token);
-    static void removeDataToSign(const QByteArray &key, uint token);
-    static void requestSignature(const QByteArray &key, uint token) {
-        instance().requestSignatureImpl(key, token);
-    }
-
-    static SshAgent &instance();
-
-signals:
-    void errorOccurred();
-    void keysUpdated();
-
-    // Empty signature means signing failure.
-    void signatureAvailable(const QByteArray &key, const QByteArray &signature, uint token);
-
-private:
-    struct Request {
-        Request() { }
-        Request(const QByteArray &k, const QByteArray &d, uint t)
-            : key(k), dataToSign(d), token(t) { }
-
-        bool isKeysRequest() const { return !isSignatureRequest(); }
-        bool isSignatureRequest() const { return !key.isEmpty(); }
-
-        QByteArray key;
-        QByteArray dataToSign;
-        uint token = 0;
-    };
-
-    struct Packet {
-        bool isComplete() const { return size != 0 && int(size) == data.count(); }
-        void invalidate() { size = 0; data.clear(); }
-
-        quint32 size = 0;
-        QByteArray data;
-    };
-
-    SshAgent();
-    void connectToServer();
-    void refreshKeysImpl();
-    void requestSignatureImpl(const QByteArray &key, uint token);
-
-    void sendNextRequest();
-    Packet generateKeysPacket();
-    Packet generateSigPacket(const Request &request);
-
-    void handleConnected();
-    void handleDisconnected();
-    void handleSocketError();
-    void handleIncomingData();
-    void handleIncomingPacket();
-    void handleIdentitiesPacket();
-    void handleSignaturePacket();
-
-    void handleProtocolError();
-    void setDisconnected();
-
-    void sendPacket();
-
-    State m_state = Unconnected;
-    QString m_error;
-    QList<QByteArray> m_keys;
-    QHash<QPair<QByteArray, uint>, QByteArray> m_dataToSign;
-    QLocalSocket m_agentSocket;
-    QByteArray m_incomingData;
-    Packet m_incomingPacket;
-    Packet m_outgoingPacket;
-
-    QQueue<Request> m_pendingRequests;
-};
-
-} // namespace Internal
-} // namespace QSsh

client/3rd/QtSsh/src/ssh/sshbotanconversions_p.h

@@ -1,172 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#ifndef BYTEARRAYCONVERSIONS_P_H
-#define BYTEARRAYCONVERSIONS_P_H
-
-#include "sshcapabilities_p.h"
-#include "sshexception_p.h"
-
-#include <botan_all.h>
-
-namespace QSsh {
-namespace Internal {
-
-inline const Botan::byte *convertByteArray(const QByteArray &a)
-{
-    return reinterpret_cast<const Botan::byte *>(a.constData());
-}
-
-inline Botan::byte *convertByteArray(QByteArray &a)
-{
-    return reinterpret_cast<Botan::byte *>(a.data());
-}
-
-inline QByteArray convertByteArray(const Botan::secure_vector<Botan::byte> &v)
-{
-    return QByteArray(reinterpret_cast<const char *>(v.data()), static_cast<int>(v.size()));
-}
-
-inline QByteArray convertByteArray(const std::vector<uint8_t> &v)
-{
-    return QByteArray(reinterpret_cast<const char *>(v.data()), v.size());
-}
-
-inline const char *botanKeyExchangeAlgoName(const QByteArray &rfcAlgoName)
-{
-    if (rfcAlgoName == SshCapabilities::DiffieHellmanGroup1Sha1)
-        return "modp/ietf/1024";
-    if (rfcAlgoName == SshCapabilities::DiffieHellmanGroup14Sha1)
-        return "modp/ietf/2048";
-    if (rfcAlgoName == SshCapabilities::EcdhNistp256)
-        return "secp256r1";
-    if (rfcAlgoName == SshCapabilities::EcdhNistp384)
-        return "secp384r1";
-    if (rfcAlgoName == SshCapabilities::EcdhNistp521)
-        return "secp521r1";
-    throw SshClientException(SshInternalError, SSH_TR("Unexpected key exchange algorithm \"%1\"")
-                             .arg(QString::fromLatin1(rfcAlgoName)));
-}
-
-inline const char *botanCipherAlgoName(const QByteArray &rfcAlgoName)
-{
-
-    if (rfcAlgoName == SshCapabilities::CryptAlgoAes128Cbc) {
-        return "CBC(AES-128)";
-    }
-    if (rfcAlgoName == SshCapabilities::CryptAlgoAes128Ctr) {
-        return "CTR(AES-128)";
-    }
-    if (rfcAlgoName == SshCapabilities::CryptAlgo3DesCbc) {
-        return "CBC(TripleDES)";
-    }
-    if (rfcAlgoName == SshCapabilities::CryptAlgo3DesCtr) {
-        return "CTR(TripleDES)";
-    }
-    if (rfcAlgoName == SshCapabilities::CryptAlgoAes192Ctr) {
-        return "CBR(AES-192)";
-    }
-    if (rfcAlgoName == SshCapabilities::CryptAlgoAes256Ctr) {
-        return "CTR(AES-256)";
-    }
-    throw SshClientException(SshInternalError, SSH_TR("Unexpected cipher \"%1\"")
-                             .arg(QString::fromLatin1(rfcAlgoName)));
-}
-
-
-inline const char *botanCryptAlgoName(const QByteArray &rfcAlgoName)
-{
-
-    if (rfcAlgoName == SshCapabilities::CryptAlgoAes128Cbc
-            || rfcAlgoName == SshCapabilities::CryptAlgoAes128Ctr) {
-        return "AES-128";
-    }
-    if (rfcAlgoName == SshCapabilities::CryptAlgo3DesCbc
-            || rfcAlgoName == SshCapabilities::CryptAlgo3DesCtr) {
-        return "TripleDES";
-    }
-    if (rfcAlgoName == SshCapabilities::CryptAlgoAes192Ctr) {
-        return "AES-192";
-    }
-    if (rfcAlgoName == SshCapabilities::CryptAlgoAes256Ctr) {
-        return "AES-256";
-    }
-    throw SshClientException(SshInternalError, SSH_TR("Unexpected cipher \"%1\"")
-                             .arg(QString::fromLatin1(rfcAlgoName)));
-}
-
-inline const char *botanEmsaAlgoName(const QByteArray &rfcAlgoName)
-{
-    if (rfcAlgoName == SshCapabilities::PubKeyDss)
-        return "EMSA1(SHA-1)";
-    if (rfcAlgoName == SshCapabilities::PubKeyRsa)
-        return "EMSA3(SHA-1)";
-    if (rfcAlgoName == SshCapabilities::PubKeyEcdsa256)
-        return "EMSA1(SHA-256)";
-    if (rfcAlgoName == SshCapabilities::PubKeyEcdsa384)
-        return "EMSA1_BSI(SHA-384)";
-    if (rfcAlgoName == SshCapabilities::PubKeyEcdsa521)
-        return "EMSA1_BSI(SHA-512)";
-    throw SshClientException(SshInternalError, SSH_TR("Unexpected host key algorithm \"%1\"")
-                             .arg(QString::fromLatin1(rfcAlgoName)));
-}
-
-inline const char *botanHMacAlgoName(const QByteArray &rfcAlgoName)
-{
-    if (rfcAlgoName == SshCapabilities::HMacSha1)
-        return "SHA-1";
-    if (rfcAlgoName == SshCapabilities::HMacSha256)
-        return "SHA-256";
-    if (rfcAlgoName == SshCapabilities::HMacSha384)
-        return "SHA-384";
-    if (rfcAlgoName == SshCapabilities::HMacSha512)
-        return "SHA-512";
-    throw SshClientException(SshInternalError, SSH_TR("Unexpected hashing algorithm \"%1\"")
-                             .arg(QString::fromLatin1(rfcAlgoName)));
-}
-
-inline quint32 botanHMacKeyLen(const QByteArray &rfcAlgoName)
-{
-    if (rfcAlgoName == SshCapabilities::HMacSha1)
-        return 20;
-    if (rfcAlgoName == SshCapabilities::HMacSha256)
-        return 32;
-    if (rfcAlgoName == SshCapabilities::HMacSha384)
-        return 48;
-    if (rfcAlgoName == SshCapabilities::HMacSha512)
-        return 64;
-    throw SshClientException(SshInternalError, SSH_TR("Unexpected hashing algorithm \"%1\"")
-                             .arg(QString::fromLatin1(rfcAlgoName)));
-}
-
-} // namespace Internal
-} // namespace QSsh
-
-#endif // BYTEARRAYCONVERSIONS_P_H

client/3rd/QtSsh/src/ssh/sshcapabilities.cpp

@@ -1,177 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#include "sshcapabilities_p.h"
-
-#include "sshexception_p.h"
-
-#include <QCoreApplication>
-#include <QString>
-
-namespace QSsh {
-namespace Internal {
-
-namespace {
-    QByteArray listAsByteArray(const QList<QByteArray> &list)
-    {
-        QByteArray array;
-        foreach(const QByteArray &elem, list)
-            array += elem + ',';
-        if (!array.isEmpty())
-            array.remove(array.count() - 1, 1);
-        return array;
-    }
-} // anonymous namspace
-
-const QByteArray SshCapabilities::DiffieHellmanGroup1Sha1("diffie-hellman-group1-sha1");
-const QByteArray SshCapabilities::DiffieHellmanGroup14Sha1("diffie-hellman-group14-sha1");
-const QByteArray SshCapabilities::EcdhKexNamePrefix("ecdh-sha2-nistp");
-const QByteArray SshCapabilities::EcdhNistp256 = EcdhKexNamePrefix + "256";
-const QByteArray SshCapabilities::EcdhNistp384 = EcdhKexNamePrefix + "384";
-const QByteArray SshCapabilities::EcdhNistp521 = EcdhKexNamePrefix + "521";
-const QList<QByteArray> SshCapabilities::KeyExchangeMethods = QList<QByteArray>()
-        << SshCapabilities::EcdhNistp256
-        << SshCapabilities::EcdhNistp384
-        << SshCapabilities::EcdhNistp521
-        << SshCapabilities::DiffieHellmanGroup1Sha1
-        << SshCapabilities::DiffieHellmanGroup14Sha1;
-
-const QByteArray SshCapabilities::PubKeyDss("ssh-dss");
-const QByteArray SshCapabilities::PubKeyRsa("ssh-rsa");
-const QByteArray SshCapabilities::PubKeyEcdsaPrefix("ecdsa-sha2-nistp");
-const QByteArray SshCapabilities::PubKeyEcdsa256 = SshCapabilities::PubKeyEcdsaPrefix + "256";
-const QByteArray SshCapabilities::PubKeyEcdsa384 = SshCapabilities::PubKeyEcdsaPrefix + "384";
-const QByteArray SshCapabilities::PubKeyEcdsa521 = SshCapabilities::PubKeyEcdsaPrefix + "521";
-const QList<QByteArray> SshCapabilities::PublicKeyAlgorithms = QList<QByteArray>()
-        << SshCapabilities::PubKeyEcdsa256
-        << SshCapabilities::PubKeyEcdsa384
-        << SshCapabilities::PubKeyEcdsa521
-        << SshCapabilities::PubKeyRsa
-        << SshCapabilities::PubKeyDss;
-
-const QByteArray SshCapabilities::CryptAlgo3DesCbc("3des-cbc");
-const QByteArray SshCapabilities::CryptAlgo3DesCtr("3des-ctr");
-const QByteArray SshCapabilities::CryptAlgoAes128Cbc("aes128-cbc");
-const QByteArray SshCapabilities::CryptAlgoAes128Ctr("aes128-ctr");
-const QByteArray SshCapabilities::CryptAlgoAes192Ctr("aes192-ctr");
-const QByteArray SshCapabilities::CryptAlgoAes256Ctr("aes256-ctr");
-const QList<QByteArray> SshCapabilities::EncryptionAlgorithms
-    = QList<QByteArray>() << SshCapabilities::CryptAlgoAes256Ctr
-                          << SshCapabilities::CryptAlgoAes192Ctr
-                          << SshCapabilities::CryptAlgoAes128Ctr
-                          << SshCapabilities::CryptAlgo3DesCtr
-                          << SshCapabilities::CryptAlgoAes128Cbc
-                          << SshCapabilities::CryptAlgo3DesCbc;
-
-const QByteArray SshCapabilities::HMacSha1("hmac-sha1");
-const QByteArray SshCapabilities::HMacSha196("hmac-sha1-96");
-const QByteArray SshCapabilities::HMacSha256("hmac-sha2-256");
-const QByteArray SshCapabilities::HMacSha384("hmac-sha2-384");
-const QByteArray SshCapabilities::HMacSha512("hmac-sha2-512");
-const QList<QByteArray> SshCapabilities::MacAlgorithms
-    = QList<QByteArray>() /* << SshCapabilities::HMacSha196 */
-        << SshCapabilities::HMacSha256
-        << SshCapabilities::HMacSha384
-        << SshCapabilities::HMacSha512
-        << SshCapabilities::HMacSha1;
-
-const QList<QByteArray> SshCapabilities::CompressionAlgorithms
-    = QList<QByteArray>() << "none";
-
-const QByteArray SshCapabilities::SshConnectionService("ssh-connection");
-
-QList<QByteArray> SshCapabilities::commonCapabilities(const QList<QByteArray> &myCapabilities,
-                                               const QList<QByteArray> &serverCapabilities, const QByteArray &group)
-{
-    QList<QByteArray> capabilities;
-    foreach (const QByteArray &myCapability, myCapabilities) {
-        if (serverCapabilities.contains(myCapability))
-            capabilities << myCapability;
-    }
-
-    if (!capabilities.isEmpty())
-        return capabilities;
-
-    throw SshServerException(SSH_DISCONNECT_KEY_EXCHANGE_FAILED,
-        "Server and client capabilities do not match.",
-        QCoreApplication::translate("SshConnection",
-            "Server and client %1 capabilities don't match.\n"
-            "Client list: %2\n"
-            "Server list: %3")
-            .arg(QString::fromLatin1(group))
-            .arg(QString::fromLocal8Bit(listAsByteArray(myCapabilities).data()))
-            .arg(QString::fromLocal8Bit(listAsByteArray(serverCapabilities).data())));
-
-}
-
-QByteArray SshCapabilities::findBestMatch(const QList<QByteArray> &myCapabilities,
-    const QList<QByteArray> &serverCapabilities, const QByteArray &group)
-{
-    return commonCapabilities(myCapabilities, serverCapabilities, group).first();
-}
-
-int SshCapabilities::ecdsaIntegerWidthInBytes(const QByteArray &ecdsaAlgo)
-{
-    if (ecdsaAlgo == PubKeyEcdsa256)
-        return 32;
-    if (ecdsaAlgo == PubKeyEcdsa384)
-        return 48;
-    if (ecdsaAlgo == PubKeyEcdsa521)
-        return 66;
-    throw SshClientException(SshInternalError, SSH_TR("Unexpected ecdsa algorithm \"%1\"")
-                             .arg(QString::fromLatin1(ecdsaAlgo)));
-}
-
-QByteArray SshCapabilities::ecdsaPubKeyAlgoForKeyWidth(int keyWidthInBytes)
-{
-    if (keyWidthInBytes <= 32)
-        return PubKeyEcdsa256;
-    if (keyWidthInBytes <= 48)
-        return PubKeyEcdsa384;
-    if (keyWidthInBytes <= 66)
-        return PubKeyEcdsa521;
-    throw SshClientException(SshInternalError, SSH_TR("Unexpected ecdsa key size (%1 bytes)")
-                             .arg(keyWidthInBytes));
-}
-
-const char *SshCapabilities::oid(const QByteArray &ecdsaAlgo)
-{
-    if (ecdsaAlgo == PubKeyEcdsa256)
-        return "secp256r1";
-    if (ecdsaAlgo == PubKeyEcdsa384)
-        return "secp384r1";
-    if (ecdsaAlgo == PubKeyEcdsa521)
-        return "secp521r1";
-    throw SshClientException(SshInternalError, SSH_TR("Unexpected ecdsa algorithm \"%1\"")
-                             .arg(QString::fromLatin1(ecdsaAlgo)));
-}
-
-} // namespace Internal
-} // namespace QSsh

client/3rd/QtSsh/src/ssh/sshcapabilities_p.h

@@ -1,91 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#ifndef CAPABILITIES_P_H
-#define CAPABILITIES_P_H
-
-#include <QByteArray>
-#include <QList>
-
-namespace QSsh {
-namespace Internal {
-
-class SshCapabilities
-{
-public:
-    static const QByteArray DiffieHellmanGroup1Sha1;
-    static const QByteArray DiffieHellmanGroup14Sha1;
-    static const QByteArray EcdhKexNamePrefix;
-    static const QByteArray EcdhNistp256;
-    static const QByteArray EcdhNistp384;
-    static const QByteArray EcdhNistp521; // sic
-    static const QList<QByteArray> KeyExchangeMethods;
-
-    static const QByteArray PubKeyDss;
-    static const QByteArray PubKeyRsa;
-    static const QByteArray PubKeyEcdsaPrefix;
-    static const QByteArray PubKeyEcdsa256;
-    static const QByteArray PubKeyEcdsa384;
-    static const QByteArray PubKeyEcdsa521;
-    static const QList<QByteArray> PublicKeyAlgorithms;
-
-    static const QByteArray CryptAlgo3DesCbc;
-    static const QByteArray CryptAlgo3DesCtr;
-    static const QByteArray CryptAlgoAes128Cbc;
-    static const QByteArray CryptAlgoAes128Ctr;
-    static const QByteArray CryptAlgoAes192Ctr;
-    static const QByteArray CryptAlgoAes256Ctr;
-    static const QList<QByteArray> EncryptionAlgorithms;
-
-    static const QByteArray HMacSha1;
-    static const QByteArray HMacSha196;
-    static const QByteArray HMacSha256;
-    static const QByteArray HMacSha384;
-    static const QByteArray HMacSha512;
-    static const QList<QByteArray> MacAlgorithms;
-
-    static const QList<QByteArray> CompressionAlgorithms;
-
-    static const QByteArray SshConnectionService;
-
-    static QList<QByteArray> commonCapabilities(const QList<QByteArray> &myCapabilities,
-                                                const QList<QByteArray> &serverCapabilities, const QByteArray &group);
-    static QByteArray findBestMatch(const QList<QByteArray> &myCapabilities,
-        const QList<QByteArray> &serverCapabilities, const QByteArray &group);
-
-    static int ecdsaIntegerWidthInBytes(const QByteArray &ecdsaAlgo);
-    static QByteArray ecdsaPubKeyAlgoForKeyWidth(int keyWidthInBytes);
-    static const char *oid(const QByteArray &ecdsaAlgo);
-};
-
-} // namespace Internal
-} // namespace QSsh
-
-#endif // CAPABILITIES_P_H

client/3rd/QtSsh/src/ssh/sshchannel.cpp

@@ -1,277 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#include "sshchannel_p.h"
-
-#include "sshincomingpacket_p.h"
-#include "sshsendfacility_p.h"
-#include "sshlogging_p.h"
-
-#include <botan_all.h>
-
-#include <QTimer>
-
-namespace QSsh {
-namespace Internal {
-
-const quint32 NoChannel = 0xffffffffu;
-
-AbstractSshChannel::AbstractSshChannel(quint32 channelId,
-    SshSendFacility &sendFacility)
-    : m_sendFacility(sendFacility),
-      m_localChannel(channelId), m_remoteChannel(NoChannel),
-      m_localWindowSize(initialWindowSize()), m_remoteWindowSize(0),
-      m_state(Inactive)
-{
-    m_timeoutTimer.setTimerType(Qt::VeryCoarseTimer);
-    m_timeoutTimer.setSingleShot(true);
-    connect(&m_timeoutTimer, &QTimer::timeout, this, &AbstractSshChannel::timeout);
-}
-
-AbstractSshChannel::~AbstractSshChannel()
-{
-
-}
-
-void AbstractSshChannel::setChannelState(ChannelState state)
-{
-    m_state = state;
-    if (state == Closed)
-        closeHook();
-}
-
-void AbstractSshChannel::requestSessionStart()
-{
-    // Note: We are just being paranoid here about the Botan exceptions,
-    // which are extremely unlikely to happen, because if there was a problem
-    // with our cryptography stuff, it would have hit us before, on
-    // establishing the connection.
-    try {
-        m_sendFacility.sendSessionPacket(m_localChannel, initialWindowSize(), maxPacketSize());
-        setChannelState(SessionRequested);
-        m_timeoutTimer.start(ReplyTimeout);
-    }  catch (const std::exception &e) {
-        qCWarning(sshLog, "Botan error: %s", e.what());
-        closeChannel();
-    }
-}
-
-void AbstractSshChannel::sendData(const QByteArray &data)
-{
-    try {
-        m_sendBuffer += data;
-        flushSendBuffer();
-    }  catch (const std::exception &e) {
-        qCWarning(sshLog, "Botan error: %s", e.what());
-        closeChannel();
-    }
-}
-
-quint32 AbstractSshChannel::initialWindowSize()
-{
-    return maxPacketSize();
-}
-
-quint32 AbstractSshChannel::maxPacketSize()
-{
-    return 16 * 1024 * 1024;
-}
-
-void AbstractSshChannel::handleWindowAdjust(quint64 bytesToAdd)
-{
-    checkChannelActive();
-
-    const quint64 newValue = m_remoteWindowSize + bytesToAdd;
-    if (newValue > 0xffffffffu) {
-        throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR,
-            "Illegal window size requested.");
-    }
-
-    m_remoteWindowSize = newValue;
-    flushSendBuffer();
-}
-
-void AbstractSshChannel::flushSendBuffer()
-{
-    while (true) {
-        const quint32 bytesToSend = qMin(m_remoteMaxPacketSize,
-                qMin<quint32>(m_remoteWindowSize, m_sendBuffer.size()));
-        if (bytesToSend == 0)
-            break;
-        const QByteArray &data = m_sendBuffer.left(bytesToSend);
-        m_sendFacility.sendChannelDataPacket(m_remoteChannel, data);
-        m_sendBuffer.remove(0, bytesToSend);
-        m_remoteWindowSize -= bytesToSend;
-    }
-}
-
-void AbstractSshChannel::handleOpenSuccess(quint32 remoteChannelId,
-    quint32 remoteWindowSize, quint32 remoteMaxPacketSize)
-{
-    const ChannelState oldState = m_state;
-    switch (oldState) {
-    case CloseRequested:   // closeChannel() was called while we were in SessionRequested state
-    case SessionRequested:
-        break; // Ok, continue.
-    default:
-        throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR,
-            "Unexpected SSH_MSG_CHANNEL_OPEN_CONFIRMATION packet.");
-    }
-
-    m_timeoutTimer.stop();
-
-   qCDebug(sshLog, "Channel opened. remote channel id: %u, remote window size: %u, "
-       "remote max packet size: %u",
-       remoteChannelId, remoteWindowSize, remoteMaxPacketSize);
-   m_remoteChannel = remoteChannelId;
-   m_remoteWindowSize = remoteWindowSize;
-   m_remoteMaxPacketSize = remoteMaxPacketSize;
-   setChannelState(SessionEstablished);
-   if (oldState == CloseRequested)
-       closeChannel();
-   else
-       handleOpenSuccessInternal();
-}
-
-void AbstractSshChannel::handleOpenFailure(const QString &reason)
-{
-    switch (m_state) {
-    case SessionRequested:
-        break; // Ok, continue.
-    case CloseRequested:
-        return; // Late server reply; we requested a channel close in the meantime.
-    default:
-        throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR,
-            "Unexpected SSH_MSG_CHANNEL_OPEN_FAILURE packet.");
-    }
-
-    m_timeoutTimer.stop();
-
-   qCDebug(sshLog, "Channel open request failed for channel %u", m_localChannel);
-   handleOpenFailureInternal(reason);
-}
-
-void AbstractSshChannel::handleChannelEof()
-{
-    if (m_state == Inactive || m_state == Closed) {
-        throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR,
-            "Unexpected SSH_MSG_CHANNEL_EOF message.");
-    }
-    m_localWindowSize = 0;
-    emit eof();
-}
-
-void AbstractSshChannel::handleChannelClose()
-{
-    qCDebug(sshLog, "Receiving CLOSE for channel %u", m_localChannel);
-    if (channelState() == Inactive || channelState() == Closed) {
-        throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR,
-            "Unexpected SSH_MSG_CHANNEL_CLOSE message.");
-    }
-    closeChannel();
-    setChannelState(Closed);
-}
-
-void AbstractSshChannel::handleChannelData(const QByteArray &data)
-{
-    const int bytesToDeliver = handleChannelOrExtendedChannelData(data);
-    handleChannelDataInternal(bytesToDeliver == data.size()
-        ? data : data.left(bytesToDeliver));
-}
-
-void AbstractSshChannel::handleChannelExtendedData(quint32 type, const QByteArray &data)
-{
-    const int bytesToDeliver = handleChannelOrExtendedChannelData(data);
-    handleChannelExtendedDataInternal(type, bytesToDeliver == data.size()
-        ? data : data.left(bytesToDeliver));
-}
-
-void AbstractSshChannel::handleChannelRequest(const SshIncomingPacket &packet)
-{
-    checkChannelActive();
-    const QByteArray &requestType = packet.extractChannelRequestType();
-    if (requestType == SshIncomingPacket::ExitStatusType)
-        handleExitStatus(packet.extractChannelExitStatus());
-    else if (requestType == SshIncomingPacket::ExitSignalType)
-        handleExitSignal(packet.extractChannelExitSignal());
-    else if (requestType != "eow@openssh.com") // Suppress warning for this one, as it's sent all the time.
-        qCWarning(sshLog, "Ignoring unknown request type '%s'", requestType.data());
-}
-
-int AbstractSshChannel::handleChannelOrExtendedChannelData(const QByteArray &data)
-{
-    checkChannelActive();
-
-    const int bytesToDeliver = qMin<quint32>(data.size(), maxDataSize());
-    if (bytesToDeliver != data.size())
-        qCWarning(sshLog, "Misbehaving server does not respect local window, clipping.");
-
-    m_localWindowSize -= bytesToDeliver;
-    if (m_localWindowSize < maxPacketSize()) {
-        m_localWindowSize += maxPacketSize();
-        m_sendFacility.sendWindowAdjustPacket(m_remoteChannel, maxPacketSize());
-    }
-    return bytesToDeliver;
-}
-
-void AbstractSshChannel::closeChannel()
-{
-    if (m_state == CloseRequested) {
-        m_timeoutTimer.stop();
-    } else if (m_state != Closed) {
-        if (m_state == Inactive) {
-            setChannelState(Closed);
-        } else {
-            const ChannelState oldState = m_state;
-            setChannelState(CloseRequested);
-            if (m_remoteChannel != NoChannel) {
-                m_sendFacility.sendChannelEofPacket(m_remoteChannel);
-                m_sendFacility.sendChannelClosePacket(m_remoteChannel);
-            } else {
-                QSSH_ASSERT(oldState == SessionRequested);
-            }
-        }
-    }
-}
-
-void AbstractSshChannel::checkChannelActive() const
-{
-    if (channelState() == Inactive || channelState() == Closed)
-        throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR,
-            "Channel not open.");
-}
-
-quint32 AbstractSshChannel::maxDataSize() const
-{
-    return qMin(m_localWindowSize, maxPacketSize());
-}
-
-} // namespace Internal
-} // namespace QSsh

client/3rd/QtSsh/src/ssh/sshchannel_p.h

@@ -1,125 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#ifndef SSHCHANNEL_P_H
-#define SSHCHANNEL_P_H
-
-#include <QByteArray>
-#include <QObject>
-#include <QString>
-#include <QTimer>
-
-namespace QSsh {
-namespace Internal {
-
-struct SshChannelExitSignal;
-struct SshChannelExitStatus;
-class SshIncomingPacket;
-class SshSendFacility;
-
-class AbstractSshChannel : public QObject
-{
-    Q_OBJECT
-public:
-    enum ChannelState {
-        Inactive, SessionRequested, SessionEstablished, CloseRequested, Closed
-    };
-
-    quint32 localChannelId() const { return m_localChannel; }
-    quint32 remoteChannel() const { return m_remoteChannel; }
-
-    virtual void handleChannelSuccess() = 0;
-    virtual void handleChannelFailure() = 0;
-
-    void handleOpenSuccess(quint32 remoteChannelId, quint32 remoteWindowSize,
-        quint32 remoteMaxPacketSize);
-    void handleOpenFailure(const QString &reason);
-    void handleWindowAdjust(quint64 bytesToAdd);
-    void handleChannelEof();
-    void handleChannelClose();
-    void handleChannelData(const QByteArray &data);
-    void handleChannelExtendedData(quint32 type, const QByteArray &data);
-    void handleChannelRequest(const SshIncomingPacket &packet);
-
-    void closeChannel();
-
-    virtual ~AbstractSshChannel();
-
-    static const int ReplyTimeout = 10000; // milli seconds
-    ChannelState channelState() const { return m_state; }
-
-signals:
-    void timeout();
-    void eof();
-
-protected:
-    AbstractSshChannel(quint32 channelId, SshSendFacility &sendFacility);
-
-    void setChannelState(ChannelState state);
-
-    void requestSessionStart();
-    void sendData(const QByteArray &data);
-
-    static quint32 initialWindowSize();
-    static quint32 maxPacketSize();
-
-    quint32 maxDataSize() const;
-    void checkChannelActive() const;
-
-    SshSendFacility &m_sendFacility;
-    QTimer m_timeoutTimer;
-
-private:
-    virtual void handleOpenSuccessInternal() = 0;
-    virtual void handleOpenFailureInternal(const QString &reason) = 0;
-    virtual void handleChannelDataInternal(const QByteArray &data) = 0;
-    virtual void handleChannelExtendedDataInternal(quint32 type,
-        const QByteArray &data) = 0;
-    virtual void handleExitStatus(const SshChannelExitStatus &exitStatus) = 0;
-    virtual void handleExitSignal(const SshChannelExitSignal &signal) = 0;
-
-    virtual void closeHook() = 0;
-
-    void flushSendBuffer();
-    int handleChannelOrExtendedChannelData(const QByteArray &data);
-
-    const quint32 m_localChannel;
-    quint32 m_remoteChannel;
-    quint32 m_localWindowSize;
-    quint32 m_remoteWindowSize;
-    quint32 m_remoteMaxPacketSize;
-    ChannelState m_state;
-    QByteArray m_sendBuffer;
-};
-
-} // namespace Internal
-} // namespace QSsh
-
-#endif // SSHCHANNEL_P_H

client/3rd/QtSsh/src/ssh/sshchannelmanager.cpp

@@ -1,412 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#include "sshchannelmanager_p.h"
-
-#include "sftpchannel.h"
-#include "sftpchannel_p.h"
-#include "sshdirecttcpiptunnel.h"
-#include "sshdirecttcpiptunnel_p.h"
-#include "sshforwardedtcpiptunnel.h"
-#include "sshforwardedtcpiptunnel_p.h"
-#include "sshincomingpacket_p.h"
-#include "sshlogging_p.h"
-#include "sshremoteprocess.h"
-#include "sshremoteprocess_p.h"
-#include "sshsendfacility_p.h"
-#include "sshtcpipforwardserver.h"
-#include "sshtcpipforwardserver_p.h"
-#include "sshx11channel_p.h"
-#include "sshx11inforetriever_p.h"
-
-#include <QList>
-
-namespace QSsh {
-namespace Internal {
-
-SshChannelManager::SshChannelManager(SshSendFacility &sendFacility,
-    QObject *parent)
-    : QObject(parent), m_sendFacility(sendFacility), m_nextLocalChannelId(0)
-{
-}
-
-void SshChannelManager::handleChannelRequest(const SshIncomingPacket &packet)
-{
-    lookupChannel(packet.extractRecipientChannel())
-        ->handleChannelRequest(packet);
-}
-
-void SshChannelManager::handleChannelOpen(const SshIncomingPacket &packet)
-{
-    const SshChannelOpenGeneric channelOpen = packet.extractChannelOpen();
-    if (channelOpen.channelType == SshIncomingPacket::ForwardedTcpIpType) {
-        handleChannelOpenForwardedTcpIp(channelOpen);
-        return;
-    }
-    if (channelOpen.channelType == "x11") {
-        handleChannelOpenX11(channelOpen);
-        return;
-    }
-    try {
-        m_sendFacility.sendChannelOpenFailurePacket(channelOpen.commonData.remoteChannel,
-                                                    SSH_OPEN_UNKNOWN_CHANNEL_TYPE, QByteArray());
-    }  catch (const std::exception &e) {
-        qCWarning(sshLog, "Botan error: %s", e.what());
-    }
-}
-
-void SshChannelManager::handleChannelOpenFailure(const SshIncomingPacket &packet)
-{
-   const SshChannelOpenFailure &failure = packet.extractChannelOpenFailure();
-   ChannelIterator it = lookupChannelAsIterator(failure.localChannel);
-   try {
-       it.value()->handleOpenFailure(failure.reasonString);
-   } catch (const SshServerException &e) {
-       removeChannel(it);
-       throw;
-   }
-   removeChannel(it);
-}
-
-void SshChannelManager::handleChannelOpenConfirmation(const SshIncomingPacket &packet)
-{
-   const SshChannelOpenConfirmation &confirmation
-       = packet.extractChannelOpenConfirmation();
-   lookupChannel(confirmation.localChannel)->handleOpenSuccess(confirmation.remoteChannel,
-       confirmation.remoteWindowSize, confirmation.remoteMaxPacketSize);
-}
-
-void SshChannelManager::handleChannelSuccess(const SshIncomingPacket &packet)
-{
-    lookupChannel(packet.extractRecipientChannel())->handleChannelSuccess();
-}
-
-void SshChannelManager::handleChannelFailure(const SshIncomingPacket &packet)
-{
-    lookupChannel(packet.extractRecipientChannel())->handleChannelFailure();
-}
-
-void SshChannelManager::handleChannelWindowAdjust(const SshIncomingPacket &packet)
-{
-    const SshChannelWindowAdjust adjust = packet.extractWindowAdjust();
-    lookupChannel(adjust.localChannel)->handleWindowAdjust(adjust.bytesToAdd);
-}
-
-void SshChannelManager::handleChannelData(const SshIncomingPacket &packet)
-{
-    const SshChannelData &data = packet.extractChannelData();
-    lookupChannel(data.localChannel)->handleChannelData(data.data);
-}
-
-void SshChannelManager::handleChannelExtendedData(const SshIncomingPacket &packet)
-{
-    const SshChannelExtendedData &data = packet.extractChannelExtendedData();
-    lookupChannel(data.localChannel)->handleChannelExtendedData(data.type, data.data);
-}
-
-void SshChannelManager::handleChannelEof(const SshIncomingPacket &packet)
-{
-    AbstractSshChannel * const channel
-        = lookupChannel(packet.extractRecipientChannel(), true);
-    if (channel)
-        channel->handleChannelEof();
-}
-
-void SshChannelManager::handleChannelClose(const SshIncomingPacket &packet)
-{
-    const quint32 channelId = packet.extractRecipientChannel();
-
-    ChannelIterator it = lookupChannelAsIterator(channelId, true);
-    if (it != m_channels.end()) {
-        it.value()->handleChannelClose();
-        removeChannel(it);
-    }
-}
-
-void SshChannelManager::handleRequestSuccess(const SshIncomingPacket &packet)
-{
-    if (m_waitingForwardServers.isEmpty()) {
-        throw SshServerException(SSH_DISCONNECT_PROTOCOL_ERROR,
-                                 "Unexpected request success packet.",
-                                 tr("Unexpected request success packet."));
-    }
-    SshTcpIpForwardServer::Ptr server = m_waitingForwardServers.takeFirst();
-    if (server->state() == SshTcpIpForwardServer::Closing) {
-        server->setClosed();
-    } else if (server->state() == SshTcpIpForwardServer::Initializing) {
-        quint16 port = server->port();
-        if (port == 0)
-            port = packet.extractRequestSuccess().bindPort;
-        server->setListening(port);
-        m_listeningForwardServers.append(server);
-    } else {
-        QSSH_ASSERT(false);
-    }
-}
-
-void SshChannelManager::handleRequestFailure(const SshIncomingPacket &packet)
-{
-    Q_UNUSED(packet);
-    if (m_waitingForwardServers.isEmpty()) {
-        throw SshServerException(SSH_DISCONNECT_PROTOCOL_ERROR,
-                                 "Unexpected request failure packet.",
-                                 tr("Unexpected request failure packet."));
-    }
-    SshTcpIpForwardServer::Ptr tunnel = m_waitingForwardServers.takeFirst();
-    tunnel->setClosed();
-}
-
-SshChannelManager::ChannelIterator SshChannelManager::lookupChannelAsIterator(quint32 channelId,
-    bool allowNotFound)
-{
-    ChannelIterator it = m_channels.find(channelId);
-    if (it == m_channels.end() && !allowNotFound) {
-        throw SshServerException(SSH_DISCONNECT_PROTOCOL_ERROR,
-            "Invalid channel id.",
-            tr("Invalid channel id %1").arg(channelId));
-    }
-    return it;
-}
-
-AbstractSshChannel *SshChannelManager::lookupChannel(quint32 channelId,
-    bool allowNotFound)
-{
-    ChannelIterator it = lookupChannelAsIterator(channelId, allowNotFound);
-    return it == m_channels.end() ? nullptr : it.value();
-}
-
-QSsh::SshRemoteProcess::Ptr SshChannelManager::createRemoteProcess(const QByteArray &command)
-{
-    SshRemoteProcess::Ptr proc(new SshRemoteProcess(command, m_nextLocalChannelId++, m_sendFacility));
-    insertChannel(proc->d, proc);
-    connect(proc->d, &SshRemoteProcessPrivate::destroyed, this, [this] {
-        m_x11ForwardingRequests.removeOne(static_cast<SshRemoteProcessPrivate *>(sender()));
-    });
-    connect(proc->d, &SshRemoteProcessPrivate::x11ForwardingRequested, this,
-            [this, proc = proc->d](const QString &displayName) {
-        if (!x11DisplayName().isEmpty()) {
-            if (x11DisplayName() != displayName) {
-                proc->failToStart(tr("Cannot forward to display %1 on SSH connection that is "
-                                     "already forwarding to display %2.")
-                                  .arg(displayName, x11DisplayName()));
-                return;
-            }
-            if (!m_x11DisplayInfo.cookie.isEmpty())
-                proc->startProcess(m_x11DisplayInfo);
-            else
-                m_x11ForwardingRequests << proc;
-            return;
-        }
-        m_x11DisplayInfo.displayName = displayName;
-        m_x11ForwardingRequests << proc;
-        auto * const x11InfoRetriever = new SshX11InfoRetriever(displayName, this);
-        const auto failureHandler = [this](const QString &errorMessage) {
-            for (SshRemoteProcessPrivate * const proc : qAsConst(m_x11ForwardingRequests))
-                proc->failToStart(errorMessage);
-            m_x11ForwardingRequests.clear();
-        };
-        connect(x11InfoRetriever, &SshX11InfoRetriever::failure, this, failureHandler);
-        const auto successHandler = [this](const X11DisplayInfo &displayInfo) {
-            m_x11DisplayInfo = displayInfo;
-            for (SshRemoteProcessPrivate * const proc : qAsConst(m_x11ForwardingRequests))
-                proc->startProcess(displayInfo);
-            m_x11ForwardingRequests.clear();
-        };
-        connect(x11InfoRetriever, &SshX11InfoRetriever::success, this, successHandler);
-        qCDebug(sshLog) << "starting x11 info retriever";
-        x11InfoRetriever->start();
-    });
-    return proc;
-}
-
-QSsh::SshRemoteProcess::Ptr SshChannelManager::createRemoteShell()
-{
-    SshRemoteProcess::Ptr proc(new SshRemoteProcess(m_nextLocalChannelId++, m_sendFacility));
-    insertChannel(proc->d, proc);
-    return proc;
-}
-
-QSsh::SftpChannel::Ptr SshChannelManager::createSftpChannel()
-{
-    SftpChannel::Ptr sftp(new SftpChannel(m_nextLocalChannelId++, m_sendFacility));
-    insertChannel(sftp->d, sftp);
-    return sftp;
-}
-
-SshDirectTcpIpTunnel::Ptr SshChannelManager::createDirectTunnel(const QString &originatingHost,
-        quint16 originatingPort, const QString &remoteHost, quint16 remotePort)
-{
-    SshDirectTcpIpTunnel::Ptr tunnel(new SshDirectTcpIpTunnel(m_nextLocalChannelId++,
-            originatingHost, originatingPort, remoteHost, remotePort, m_sendFacility));
-    insertChannel(tunnel->d, tunnel);
-    return tunnel;
-}
-
-SshTcpIpForwardServer::Ptr SshChannelManager::createForwardServer(const QString &remoteHost,
-        quint16 remotePort)
-{
-    SshTcpIpForwardServer::Ptr server(new SshTcpIpForwardServer(remoteHost, remotePort,
-                                                                m_sendFacility));
-    connect(server.data(), &SshTcpIpForwardServer::stateChanged,
-            this, [this, server](SshTcpIpForwardServer::State state) {
-        switch (state) {
-        case SshTcpIpForwardServer::Closing:
-            m_listeningForwardServers.removeOne(server);
-            Q_FALLTHROUGH();
-        case SshTcpIpForwardServer::Initializing:
-            m_waitingForwardServers.append(server);
-            break;
-        case SshTcpIpForwardServer::Listening:
-        case SshTcpIpForwardServer::Inactive:
-            break;
-        }
-    });
-    return server;
-}
-
-void SshChannelManager::insertChannel(AbstractSshChannel *priv,
-    const QSharedPointer<QObject> &pub)
-{
-    connect(priv, &AbstractSshChannel::timeout, this, &SshChannelManager::timeout);
-    m_channels.insert(priv->localChannelId(), priv);
-    m_sessions.insert(priv, pub);
-}
-
-void SshChannelManager::handleChannelOpenForwardedTcpIp(
-        const SshChannelOpenGeneric &channelOpenGeneric)
-{
-    const SshChannelOpenForwardedTcpIp channelOpen
-            = SshIncomingPacket::extractChannelOpenForwardedTcpIp(channelOpenGeneric);
-
-    SshTcpIpForwardServer::Ptr server;
-
-    foreach (const SshTcpIpForwardServer::Ptr &candidate, m_listeningForwardServers) {
-        if (candidate->port() == channelOpen.remotePort
-                && candidate->bindAddress().toUtf8() == channelOpen.remoteAddress) {
-            server = candidate;
-            break;
-        }
-    };
-
-
-    if (server.isNull()) {
-        // Apparently the server knows a remoteAddress we are not aware of. There are plenty of ways
-        // to make that happen: /etc/hosts on the server, different writings for localhost,
-        // different DNS servers, ...
-        // Rather than trying to figure that out, we just use the first listening forwarder with the
-        // same port.
-        foreach (const SshTcpIpForwardServer::Ptr &candidate, m_listeningForwardServers) {
-            if (candidate->port() == channelOpen.remotePort) {
-                server = candidate;
-                break;
-            }
-        };
-    }
-
-    if (server.isNull()) {
-        try {
-            m_sendFacility.sendChannelOpenFailurePacket(channelOpen.common.remoteChannel,
-                                                        SSH_OPEN_ADMINISTRATIVELY_PROHIBITED,
-                                                        QByteArray());
-        }  catch (const std::exception &e) {
-            qCWarning(sshLog, "Botan error: %s", e.what());
-        }
-        return;
-    }
-
-    SshForwardedTcpIpTunnel::Ptr tunnel(new SshForwardedTcpIpTunnel(m_nextLocalChannelId++,
-                                                                    m_sendFacility));
-    tunnel->d->handleOpenSuccess(channelOpen.common.remoteChannel,
-                                 channelOpen.common.remoteWindowSize,
-                                 channelOpen.common.remoteMaxPacketSize);
-    tunnel->open(QIODevice::ReadWrite);
-    server->setNewConnection(tunnel);
-    insertChannel(tunnel->d, tunnel);
-}
-
-void SshChannelManager::handleChannelOpenX11(const SshChannelOpenGeneric &channelOpenGeneric)
-{
-    qCDebug(sshLog) << "incoming X11 channel open request";
-    const SshChannelOpenX11 channelOpen
-            = SshIncomingPacket::extractChannelOpenX11(channelOpenGeneric);
-    if (m_x11DisplayInfo.cookie.isEmpty()) {
-        throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR,
-                                   "Server attempted to open an unrequested X11 channel.");
-    }
-    SshX11Channel * const x11Channel = new SshX11Channel(m_x11DisplayInfo,
-                                                         m_nextLocalChannelId++,
-                                                         m_sendFacility);
-    x11Channel->setParent(this);
-    x11Channel->handleOpenSuccess(channelOpen.common.remoteChannel,
-                                  channelOpen.common.remoteWindowSize,
-                                  channelOpen.common.remoteMaxPacketSize);
-    insertChannel(x11Channel, QSharedPointer<QObject>());
-}
-
-int SshChannelManager::closeAllChannels(CloseAllMode mode)
-{
-    int count = 0;
-    for (ChannelIterator it = m_channels.begin(); it != m_channels.end(); ++it) {
-        AbstractSshChannel * const channel = it.value();
-        QSSH_ASSERT(channel->channelState() != AbstractSshChannel::Closed);
-        if (channel->channelState() != AbstractSshChannel::CloseRequested) {
-            channel->closeChannel();
-            ++count;
-        }
-    }
-    if (mode == CloseAllAndReset) {
-        m_channels.clear();
-        m_sessions.clear();
-    }
-    return count;
-}
-
-int SshChannelManager::channelCount() const
-{
-    return m_channels.count();
-}
-
-void SshChannelManager::removeChannel(ChannelIterator it)
-{
-    if (it == m_channels.end()) {
-        throw SshClientException(SshInternalError,
-                QLatin1String("Internal error: Unexpected channel lookup failure"));
-    }
-    const int removeCount = m_sessions.remove(it.value());
-    if (removeCount != 1) {
-        throw SshClientException(SshInternalError,
-                QString::fromLatin1("Internal error: Unexpected session count %1 for channel.")
-                                 .arg(removeCount));
-    }
-    m_channels.erase(it);
-}
-
-} // namespace Internal
-} // namespace QSsh

client/3rd/QtSsh/src/ssh/sshchannelmanager_p.h

@@ -1,117 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#ifndef SSHCHANNELLAYER_P_H
-#define SSHCHANNELLAYER_P_H
-
-#include "sshx11displayinfo_p.h"
-
-#include <QHash>
-#include <QObject>
-#include <QSharedPointer>
-
-namespace QSsh {
-class SftpChannel;
-class SshDirectTcpIpTunnel;
-class SshRemoteProcess;
-class SshTcpIpForwardServer;
-
-namespace Internal {
-
-class AbstractSshChannel;
-struct SshChannelOpenGeneric;
-class SshIncomingPacket;
-class SshSendFacility;
-class SshRemoteProcessPrivate;
-
-class SshChannelManager : public QObject
-{
-    Q_OBJECT
-public:
-    SshChannelManager(SshSendFacility &sendFacility, QObject *parent);
-
-    QSharedPointer<SshRemoteProcess> createRemoteProcess(const QByteArray &command);
-    QSharedPointer<SshRemoteProcess> createRemoteShell();
-    QSharedPointer<SftpChannel> createSftpChannel();
-    QSharedPointer<SshDirectTcpIpTunnel> createDirectTunnel(const QString &originatingHost,
-            quint16 originatingPort, const QString &remoteHost, quint16 remotePort);
-    QSharedPointer<SshTcpIpForwardServer> createForwardServer(const QString &remoteHost,
-            quint16 remotePort);
-
-    int channelCount() const;
-    enum CloseAllMode { CloseAllRegular, CloseAllAndReset };
-    int closeAllChannels(CloseAllMode mode);
-    QString x11DisplayName() const { return m_x11DisplayInfo.displayName; }
-
-    void handleChannelRequest(const SshIncomingPacket &packet);
-    void handleChannelOpen(const SshIncomingPacket &packet);
-    void handleChannelOpenFailure(const SshIncomingPacket &packet);
-    void handleChannelOpenConfirmation(const SshIncomingPacket &packet);
-    void handleChannelSuccess(const SshIncomingPacket &packet);
-    void handleChannelFailure(const SshIncomingPacket &packet);
-    void handleChannelWindowAdjust(const SshIncomingPacket &packet);
-    void handleChannelData(const SshIncomingPacket &packet);
-    void handleChannelExtendedData(const SshIncomingPacket &packet);
-    void handleChannelEof(const SshIncomingPacket &packet);
-    void handleChannelClose(const SshIncomingPacket &packet);
-    void handleRequestSuccess(const SshIncomingPacket &packet);
-    void handleRequestFailure(const SshIncomingPacket &packet);
-
-signals:
-    void timeout();
-
-private:
-    typedef QHash<quint32, AbstractSshChannel *>::Iterator ChannelIterator;
-
-    ChannelIterator lookupChannelAsIterator(quint32 channelId,
-        bool allowNotFound = false);
-    AbstractSshChannel *lookupChannel(quint32 channelId,
-        bool allowNotFound = false);
-    void removeChannel(ChannelIterator it);
-    void insertChannel(AbstractSshChannel *priv,
-        const QSharedPointer<QObject> &pub);
-
-    void handleChannelOpenForwardedTcpIp(const SshChannelOpenGeneric &channelOpenGeneric);
-    void handleChannelOpenX11(const SshChannelOpenGeneric &channelOpenGeneric);
-
-    SshSendFacility &m_sendFacility;
-    QHash<quint32, AbstractSshChannel *> m_channels;
-    QHash<AbstractSshChannel *, QSharedPointer<QObject> > m_sessions;
-    quint32 m_nextLocalChannelId;
-    QList<QSharedPointer<SshTcpIpForwardServer>> m_waitingForwardServers;
-    QList<QSharedPointer<SshTcpIpForwardServer>> m_listeningForwardServers;
-    QList<SshRemoteProcessPrivate *> m_x11ForwardingRequests;
-    X11DisplayInfo m_x11DisplayInfo;
-};
-
-} // namespace Internal
-} // namespace QSsh
-
-#endif // SSHCHANNELLAYER_P_H

client/3rd/QtSsh/src/ssh/sshconnection.h

@@ -1,298 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#ifndef SSHCONNECTION_H
-#define SSHCONNECTION_H
-
-#include "ssherrors.h"
-#include "sshhostkeydatabase.h"
-
-#include "ssh_global.h"
-
-#include <QByteArray>
-#include <QFlags>
-#include <QMetaType>
-#include <QObject>
-#include <QSharedPointer>
-#include <QString>
-#include <QHostAddress>
-#include <QUrl>
-
-namespace QSsh {
-class SftpChannel;
-class SshDirectTcpIpTunnel;
-class SshRemoteProcess;
-class SshTcpIpForwardServer;
-
-namespace Internal {
-class SshConnectionPrivate;
-} // namespace Internal
-
-/*!
- * \brief Flags that control various general behavior
- */
-enum SshConnectionOption {
-    /// Set this to ignore the system defined proxy
-    SshIgnoreDefaultProxy = 0x1,
-
-    /// Fail instead of warn if the remote host violates the standard
-    SshEnableStrictConformanceChecks = 0x2,
-
-    /// Set the QAbstractSocket::LowDelayOption, which is the same as TCP_NODELAY
-    SshLowDelaySocket = 0x4
-};
-
-Q_DECLARE_FLAGS(SshConnectionOptions, SshConnectionOption)
-
-/*!
- * \brief How strict to be when checking the remote key
- */
-enum SshHostKeyCheckingMode {
-    /// Ignore the remote key
-    SshHostKeyCheckingNone,
-
-    /// Fail connection if either there is no key stored for this host or the key is not the same as earlier
-    SshHostKeyCheckingStrict,
-
-    /// Allow connecting if there is no stored key for the host, but fail if the key has changed
-    SshHostKeyCheckingAllowNoMatch,
-
-    /// Continue connection if the key doesn't match the stored key for the host
-    SshHostKeyCheckingAllowMismatch
-};
-
-/*!
- * \brief Class to use to specify parameters used during connection.
- */
-class QSSH_EXPORT SshConnectionParameters
-{
-public:
-
-    /*!
-     * \brief What kinds of authentication to attempt
-     */
-    enum AuthenticationType {
-        AuthenticationTypePassword, ///< Only attempt to connect using the password set with setPassword().
-        AuthenticationTypePublicKey, ///< Only attempt to authenticate with public key
-
-        /// Only attempt keyboard interactive authentication.
-        /// For now this only changes what to send to the server,
-        /// we will still just try to use the password set here.
-        AuthenticationTypeKeyboardInteractive,
-
-        /// Any method using the password set with setPassword().
-        /// Some servers disable \a "password", others disable \a "keyboard-interactive"
-        AuthenticationTypeTryAllPasswordBasedMethods,
-
-        /// ssh-agent authentication only
-        AuthenticationTypeAgent,
-    };
-
-    SshConnectionParameters();
-
-    /*!
-     * \brief Returns the hostname or IP set with setHost()
-     */
-    QString host() const { return url.host(); }
-
-    /*!
-     * \brief Returns the port set with setPort()
-     */
-    int port() const { return url.port(); }
-
-    /*!
-     * \brief Returns the username set with setUsername()
-     * \return
-     */
-    QString userName() const { return url.userName(); }
-
-    /*!
-     * \brief Returns the password set with setPassword()
-     */
-    QString password() const { return url.password(); }
-
-    /*!
-     * \brief Sets the hostname or IP to connect to
-     * \param host The remote host
-     */
-    void setHost(const QString &host) { url.setHost(host); }
-
-    /*!
-     * \brief Sets the remote port to use
-     * \param port
-     */
-    void setPort(int port) { url.setPort(port); }
-
-    /*!
-     * \brief Sets the username to use
-     * \param name Username
-     */
-    void setUserName(const QString &name) { url.setUserName(name); }
-
-    /*!
-     * \brief Sets the password to attempt to use
-     * \param password
-     */
-    void setPassword(const QString &password) { url.setPassword(password); }
-
-    QUrl url;
-    QString privateKeyFile;
-    int timeout; // In seconds.
-    AuthenticationType authenticationType;
-    SshConnectionOptions options;
-    SshHostKeyCheckingMode hostKeyCheckingMode;
-    SshHostKeyDatabasePtr hostKeyDatabase;
-};
-
-/// @cond
-QSSH_EXPORT bool operator==(const SshConnectionParameters &p1, const SshConnectionParameters &p2);
-QSSH_EXPORT bool operator!=(const SshConnectionParameters &p1, const SshConnectionParameters &p2);
-/// @endcond
-
-/*!
- * \brief Network connection info.
- */
-class QSSH_EXPORT SshConnectionInfo
-{
-public:
-    SshConnectionInfo() : localPort(0), peerPort(0) {}
-    SshConnectionInfo(const QHostAddress &la, quint16 lp, const QHostAddress &pa, quint16 pp)
-        : localAddress(la), localPort(lp), peerAddress(pa), peerPort(pp) {}
-
-    QHostAddress localAddress;
-    quint16 localPort;
-    QHostAddress peerAddress;
-    quint16 peerPort;
-};
-
-
-/*!
-    \class QSsh::SshConnection
-
-    \brief This class provides an SSH connection, implementing protocol version 2.0
-
-    See acquireConnection() which provides a pool mechanism for re-use.
-
-    It can spawn channels for remote execution and SFTP operations (version 3).
-    It operates asynchronously (non-blocking) and is not thread-safe.
-*/
-
-class QSSH_EXPORT SshConnection : public QObject
-{
-    Q_OBJECT
-
-public:
-    /*!
-     * \brief The current state of a connection
-     */
-    enum State { Unconnected, Connecting, Connected };
-
-    /*!
-     * \param serverInfo serverInfo connection parameters
-     * \param parent Parent object.
-     */
-    explicit SshConnection(const SshConnectionParameters &serverInfo, QObject *parent = nullptr);
-
-    void connectToHost();
-    void disconnectFromHost();
-
-    /*!
-     * \brief Current state of this connection
-     */
-    State state() const;
-
-    /*!
-     * \brief Returns the error state of the connection
-     * \returns If there is no error, returns \ref SshNoError if the connection is OK
-     */
-    SshError errorState() const;
-    QString errorString() const;
-    SshConnectionParameters connectionParameters() const;
-    SshConnectionInfo connectionInfo() const;
-    ~SshConnection();
-
-    /*!
-     * \brief Use this to launch remote commands
-     * \param command The command to execute
-     */
-    QSharedPointer<SshRemoteProcess> createRemoteProcess(const QByteArray &command);
-
-    /*!
-     * \brief Creates a remote interactive session with a shell
-     */
-    QSharedPointer<SshRemoteProcess> createRemoteShell();
-    QSharedPointer<SftpChannel> createSftpChannel();
-    QSharedPointer<SshDirectTcpIpTunnel> createDirectTunnel(const QString &originatingHost,
-            quint16 originatingPort, const QString &remoteHost, quint16 remotePort);
-    QSharedPointer<SshTcpIpForwardServer> createForwardServer(const QString &remoteHost,
-            quint16 remotePort);
-
-    // -1 if an error occurred, number of channels closed otherwise.
-    int closeAllChannels();
-    int channelCount() const;
-    const QByteArray &hostKeyFingerprint() const;
-
-    /*!
-     * \brief The X11 display name used for X11 forwarding
-     * \return The name of the X11 display set for this connection
-     */
-    QString x11DisplayName() const;
-
-signals:
-    /*!
-     * \brief Emitted when ready for use
-     */
-    void connected();
-
-    /*!
-     * \brief Emitted when the connection has been closed
-     */
-    void disconnected();
-
-    /*!
-     * \brief Emitted when data has been received
-     * \param message The content of the data, same as the output you would get when running \a ssh on the command line
-     */
-    void dataAvailable(const QString &message);
-
-    /*!
-     * \brief Emitted when an error occured
-     */
-    void error(QSsh::SshError);
-
-private:
-    Internal::SshConnectionPrivate *d;
-};
-
-} // namespace QSsh
-
-Q_DECLARE_METATYPE(QSsh::SshConnectionParameters::AuthenticationType)
-
-#endif // SSHCONNECTION_H

client/3rd/QtSsh/src/ssh/sshconnection_p.h

@@ -1,204 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#ifndef SSHCONNECTION_P_H
-#define SSHCONNECTION_P_H
-
-#include "sshconnection.h"
-#include "sshexception_p.h"
-#include "sshincomingpacket_p.h"
-#include "sshsendfacility_p.h"
-
-#include <QHash>
-#include <QList>
-#include <QQueue>
-#include <QObject>
-#include <QPair>
-#include <QScopedPointer>
-#include <QTimer>
-
-QT_BEGIN_NAMESPACE
-class QTcpSocket;
-QT_END_NAMESPACE
-
-namespace QSsh {
-class SftpChannel;
-class SshRemoteProcess;
-class SshDirectTcpIpTunnel;
-class SshTcpIpForwardServer;
-
-namespace Internal {
-class SshChannelManager;
-
-// NOTE: When you add stuff here, don't forget to update m_packetHandlers.
-enum SshStateInternal {
-    SocketUnconnected, // initial and after disconnect
-    SocketConnecting, // After connectToHost()
-    SocketConnected, // After socket's connected() signal
-    UserAuthServiceRequested,
-    WaitingForAgentKeys,
-    UserAuthRequested,
-    ConnectionEstablished // After service has been started
-    // ...
-};
-
-enum SshKeyExchangeState {
-    NoKeyExchange,
-    KexInitSent,
-    DhInitSent,
-    NewKeysSent,
-    KeyExchangeSuccess  // After server's DH_REPLY message
-};
-
-class SshConnectionPrivate : public QObject
-{
-    Q_OBJECT
-    friend class QSsh::SshConnection;
-public:
-    SshConnectionPrivate(SshConnection *conn,
-        const SshConnectionParameters &serverInfo);
-    ~SshConnectionPrivate();
-
-    void connectToHost();
-    void closeConnection(SshErrorCode sshError, SshError userError,
-        const QByteArray &serverErrorString, const QString &userErrorString);
-    QSharedPointer<SshRemoteProcess> createRemoteProcess(const QByteArray &command);
-    QSharedPointer<SshRemoteProcess> createRemoteShell();
-    QSharedPointer<SftpChannel> createSftpChannel();
-    QSharedPointer<SshDirectTcpIpTunnel> createDirectTunnel(const QString &originatingHost,
-            quint16 originatingPort, const QString &remoteHost, quint16 remotePort);
-    QSharedPointer<SshTcpIpForwardServer> createForwardServer(const QString &remoteHost,
-            quint16 remotePort);
-
-    SshStateInternal state() const { return m_state; }
-    SshError errorState() const { return m_error; }
-    QString errorString() const { return m_errorString; }
-    const QByteArray &hostKeyFingerprint() const { return m_hostFingerprint; }
-
-signals:
-    void connected();
-    void disconnected();
-    void dataAvailable(const QString &message);
-    void error(QSsh::SshError);
-
-private:
-    void handleSocketConnected();
-    void handleIncomingData();
-    void handleSocketError();
-    void handleSocketDisconnected();
-    void handleTimeout();
-    void sendKeepAlivePacket();
-
-    void handleAgentKeysUpdated();
-    void handleSignatureFromAgent(const QByteArray &key, const QByteArray &signature, uint token);
-    void tryAllAgentKeys();
-    void authenticateWithPublicKey();
-    void setAgentError();
-
-    void handleServerId();
-    void handlePackets();
-    void handleCurrentPacket();
-    void handleKeyExchangeInitPacket();
-    void handleKeyExchangeReplyPacket();
-    void handleNewKeysPacket();
-    void handleServiceAcceptPacket();
-    void handlePasswordExpiredPacket();
-    void handleUserAuthInfoRequestPacket();
-    void handleUserAuthSuccessPacket();
-    void handleUserAuthFailurePacket();
-    void handleUserAuthKeyOkPacket();
-    void handleUserAuthBannerPacket();
-    void handleUnexpectedPacket();
-    void handleGlobalRequest();
-    void handleDebugPacket();
-    void handleUnimplementedPacket();
-    void handleChannelRequest();
-    void handleChannelOpen();
-    void handleChannelOpenFailure();
-    void handleChannelOpenConfirmation();
-    void handleChannelSuccess();
-    void handleChannelFailure();
-    void handleChannelWindowAdjust();
-    void handleChannelData();
-    void handleChannelExtendedData();
-    void handleChannelEof();
-    void handleChannelClose();
-    void handleDisconnect();
-    void handleRequestSuccess();
-    void handleRequestFailure();
-
-    bool canUseSocket() const;
-    void createPrivateKey();
-
-    void sendData(const QByteArray &data);
-
-    uint tokenForAgent() const;
-
-    typedef void (SshConnectionPrivate::*PacketHandler)();
-    typedef QList<SshStateInternal> StateList;
-    void setupPacketHandlers();
-    void setupPacketHandler(SshPacketType type, const StateList &states,
-        PacketHandler handler);
-
-    typedef QPair<StateList, PacketHandler> HandlerInStates;
-    QHash<SshPacketType, HandlerInStates> m_packetHandlers;
-
-    static const quint64 InvalidSeqNr;
-
-    QTcpSocket *m_socket;
-    SshStateInternal m_state;
-    SshKeyExchangeState m_keyExchangeState;
-    SshIncomingPacket m_incomingPacket;
-    SshSendFacility m_sendFacility;
-    SshChannelManager * const m_channelManager;
-    const SshConnectionParameters m_connParams;
-    QByteArray m_incomingData;
-    SshError m_error;
-    QString m_errorString;
-    QScopedPointer<SshKeyExchange> m_keyExchange;
-    QByteArray m_hostFingerprint;
-    QTimer m_timeoutTimer;
-    QTimer m_keepAliveTimer;
-    bool m_ignoreNextPacket;
-    SshConnection *m_conn;
-    quint64 m_lastInvalidMsgSeqNr;
-    QByteArray m_serverId;
-    QByteArray m_agentSignature;
-    QQueue<QByteArray> m_pendingKeyChecks;
-    QByteArray m_agentKeyToUse;
-    bool m_serverHasSentDataBeforeId;
-    bool m_triedAllPasswordBasedMethods;
-    bool m_agentKeysUpToDate;
-};
-
-} // namespace Internal
-} // namespace QSsh
-
-#endif // SSHCONNECTION_P_H

client/3rd/QtSsh/src/ssh/sshconnectionmanager.cpp

@@ -1,276 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: http://www.qt-project.org/
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**************************************************************************/
-
-#include "sshconnectionmanager.h"
-
-#include "sshconnection.h"
-
-#include <QCoreApplication>
-#include <QList>
-#include <QMutex>
-#include <QMutexLocker>
-#include <QObject>
-#include <QThread>
-#include <QTimer>
-
-namespace QSsh {
-namespace Internal {
-class UnaquiredConnection {
-public:
-    UnaquiredConnection(SshConnection *conn) : connection(conn), scheduledForRemoval(false) {}
-
-    SshConnection *connection;
-    bool scheduledForRemoval;
-};
-bool operator==(UnaquiredConnection c1, UnaquiredConnection c2) {
-    return c1.connection == c2.connection;
-}
-bool operator!=(UnaquiredConnection c1, UnaquiredConnection c2) {
-    return !(c1 == c2);
-}
-
-class SshConnectionManager : public QObject
-{
-    Q_OBJECT
-
-public:
-    SshConnectionManager()
-    {
-        moveToThread(QCoreApplication::instance()->thread());
-        connect(&m_removalTimer, &QTimer::timeout,
-                this, &SshConnectionManager::removeInactiveConnections);
-        m_removalTimer.setTimerType(Qt::VeryCoarseTimer);
-        m_removalTimer.start(150000); // For a total timeout of five minutes.
-    }
-
-    ~SshConnectionManager()
-    {
-        foreach (const UnaquiredConnection &connection, m_unacquiredConnections) {
-            disconnect(connection.connection, nullptr, this, nullptr);
-            delete connection.connection;
-        }
-
-        QSSH_ASSERT(m_acquiredConnections.isEmpty());
-        QSSH_ASSERT(m_deprecatedConnections.isEmpty());
-    }
-
-    SshConnection *acquireConnection(const SshConnectionParameters &sshParams)
-    {
-        QMutexLocker locker(&m_listMutex);
-
-        // Check in-use connections:
-        foreach (SshConnection * const connection, m_acquiredConnections) {
-            if (connection->connectionParameters() != sshParams)
-                continue;
-
-            if (connection->thread() != QThread::currentThread())
-                continue;
-
-            if (m_deprecatedConnections.contains(connection)) // we were asked to no longer use this one...
-                continue;
-
-            m_acquiredConnections.append(connection);
-            return connection;
-        }
-
-        // Check cached open connections:
-        foreach (const UnaquiredConnection &c, m_unacquiredConnections) {
-            SshConnection * const connection = c.connection;
-            if (connection->state() != SshConnection::Connected
-                    || connection->connectionParameters() != sshParams)
-                continue;
-
-            if (connection->thread() != QThread::currentThread()) {
-                if (connection->channelCount() != 0)
-                    continue;
-                QMetaObject::invokeMethod(this, "switchToCallerThread",
-                    Qt::BlockingQueuedConnection,
-                    Q_ARG(SshConnection *, connection),
-                    Q_ARG(QObject *, QThread::currentThread()));
-            }
-
-            m_unacquiredConnections.removeOne(c);
-            m_acquiredConnections.append(connection);
-            return connection;
-        }
-
-        // create a new connection:
-        SshConnection * const connection = new SshConnection(sshParams);
-        connect(connection, &SshConnection::disconnected,
-                this, &SshConnectionManager::cleanup);
-        m_acquiredConnections.append(connection);
-
-        return connection;
-    }
-
-    void releaseConnection(SshConnection *connection)
-    {
-        QMutexLocker locker(&m_listMutex);
-
-        const bool wasAquired = m_acquiredConnections.removeOne(connection);
-        QSSH_ASSERT_AND_RETURN(wasAquired);
-        if (m_acquiredConnections.contains(connection))
-            return;
-
-        bool doDelete = false;
-        connection->moveToThread(QCoreApplication::instance()->thread());
-        if (m_deprecatedConnections.removeOne(connection)
-                || connection->state() != SshConnection::Connected) {
-            doDelete = true;
-        } else {
-            QSSH_ASSERT_AND_RETURN(!m_unacquiredConnections.contains(UnaquiredConnection(connection)));
-
-            // It can happen that two or more connections with the same parameters were acquired
-            // if the clients were running in different threads. Only keep one of them in
-            // such a case.
-            bool haveConnection = false;
-            foreach (const UnaquiredConnection &c, m_unacquiredConnections) {
-                if (c.connection->connectionParameters() == connection->connectionParameters()) {
-                    haveConnection = true;
-                    break;
-                }
-            }
-            if (!haveConnection) {
-                connection->closeAllChannels(); // Clean up after neglectful clients.
-                m_unacquiredConnections.append(UnaquiredConnection(connection));
-            } else {
-                doDelete = true;
-            }
-        }
-
-        if (doDelete) {
-            disconnect(connection, nullptr, this, nullptr);
-            m_deprecatedConnections.removeAll(connection);
-            connection->deleteLater();
-        }
-    }
-
-    void forceNewConnection(const SshConnectionParameters &sshParams)
-    {
-        QMutexLocker locker(&m_listMutex);
-
-        for (int i = 0; i < m_unacquiredConnections.count(); ++i) {
-            SshConnection * const connection = m_unacquiredConnections.at(i).connection;
-            if (connection->connectionParameters() == sshParams) {
-                disconnect(connection, nullptr, this, nullptr);
-                delete connection;
-                m_unacquiredConnections.removeAt(i);
-                break;
-            }
-        }
-
-        foreach (SshConnection * const connection, m_acquiredConnections) {
-            if (connection->connectionParameters() == sshParams) {
-                if (!m_deprecatedConnections.contains(connection))
-                    m_deprecatedConnections.append(connection);
-            }
-        }
-    }
-
-private:
-    Q_INVOKABLE void switchToCallerThread(SshConnection *connection, QObject *threadObj)
-    {
-        connection->moveToThread(qobject_cast<QThread *>(threadObj));
-    }
-
-    void cleanup()
-    {
-        QMutexLocker locker(&m_listMutex);
-
-        SshConnection *currentConnection = qobject_cast<SshConnection *>(sender());
-        if (!currentConnection)
-            return;
-
-        if (m_unacquiredConnections.removeOne(UnaquiredConnection(currentConnection))) {
-            disconnect(currentConnection, nullptr, this, nullptr);
-            currentConnection->deleteLater();
-        }
-    }
-
-    void removeInactiveConnections()
-    {
-        QMutexLocker locker(&m_listMutex);
-        for (int i = m_unacquiredConnections.count() - 1; i >= 0; --i) {
-            UnaquiredConnection &c = m_unacquiredConnections[i];
-            if (c.scheduledForRemoval) {
-                disconnect(c.connection, nullptr, this, nullptr);
-                c.connection->deleteLater();
-                m_unacquiredConnections.removeAt(i);
-            } else {
-                c.scheduledForRemoval = true;
-            }
-        }
-    }
-
-private:
-    // We expect the number of concurrently open connections to be small.
-    // If that turns out to not be the case, we can still use a data
-    // structure with faster access.
-    QList<UnaquiredConnection> m_unacquiredConnections;
-
-    // Can contain the same connection more than once; this acts as a reference count.
-    QList<SshConnection *> m_acquiredConnections;
-
-    QList<SshConnection *> m_deprecatedConnections;
-    QMutex m_listMutex;
-    QTimer m_removalTimer;
-};
-
-} // namespace Internal
-
-static QMutex instanceMutex;
-
-static Internal::SshConnectionManager &instance()
-{
-    static Internal::SshConnectionManager manager;
-    return manager;
-}
-
-SshConnection *acquireConnection(const SshConnectionParameters &sshParams)
-{
-    QMutexLocker locker(&instanceMutex);
-    return instance().acquireConnection(sshParams);
-}
-
-void releaseConnection(SshConnection *connection)
-{
-    QMutexLocker locker(&instanceMutex);
-    instance().releaseConnection(connection);
-}
-
-void forceNewConnection(const SshConnectionParameters &sshParams)
-{
-    QMutexLocker locker(&instanceMutex);
-    instance().forceNewConnection(sshParams);
-}
-
-} // namespace QSsh
-
-#include "sshconnectionmanager.moc"