D7522.id16973.diff
No OneTemporary
Actions

Size

983 B

Referenced Files

None

Subscribers

None

D7522.id16973.diff
View Options

	Index: src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
	===================================================================
	--- src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
	+++ src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
	@@ -81,9 +81,17 @@

	if (!$errors) {
	list($type, $body, $comment) = $parts;
	- if (!preg_match('/^ssh-dsa\|ssh-rsa$/', $type)) {
	+
	+ $recognized_keys = array(
	+ 'ssh-dsa',
	+ 'ssh-rsa',
	+ 'ecdsa-sha2-nistp256',
	+ );
	+
	+ if (!in_array($type, $recognized_keys)) {
	$e_key = pht('Invalid');
	- $errors[] = pht('Public key should be "ssh-dsa" or "ssh-rsa".');
	+ $type_list = implode(', ', $recognized_keys);
	+ $errors[] = pht('Public key should be one of: %s', $type_list);
	} else {
	$key->setKeyType($type);
	$key->setKeyBody($body);