From dd86bd9fbdcb0e5fed5fd1fbf3ccf870e8ee29ff Mon Sep 17 00:00:00 2001
From: Jonny Fonsato <j.fonsato@confinet.it>
Date: Thu, 28 Jul 2022 16:56:00 +0200
Subject: [PATCH] change secret position after rebase

---
 phpseclib/Crypt/EC/Formats/Keys/OpenSSH.php | 2 +-
 phpseclib/Crypt/EC/PrivateKey.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpseclib/Crypt/EC/Formats/Keys/OpenSSH.php b/phpseclib/Crypt/EC/Formats/Keys/OpenSSH.php
index 15f94d2e..25ed2f00 100644
--- a/phpseclib/Crypt/EC/Formats/Keys/OpenSSH.php
+++ b/phpseclib/Crypt/EC/Formats/Keys/OpenSSH.php
@@ -176,8 +176,8 @@ abstract class OpenSSH extends Progenitor
         BigInteger $privateKey,
         BaseCurve $curve,
         array $publicKey,
-        $password,
         string $secret,
+        $password,
         array $options = []
     ): string {
         if ($curve instanceof Ed25519) {
diff --git a/phpseclib/Crypt/EC/PrivateKey.php b/phpseclib/Crypt/EC/PrivateKey.php
index 7eb5edda..137e0dba 100644
--- a/phpseclib/Crypt/EC/PrivateKey.php
+++ b/phpseclib/Crypt/EC/PrivateKey.php
@@ -218,7 +218,7 @@ class PrivateKey extends EC implements Common\PrivateKey
     {
         $type = self::validatePlugin('Keys', $type, 'savePrivateKey');
 
-        return $type::savePrivateKey($this->dA, $this->curve, $this->QA, $this->password, $this->secret, $options);
+        return $type::savePrivateKey($this->dA, $this->curve, $this->QA, $this->secret, $this->password, $options);
     }
 
     /**