mirror of
https://github.com/phpseclib/phpseclib.git
synced 2025-01-01 05:31:53 +00:00
Merge branch '3.0'
This commit is contained in:
commit
5afc5f77b9
@ -80,7 +80,7 @@ abstract class PuTTY extends Progenitor
|
|||||||
$public = Strings::packSSH2('iiii', $p, $q, $g, $y);
|
$public = Strings::packSSH2('iiii', $p, $q, $g, $y);
|
||||||
$private = Strings::packSSH2('i', $x);
|
$private = Strings::packSSH2('i', $x);
|
||||||
|
|
||||||
return self::wrapPrivateKey($public, $private, 'ssh-dsa', $password, $options);
|
return self::wrapPrivateKey($public, $private, 'ssh-dss', $password, $options);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -92,6 +92,6 @@ abstract class PuTTY extends Progenitor
|
|||||||
throw new InvalidArgumentException('SSH only supports keys with an N (length of Group Order q) of 160');
|
throw new InvalidArgumentException('SSH only supports keys with an N (length of Group Order q) of 160');
|
||||||
}
|
}
|
||||||
|
|
||||||
return self::wrapPublicKey(Strings::packSSH2('iiii', $p, $q, $g, $y), 'ssh-dsa');
|
return self::wrapPublicKey(Strings::packSSH2('iiii', $p, $q, $g, $y), 'ssh-dss');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user