From 85352917675049f526c859e113e095466cca8303 Mon Sep 17 00:00:00 2001
From: Bo-Yi Wu <appleboy.tw@gmail.com>
Date: Sun, 24 May 2020 14:24:45 +0800
Subject: [PATCH 1/2] chore: add use insecure cipher flag

fix server offered: [diffie-hellman-group-exchange-sha256] error

See https://github.com/appleboy/scp-action/issues/15
---
 .github/workflows/ci.yml | 12 ++++++++++++
 README.md                |  2 ++
 action.yml               |  6 ++++++
 3 files changed, 20 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e09d60d..09d204b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,3 +50,15 @@ jobs:
         port: ${{ secrets.PORT }}
         source: "tests/a.txt,tests/b.txt"
         target: "test"
+
+    - name: use insecure cipher
+      uses: ./
+      with:
+        host: ${{ secrets.HOST }}
+        username: ${{ secrets.USERNAME }}
+        key: ${{ secrets.SSH2 }}
+        passphrase: ${{ secrets.PASSPHRASE }}
+        port: ${{ secrets.PORT }}
+        source: "tests/a.txt,tests/b.txt"
+        target: "test"
+        use_insecure_cipher: true
diff --git a/README.md b/README.md
index eef2e93..3b9b247 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,7 @@ see the [action.yml](./action.yml) file for more detail imformation.
 * strip_components - remove the specified number of leading path elements.
 * overwrite - use `--overwrite` flag with tar
 * tar_tmp_path - temporary path for tar file on the dest host
+* use_insecure_cipher - include more ciphers with use_insecure_cipher (see [#15](https://github.com/appleboy/scp-action/issues/15))
 
 SSH Proxy Setting:
 
@@ -65,6 +66,7 @@ SSH Proxy Setting:
 * proxy_key - content of ssh proxy private key.
 * proxy_key_path - path of ssh proxy private key
 * proxy_fingerprint - fingerprint SHA256 of the host public key, default is to skip verification
+* proxy_use_insecure_cipher - include more ciphers with use_insecure_cipher (see [#15](https://github.com/appleboy/scp-action/issues/15))
 
 ### Example
 
diff --git a/action.yml b/action.yml
index cc133d0..a0f8728 100644
--- a/action.yml
+++ b/action.yml
@@ -25,6 +25,9 @@ inputs:
     description: 'ssh key passphrase'
   fingerprint:
     description: 'fingerprint SHA256 of the host public key, default is to skip verification'
+  use_insecure_cipher:
+    description: 'include more ciphers with use_insecure_cipher'
+    default: false
   target:
     description: 'target path on the server'
   source:
@@ -63,6 +66,9 @@ inputs:
     description: 'path of ssh proxy private key'
   proxy_fingerprint:
     description: 'fingerprint SHA256 of the host public key, default is to skip verification'
+  proxy_use_insecure_cipher:
+    description: 'include more ciphers with use_insecure_cipher'
+    default: false
 runs:
   using: 'docker'
   image: 'Dockerfile'

From a2fea1040dcb491dce3981f47809d653703d21c2 Mon Sep 17 00:00:00 2001
From: Bo-Yi Wu <appleboy.tw@gmail.com>
Date: Sun, 24 May 2020 14:26:07 +0800
Subject: [PATCH 2/2] chore: bump drone-scp to v1.6.1

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 626b2d7..064ac58 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM appleboy/drone-scp:1.6.0-linux-amd64
+FROM appleboy/drone-scp:1.6.1-linux-amd64
 
 ADD entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh