This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 0c2a18fdd5f3b600eaf4eccd7800309fd2ba6ffc (commit)
from 269167b0c7020d6e4bbe556e2cb883d3eb799433 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=0c2a18fdd5f3b600eaf4eccd7800309fd2ba6ffc
commit 0c2a18fdd5f3b600eaf4eccd7800309fd2ba6ffc
Author: Franck Villaume <[email protected]>
Date: Tue Sep 8 21:21:23 2015 +0200
edit ssh keys: only ssh v2 is supported. All ssh v1 keys are rejected on
validation.
diff --git a/src/www/account/editsshkeys.php b/src/www/account/editsshkeys.php
index b400c51..195fa83 100644
--- a/src/www/account/editsshkeys.php
+++ b/src/www/account/editsshkeys.php
@@ -65,10 +65,10 @@ if (count($sshKeysArray)) {
echo $HTML->openForm(array('action' =>
util_make_uri('/account/?action=addsshkey'), 'method' => 'post', 'enctype' =>
'multipart/form-data'));
echo html_e('h2', array(), _('Add a new ssh key'));
echo html_e('p', array(), _('To avoid having to type your password every time
for your SSH developer account, you may upload your public key(s) here and they
will be placed on the server in your ~/.ssh/authorized_keys file. Uploaded SSH
keys are effective <em>immediately</em>.'));
-echo html_e('p', array(), _('To generate a public key, run the program
\'ssh-keygen\' (you can use both protocol 1 or 2). The public key will be
placed at \'~/.ssh/identity.pub\' (protocol version 1) and
\'~/.ssh/id_dsa.pub\', \'~/.ssh/id_rsa.pub\', \'~/.ssh/id_ecdsa.pub\' or
\'~/.ssh/id_ed25519.pub\' (protocol version 2). Read the ssh documentation for
further information on sharing keys.'));
+echo html_e('p', array(), _('To generate a public key, run the program
\'ssh-keygen\'. The public key will be placed at \'~/.ssh/id_dsa.pub\',
\'~/.ssh/id_rsa.pub\', \'~/.ssh/id_ecdsa.pub\' or \'~/.ssh/id_ed25519.pub\'
(protocol version 2). Read the ssh documentation for further information on
sharing keys.'));
echo html_e('p', array(), html_e('em', array(), _('Important: Make sure there
are no line breaks. After submitting, verify that the number of keys in your
file is what you expected.')));
echo html_e('textarea', array('rows' => 10, 'cols' => 80, 'name' =>
'authorized_key', 'style' => 'width:90%;'), '', false);
-echo html_e('p', array(), _('Or upload your \'~/.ssh/identity.pub\' (protocol
version 1) or \'~/.ssh/id_dsa.pub\', \'~/.ssh/id_rsa.pub\',
\'~/.ssh/id_ecdsa.pub\' or \'~/.ssh/id_ed25519.pub\' (protocol version 2)'));
+echo html_e('p', array(), _('Or upload your \'~/.ssh/id_dsa.pub\',
\'~/.ssh/id_rsa.pub\', \'~/.ssh/id_ecdsa.pub\' or \'~/.ssh/id_ed25519.pub\'
(protocol version 2)'));
echo html_e('input', array('type' => 'file', 'name' => 'uploaded_filekey'));
echo html_e('p', array(), html_e('input', array('type' => 'submit', 'name' =>
'submit', 'value' => _('Add'))));
echo $HTML->closeForm();
-----------------------------------------------------------------------
Summary of changes:
src/www/account/editsshkeys.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
