https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113410
Revision: 113410
Author: platonides
Date: 2012-03-08 22:00:49 +0000 (Thu, 08 Mar 2012)
Log Message:
-----------
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: trunk/extensions/OpenStackManager/special/SpecialNovaKey.php
===================================================================
--- trunk/extensions/OpenStackManager/special/SpecialNovaKey.php
2012-03-08 21:48:52 UTC (rev 113409)
+++ trunk/extensions/OpenStackManager/special/SpecialNovaKey.php
2012-03-08 22:00:49 UTC (rev 113410)
@@ -259,6 +259,11 @@
if ( wfIsWindows() || !$wgSshKeygen )
return false;
+ if ( substr_compare( $keydata, 'PuTTY-User-Key-File-2:', 0, 22
) == 0 ) {
+ $keydata = explode( "\nPrivate-Lines:", $keydata, 2 );
+ $keydata = $keydata[0] . "\n";
+ }
+
$descriptorspec = array(
0 => array("pipe", "r"),
1 => array("pipe", "w"),
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
