SSH/Agent: fix bad merge

phpseclib/Net/SSH2.php

@@ -60,6 +60,7 @@ use phpseclib\Crypt\TripleDES;
 use phpseclib\Crypt\Twofish;
 use phpseclib\Math\BigInteger; // Used to do Diffie-Hellman key exchange and DSA/RSA signature verification.
 use phpseclib\System\SSH\Agent;
+use phpseclib\System\SSH\Agent\Identity as AgentIdentity;
 use phpseclib\Exception\NoSupportedAlgorithmsException;
 use phpseclib\Common\Functions\Strings;
 use phpseclib\Common\Functions\Objects;
@@ -2642,6 +2643,10 @@ class SSH2
         }
 
         $packet = $part1 . chr(1) . $part2;
+        if ($privatekey instanceof AgentIdentity) {
+            $hash = 'sha1';
+            $type = 'ssh-rsa';
+        } else {
             switch ($this->signature_format) {
                 case 'rsa-sha2-512':
                     $hash = 'sha512';
@@ -2656,6 +2661,7 @@ class SSH2
                     $hash = 'sha1';
                     $type = 'ssh-rsa';
             }
+        }
         $privatekey->setHash($hash);
         $signature = $privatekey->sign(pack('Na*a*', strlen($this->session_id), $this->session_id, $packet), RSA::PADDING_PKCS1);
         $signature = pack('Na*Na*', strlen($type), $type, strlen($signature), $signature);

phpseclib/System/SSH/Agent.php

@@ -323,7 +323,6 @@ class Agent
 
         return pack('Na*', $agent_reply_bytes, $agent_reply_data);
     }
-<<<<<<< HEAD
 
     /**
      * Forward data to SSH Agent and return data reply
@@ -339,6 +338,3 @@ class Agent
         Objects::setVar($ssh, 'channel_status', $temp);
     }
 }
-=======
-}
->>>>>>> 2.0

phpseclib/System/SSH/Agent/Identity.php

@@ -122,7 +122,6 @@ class Identity
      * ssh-agent only supports signatures with sha1 hashes but to maintain BC with RSA.php this function exists
      *
      * @param string $hash optional
-     * @throws \phpseclib\Exception\UnsupportedAlgorithmException if the algorithm is unsupported
      * @access public
      */
     public function setHash($hash = 'sha1')
@@ -132,18 +131,6 @@ class Identity
         }
     }
 
-    /**
-     * Set Hash
-     *
-     * ssh-agent doesn't support using hashes for RSA other than SHA1
-     *
-     * @param string $hash
-     * @access public
-     */
-    function setHash($hash)
-    {
-    }
-
     /**
      * Create a signature
      *