r113410 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r113409‎ | r113410 | r113411 >
Date:22:00, 8 March 2012
Author:platonides
Status:ok
Tags:
Comment:
Also support with ssh-keygen the not-to-be-used feature of
extracting public keys from private PuTTY files, which could
be done with puttygen backend.
Follow-up r113409.
Modified paths:
  • /trunk/extensions/OpenStackManager/special/SpecialNovaKey.php (modified) (history)

Diff [purge]

Index: trunk/extensions/OpenStackManager/special/SpecialNovaKey.php
@@ -259,6 +259,11 @@
260260 if ( wfIsWindows() || !$wgSshKeygen )
261261 return false;
262262
 263+ if ( substr_compare( $keydata, 'PuTTY-User-Key-File-2:', 0, 22 ) == 0 ) {
 264+ $keydata = explode( "\nPrivate-Lines:", $keydata, 2 );
 265+ $keydata = $keydata[0] . "\n";
 266+ }
 267+
263268 $descriptorspec = array(
264269 0 => array("pipe", "r"),
265270 1 => array("pipe", "w"),

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r113409Follow-up r113405. Add support for changing ssh key formats...platonides21:48, 8 March 2012

Status & tagging log