You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2011/09/21 23:07:07 UTC
svn commit: r1173858 - in /maven/wagon/trunk/wagon-providers:
wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/
wagon-ssh-common-test/src/main/resources/ssh-keys/
wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch...
Author: olamy
Date: Wed Sep 21 21:07:07 2011
New Revision: 1173858
URL: http://svn.apache.org/viewvc?rev=1173858&view=rev
Log:
[WAGON-350] add unit test for wagon ssh with an embedded ssh server : add unit test with key authz.
Added:
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa-passphrase
Modified:
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPublickeyAuthenticator.java
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa-passphrase
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa-passphrase.pub
maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa.pub
maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/EmbeddedScpWagonTest.java
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java?rev=1173858&r1=1173857&r2=1173858&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/SshServerEmbedded.java Wed Sep 21 21:07:07 2011
@@ -21,7 +21,6 @@ package org.apache.maven.wagon.providers
import org.apache.mina.core.session.IoSession;
import org.apache.sshd.SshServer;
import org.apache.sshd.common.Session;
-import org.apache.sshd.common.keyprovider.ResourceKeyPairProvider;
import org.apache.sshd.common.session.AbstractSession;
import org.apache.sshd.server.Command;
import org.apache.sshd.server.CommandFactory;
@@ -31,12 +30,14 @@ import org.apache.sshd.server.SshFile;
import org.apache.sshd.server.auth.UserAuthPassword;
import org.apache.sshd.server.auth.UserAuthPublicKey;
import org.apache.sshd.server.filesystem.NativeSshFile;
+import org.apache.sshd.server.keyprovider.PEMGeneratorHostKeyProvider;
import org.apache.sshd.server.session.SessionFactory;
import org.apache.sshd.server.shell.ProcessShellFactory;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
import java.io.IOException;
+import java.security.Security;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -60,6 +61,7 @@ public class SshServerEmbedded
private boolean keyAuthz;
+
/**
* @param wagonProtocol scp scpexe
* @param sshKeysResources paths in the classlaoder with ssh keys
@@ -72,6 +74,8 @@ public class SshServerEmbedded
this.sshd = SshServer.setUpDefaultServer();
+ //this.sshd.setKeyExchangeFactories( );
+
this.keyAuthz = keyAuthz;
publickeyAuthenticator = new TestPublickeyAuthenticator( this.keyAuthz );
@@ -93,10 +97,20 @@ public class SshServerEmbedded
sshd.setUserAuthFactories( Arrays.asList( new UserAuthPublicKey.Factory(), new UserAuthPassword.Factory() ) );
- ResourceKeyPairProvider resourceKeyPairProvider =
- new ResourceKeyPairProvider( sshKeysResources.toArray( new String[sshKeysResources.size()] ) );
+ //ResourceKeyPairProvider resourceKeyPairProvider =
+ // new ResourceKeyPairProvider( sshKeysResources.toArray( new String[sshKeysResources.size()] ) );
+
+ File path = new File( "target/keys" );
+ path.mkdirs();
+ path = new File( path, "simple.key" );
+ path.delete();
+
+ PEMGeneratorHostKeyProvider provider = new PEMGeneratorHostKeyProvider();
+ provider.setAlgorithm( "RSA" );
+ provider.setKeySize( 512 );
+ provider.setPath( path.getPath() );
- sshd.setKeyPairProvider( resourceKeyPairProvider );
+ sshd.setKeyPairProvider( provider );
SessionFactory sessionFactory = new SessionFactory()
{
@Override
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPublickeyAuthenticator.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPublickeyAuthenticator.java?rev=1173858&r1=1173857&r2=1173858&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPublickeyAuthenticator.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/TestPublickeyAuthenticator.java Wed Sep 21 21:07:07 2011
@@ -18,10 +18,20 @@ package org.apache.maven.wagon.providers
* under the License.
*/
+import org.apache.mina.util.Base64;
import org.apache.sshd.server.PublickeyAuthenticator;
import org.apache.sshd.server.session.ServerSession;
+import org.codehaus.plexus.util.IOUtil;
+import javax.crypto.Cipher;
+import java.io.InputStream;
+import java.math.BigInteger;
+import java.security.KeyFactory;
+import java.security.PrivateKey;
import java.security.PublicKey;
+import java.security.interfaces.RSAPublicKey;
+import java.security.spec.DSAPublicKeySpec;
+import java.security.spec.RSAPublicKeySpec;
import java.util.ArrayList;
import java.util.List;
@@ -47,8 +57,29 @@ public class TestPublickeyAuthenticator
{
return false;
}
- publickeyAuthenticatorRequests.add( new PublickeyAuthenticatorRequest( username, key ) );
- return true;
+ try
+ {
+ InputStream is =
+ Thread.currentThread().getContextClassLoader().getResourceAsStream( "ssh-keys/id_rsa.pub" );
+ PublicKey publicKey = decodePublicKey( IOUtil.toString( is ) );
+ publickeyAuthenticatorRequests.add( new PublickeyAuthenticatorRequest( username, key ) );
+
+ return ( (RSAPublicKey) publicKey ).getModulus().equals( ( (RSAPublicKey) publicKey ).getModulus() );
+ }
+ catch ( Exception e )
+ {
+ throw new RuntimeException( e.getMessage(), e );
+ }
+ }
+
+ public static byte[] decrypt( byte[] text, PrivateKey key )
+ throws Exception
+ {
+ byte[] dectyptedText = null;
+ Cipher cipher = Cipher.getInstance( "RSA/ECB/PKCS1Padding" );
+ cipher.init( Cipher.DECRYPT_MODE, key );
+ dectyptedText = cipher.doFinal( text );
+ return dectyptedText;
}
public static class PublickeyAuthenticatorRequest
@@ -74,4 +105,74 @@ public class TestPublickeyAuthenticator
return sb.toString();
}
}
+
+ private byte[] bytes;
+
+ private int pos;
+
+ public PublicKey decodePublicKey( String keyLine )
+ throws Exception
+ {
+ bytes = null;
+ pos = 0;
+
+ for ( String part : keyLine.split( " " ) )
+ {
+ if ( part.startsWith( "AAAA" ) )
+ {
+ bytes = Base64.decodeBase64( part.getBytes() );
+ break;
+ }
+ }
+ if ( bytes == null )
+ {
+ throw new IllegalArgumentException( "no Base64 part to decode" );
+ }
+
+ String type = decodeType();
+ if ( type.equals( "ssh-rsa" ) )
+ {
+ BigInteger e = decodeBigInt();
+ BigInteger m = decodeBigInt();
+ RSAPublicKeySpec spec = new RSAPublicKeySpec( m, e );
+ return KeyFactory.getInstance( "RSA" ).generatePublic( spec );
+ }
+ else if ( type.equals( "ssh-dss" ) )
+ {
+ BigInteger p = decodeBigInt();
+ BigInteger q = decodeBigInt();
+ BigInteger g = decodeBigInt();
+ BigInteger y = decodeBigInt();
+ DSAPublicKeySpec spec = new DSAPublicKeySpec( y, p, q, g );
+ return KeyFactory.getInstance( "DSA" ).generatePublic( spec );
+ }
+ else
+ {
+ throw new IllegalArgumentException( "unknown type " + type );
+ }
+ }
+
+ private String decodeType()
+ {
+ int len = decodeInt();
+ String type = new String( bytes, pos, len );
+ pos += len;
+ return type;
+ }
+
+ private int decodeInt()
+ {
+ return ( ( bytes[pos++] & 0xFF ) << 24 ) | ( ( bytes[pos++] & 0xFF ) << 16 ) | ( ( bytes[pos++] & 0xFF ) << 8 )
+ | ( bytes[pos++] & 0xFF );
+ }
+
+ private BigInteger decodeBigInt()
+ {
+ int len = decodeInt();
+ byte[] bigIntBytes = new byte[len];
+ System.arraycopy( bytes, pos, bigIntBytes, 0, len );
+ pos += len;
+ return new BigInteger( bigIntBytes );
+ }
+
}
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa?rev=1173858&r1=1173857&r2=1173858&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa Wed Sep 21 21:07:07 2011
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
-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
+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
-----END RSA PRIVATE KEY-----
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa-passphrase
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa-passphrase?rev=1173858&r1=1173857&r2=1173858&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa-passphrase (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa-passphrase Wed Sep 21 21:07:07 2011
@@ -1,30 +1,30 @@
-----BEGIN RSA PRIVATE KEY-----
Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-128-CBC,6487A91073F20F136496E505B62C0E30
+DEK-Info: AES-128-CBC,2F7CC6A20D25FED61F12C23469AC49DD
-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
+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
-----END RSA PRIVATE KEY-----
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa-passphrase.pub
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa-passphrase.pub?rev=1173858&r1=1173857&r2=1173858&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa-passphrase.pub (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa-passphrase.pub Wed Sep 21 21:07:07 2011
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2/NhGN0RJX0Fep/rUxjyoxHM78AXz1nSHeA0dOa2MLAKe12nIrBozRakQj7IAqKmJNDs8DqwzZANmVzWaApjX/CTHYZpYU1TSTN60ZevnHxyvFCcTYAy9ANeFKZZ86iwHke3pPu59cd/KfI5wn/xWw9zXEN4Q5BpC59aTKKggFsx/7p40S4R5vvK0Aqds8R1Qos6m6nfEgZHEe+vS6oHUn8/ab6inB3eK5DXp8K7sPpYpQiXameF6iYeTmcnAIct6zepdqgxqN/rrzStxnrQpfstf0hC+vdPzB4QmrtryqX0fzbe3H0RPUhdK7DbMMrUh5iZr8GNKkymDFSj4yCdh olamy@MacBook-Pro-de-Olivier.local
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCyGiWZ51dqd43eF0epQshEZAW0U7IpRh/lMjMJQ5PImcee6xKpj0jGdLxjatUZANtK3sfInwak/CiFaq+PthqxnyHgrFGxoNUEi9OPOLNfgLX80Kod1daavLoEfrrOs3JDYHqxfhZJ7ZGk13x8wvQYBO2p4BZ4JYDcfPvGTbx9KMbOCNOvw4BmVxDV/IRYXGDsYnhbAsybxtncL/7EuHumQ/gHCYXTFl/xE8yL3ZkgWlX+r/QUekSMxb3XK1Zw4r7Hbvkq/B+DeJE0nQ8jbDNQo1SpHbof1DHVY5L2DZlwQt5B8lvc1aevdFJxx9QdjPEKHjBwIjcuqFFyTqTcshZl guest@bashae
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa.pub
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa.pub?rev=1173858&r1=1173857&r2=1173858&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa.pub (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/resources/ssh-keys/id_rsa.pub Wed Sep 21 21:07:07 2011
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDF870ZMBvc6fMn2j3ewf1n7i9CJUYEVJaYAF/REhror1d8OWJ96uFNtBR7AsrfOoq+uxMSzJUQ/MvR1ds6SzTTsZ36kuEBgEponSI0aw+/4+wvaAvOmBKfAyuFG8DO0mhCACtghSGf8aUsLTq6qcKPXqE7HuQL+N7Izu7e3rs8iyjLg04wF8kbInUiAEdfkdtTrxnt2cfaQw3La2SIWANkbIM1U4gItdGnfYB+n7QvQEAvSnedSscmf/ZcmLZTDqihELGfKKxkhDdAl3Y6QfC667xIie+ZoNY0T7sg/7UXtvtOISmO7P34aw+uZpdi5qHrx3gRECwjpJHUwAchMGOz olamy@MacBook-Pro-de-Olivier.local
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBaI3FfP37Xay4+wSWxHnDhLj5bc6ax+XTLqc/Hlg9ghY/W24CbBdua0cUhzs9UpNMKBeCsDf3BdDbJcVy+0Q2ExVF0q8uzE6nQajxJcaMVu250E3+v68iMbS5ZeWmeDH9Aii9QsgG3W6fChLdAfLtRAzXfjNo215Jn9dyH9gUbclLqn8GIKhJrlnfOJXRJLBBvrmJbGN3oEe0dRKlL3WggZxo+4eheRbjJjSnI6ZDEbofpXlsanv/4eEiy92iKnv3Rph8d3wgAUfTOUSsDY+w65ys/Pb71lan9Yas/CfOjQQiafFjl8oK8CUj6jIp9BJak+ZrLbrsqI/55EjALS7n guest@bashae
\ No newline at end of file
Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/EmbeddedScpWagonTest.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/EmbeddedScpWagonTest.java?rev=1173858&r1=1173857&r2=1173858&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/EmbeddedScpWagonTest.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/java/org/apache/maven/wagon/providers/ssh/jsch/EmbeddedScpWagonTest.java Wed Sep 21 21:07:07 2011
@@ -125,16 +125,6 @@ public class EmbeddedScpWagonTest
authInfo.setUserName( TestData.getUserName() );
authInfo.setPassword( TestData.getUserPassword() );
- /*
- File privateKey = TestData.getPrivateKey();
-
- if ( privateKey.exists() )
- {
- authInfo.setPrivateKey( privateKey.getAbsolutePath() );
-
- authInfo.setPassphrase( "" );
- }*/
-
return authInfo;
}
@@ -149,4 +139,6 @@ public class EmbeddedScpWagonTest
{
return false;
}
+
+
}
Added: maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa?rev=1173858&view=auto
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa (added)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa Wed Sep 21 21:07:07 2011
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAwWiNxXz9+12suPsElsR5w4S4+W3Omsfl0y6nPx5YPYIWP1tu
+AmwXbmtHFIc7PVKTTCgXgrA39wXQ2yXFcvtENhMVRdKvLsxOp0Go8SXGjFbtudBN
+/r+vIjG0uWXlpngx/QIovULIBt1unwoS3QHy7UQM134zaNteSZ/Xch/YFG3JS6p/
+BiCoSa5Z3ziV0SSwQb65iWxjd6BHtHUSpS91oIGcaPuHoXkW4yY0pyOmQxG6H6V5
+bGp7/+HhIsvdoip790aYfHd8IAFH0zlErA2PsOucrPz2+9ZWp/WGrPwnzo0EImnx
+Y5fKCvAlI+oyKfQSWpPmay267KiP+eRIwC0u5wIDAQABAoIBACF6R4/3or7v6AXc
+7V5rg+gkASCrsSd5kn6LhMeYKQ38hn1RBinFLAkg6JzVC5wBvx1fkzI77nQDvbMx
+Rowwkg4KH5SGc2xWUQcChou3TjbclSmktNtzsozora+pw6adB4oT5ZldBeKqUYuV
+4s3+mF4ZeV+TqLJtxlRYJqLKgEyIp05H2u0GstcquK5pEiwjINc7TvdhgSWRlU8F
+WO94h0i0sWyCVGpMkVSJjqKk+npHEs5Go/AIdu8w02B5BpZ7rUmsf41+phGt0gs9
+wKZXxifE6RWIjzmDzqJGsIME08z8xqi+H1zsBECTOt8uGNKhPcefZ/2/GzByRJ3y
+y2zT4gECgYEA5TTF2ApoBlZgxrz9bzIs5lyX+g+dZKuE6w2bQeL5Kn896ZUmWcma
+mvhwMcT/OIXs4mRMoYWOf/hemnx1zgQpyW+j8SPc0Qh5EYuzIaeS/yH4Kqi+jRGP
+mCANGLd5Lc0jUuomJDDTAtBB/36FNDq3c9Iphl+elUtQo9ahkAfHZ9cCgYEA2AR/
+WCjRjLIBB+o5sYQhBOCLWN7l6VWdGjNtrOdelMLBH3ulfykWjIBPZS4/NoL58OLa
+DqJWOwtPOULC8gU32zXP8Md+bJ58Nm+biGLjtzQSenJVajq6GneKIHh10vgDEMeA
+o8lwnzomfJwqUVNjPqYWQQ6mDc9ByGMAy4ErT3ECgYAmGaWhielM1GL15kiCiWap
+TE7/BEV3jINlxzc9tosQo2IZR+++ESMgC5gqzcJXFPwRjfanCtprL1AaggHbIxoH
+IAWyefGk1bG6VuyJ9Z8bxfvIq5AxRvAFq55Bs43zLRxoFgANGAibeR7fZ5qg2fnQ
+yOiaK57i1kgrU+w7Uu+0tQKBgHBtXs3GaNGeL1UsPZy7VOgR6dR2Jhjb+ykQzSsp
+PBuWhSbalpbpDphPi4Lwn+vCHU2W88CcEt8mErSNn6KQvrJzfmclnRHxJlq6matR
+NI08J8XczcG9EPEHeDdQGpqThBzuiHA2PkxQ2okOSiQLj2Ki1IBFnH0hem5NwLMp
+5h2xAoGBAJcWmlm8L8g7+f381xGnujkhBWK4MVKI1aIZGEq9UuaEMjm9J+I9Ili4
+S8dAcjX6OlpcAKf8nJEHOpSjCYrL8X/lRNdevLrrzsTXS6j8AgncmScyXlJMQb8J
+wXfHWW+UWsTeZF46Pkir0eGGmWQCWq7mRoB9QmlTcJ8ESiejxDfc
+-----END RSA PRIVATE KEY-----
Added: maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa-passphrase
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa-passphrase?rev=1173858&view=auto
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa-passphrase (added)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/test/ssh-keys/id_rsa-passphrase Wed Sep 21 21:07:07 2011
@@ -0,0 +1,30 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-128-CBC,2F7CC6A20D25FED61F12C23469AC49DD
+
+ym47UX+S/eES57kPEAiC+8/LPYSIPPK0zzy8fp+rtnMaKvAgfoBScw5gV4u8d6nI
+cl9FSq+IYLrUZs3ojopWY7c1sCj/PD5TSxaHo9ZQWv+wRATNbwcF0aKcmJn0BOEQ
+f1AyPlMW4HIVm7N2+reUj0H6D7fJhdmyxvNj//DbIFYnR+arOgjfMsRmBpX7hBjG
+XOWG8GxIvFLmGHFn6zwmLq3FO4ojkab2bYjvoAathmdlHx1TZotcOdJmRxskCRL8
+4g1KTclZkth+jxhNecPbAQTcT2CLNphtv1lmitnsRfztIitUKo297m1qk5Qc/uYB
+ZAd5FXUxu8e6jZ5NgwYLPQveZhmLjCXBcejwFXhJPWjld+XYHtnEJm5cevZtSUhj
+E+1/jXrfsJF65uMH2mZYqLL+i8EllUS3wxP6xUoK6NwQfnrfIaFfDwwT6q8+vqmo
+wDmfg144Eu4ARoU1QMnQuFBxMShU/9HXBlyVhVsPBmfu27y9+cX9+aN3A9+1h3TB
+qfMOYMwDxOB+8hbbC5NbMr3jDGwS4IxR+kEaKV7XRKYs2Bi7aefWbEumdEuu3zKQ
+bgfi//Ias7FfwB9UbFY6RCJlnjihxCj0lwkVcj8LpK9AjxALQYmcRhCFfEvpMHC7
+HP1bGjIzmtHppvvK7Q5eKpjVWFG36Jh8IefpAywJbpJ7HBN2gFfsop3zQHo33LLp
+2I//Dz5n2iw+S5z8fPOOrZAZIZZpkxDepYXHsVEZ3lXQCxzAyx44RCMRlAEvAdFK
+XjlhO4VMUtfZ3JzOhni5qgUX61Z0+0oeh4pf+zxDH+UVNJmwPX4zWkDWyEWVO7Uj
+bIIZ/GU4obm5pTsX/0C/m3nFS1ZJKaE9A5/XaCTrF+LVhgj/cWKC3mfLRi86ohp9
+vU1vz+ASNJEenPavh0j12B+mz+MLQVk+fWk3EGIURwHHg1Cq0I/dmA8iIcvBTVQl
+nGKEwbGsLNbYE4YgxNuHPwJQ7nC414464kwCwt8myAOITUYi2pxePE5ZBo8b9Eyy
+s2vj5sXqj6tcbrmsBWGeTyH9WRwpFLy3Tbx8ntayuFd5fq0xc+3G74O8UgZP2Feo
+5EnPH+2kcU8E5+Lo9J4NzA3jblonKwCkR+13WgGuPJaLnSVQZn0m1sHll2UF2d6X
+/yCx+Knf8q7IU7lyK2JfpvGuNLfBfTCMFoOXgZvFo9MDUAgLluWXlH3BfekDtRlJ
+S2/x6tCrRwrtj9M+1ZNFU5Tr0gr6MtbVvIKtiP92XPmTGt8Z/8oLqcA5ioh+0sV1
+eolIGseUN5RRKfOfUqa3w0w6h0HRs26eG6x5gsdIZgT5yIEW2/tAQVyZTMRB/LYp
+8G1tCmpS+LQl/P1WcYIuALk0fqDYreAwFbqwKziTI+Grx7ir5nmGRdg4FTir4sbR
+FWOHWzJMjOaktTesiQQOip6o7lUy5Iy7mkeVRfWF9HYthlC8X9Em7S8gO8cjz7LY
+WxHmUuBX62Giw6Cxb+qxIIoNNWn134ncMtgBi3y+QqUpnGYtohnfQWlxtFzreoRY
+3CW0re+xpuFy8jAeIyA2hT8vyhLD0JA0hcdXTK+C+Rx12rtcBtQ6vaY73DpKggb4
+-----END RSA PRIVATE KEY-----