forked from PhilippC/keepass2android
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Migrate from com.jcraft:jsch 0.1.55 to com.github.mwiede:jsch 0.2.5
com.jcraft:jsch is not actively maintained anymore and lacks support for modern public key algorithms such as rsa-sha2-256. It only supports ssh-rsa which is disabled in up-to-date environments. com.github.mwiede:jsch was created as a drop-in replacement which works in modern environments [1]. Sources are taken from maven central [2]. The following files were omitted, because they depend on additional 3rd-party libraries which we do not have / do not need: com/jcraft/jsch/JUnixSocketFactory.java com/jcraft/jsch/Log4j2Logger.java com/jcraft/jsch/PageantConnector.java com/jcraft/jsch/Slf4jLogger.java com/jcraft/jsch/SSHAgentConnector.java com/jcraft/jsch/bc/* com/jcraft/jsch/jgss/GSSContextKrb5.java Fixes PhilippC#1812. [1] https://github.com/mwiede/jsch [2] https://repo1.maven.org/maven2/com/github/mwiede/jsch/0.2.5/jsch-0.2.5-sources.jar
- Loading branch information
Showing
193 changed files
with
15,670 additions
and
3,218 deletions.
There are no files selected for viewing
36 changes: 36 additions & 0 deletions
36
src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/AgentConnector.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ | ||
/* | ||
Copyright (c) 2011 ymnk, JCraft,Inc. All rights reserved. | ||
Redistribution and use in source and binary forms, with or without | ||
modification, are permitted provided that the following conditions are met: | ||
1. Redistributions of source code must retain the above copyright notice, | ||
this list of conditions and the following disclaimer. | ||
2. Redistributions in binary form must reproduce the above copyright | ||
notice, this list of conditions and the following disclaimer in | ||
the documentation and/or other materials provided with the distribution. | ||
3. The names of the authors may not be used to endorse or promote products | ||
derived from this software without specific prior written permission. | ||
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, | ||
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND | ||
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, | ||
INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, | ||
OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, | ||
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
*/ | ||
|
||
package com.jcraft.jsch; | ||
|
||
public interface AgentConnector { | ||
String getName(); | ||
boolean isAvailable(); | ||
void query(Buffer buffer) throws AgentProxyException; | ||
} |
80 changes: 80 additions & 0 deletions
80
src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/AgentIdentity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ | ||
/* | ||
Copyright (c) 2011 ymnk, JCraft,Inc. All rights reserved. | ||
Redistribution and use in source and binary forms, with or without | ||
modification, are permitted provided that the following conditions are met: | ||
1. Redistributions of source code must retain the above copyright notice, | ||
this list of conditions and the following disclaimer. | ||
2. Redistributions in binary form must reproduce the above copyright | ||
notice, this list of conditions and the following disclaimer in | ||
the documentation and/or other materials provided with the distribution. | ||
3. The names of the authors may not be used to endorse or promote products | ||
derived from this software without specific prior written permission. | ||
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, | ||
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND | ||
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, | ||
INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, | ||
OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, | ||
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
*/ | ||
|
||
package com.jcraft.jsch; | ||
|
||
class AgentIdentity implements Identity { | ||
|
||
private AgentProxy agent; | ||
private byte[] blob; | ||
private String comment; | ||
private String algname; | ||
AgentIdentity(AgentProxy agent, byte[] blob, String comment) { | ||
this.agent = agent; | ||
this.blob = blob; | ||
this.comment = comment; | ||
algname = Util.byte2str((new Buffer(blob)).getString()); | ||
} | ||
|
||
@Override | ||
public boolean setPassphrase(byte[] passphrase) throws JSchException{ | ||
return true; | ||
} | ||
|
||
@Override | ||
public byte[] getPublicKeyBlob() { return blob; } | ||
|
||
@Override | ||
public byte[] getSignature(byte[] data){ | ||
return agent.sign(blob, data, null); | ||
} | ||
|
||
@Override | ||
public byte[] getSignature(byte[] data, String alg){ | ||
return agent.sign(blob, data, alg); | ||
} | ||
|
||
@Override | ||
@Deprecated | ||
public boolean decrypt() { | ||
throw new RuntimeException("not implemented"); | ||
} | ||
|
||
@Override | ||
public String getAlgName() { return algname; } | ||
|
||
@Override | ||
public String getName() { return comment; } | ||
|
||
@Override | ||
public boolean isEncrypted() { return false; } | ||
|
||
@Override | ||
public void clear() { } | ||
} |
75 changes: 75 additions & 0 deletions
75
src/java/JavaFileStorage/app/src/main/java/com/jcraft/jsch/AgentIdentityRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
/* -*-mode:java; c-basic-offset:2; indent-tabs-mode:nil -*- */ | ||
/* | ||
Copyright (c) 2011 ymnk, JCraft,Inc. All rights reserved. | ||
Redistribution and use in source and binary forms, with or without | ||
modification, are permitted provided that the following conditions are met: | ||
1. Redistributions of source code must retain the above copyright notice, | ||
this list of conditions and the following disclaimer. | ||
2. Redistributions in binary form must reproduce the above copyright | ||
notice, this list of conditions and the following disclaimer in | ||
the documentation and/or other materials provided with the distribution. | ||
3. The names of the authors may not be used to endorse or promote products | ||
derived from this software without specific prior written permission. | ||
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, | ||
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND | ||
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT, | ||
INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, | ||
OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF | ||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING | ||
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, | ||
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
*/ | ||
|
||
package com.jcraft.jsch; | ||
|
||
import java.util.Vector; | ||
|
||
public class AgentIdentityRepository implements IdentityRepository { | ||
|
||
private AgentProxy agent; | ||
public AgentIdentityRepository(AgentConnector connector) { | ||
this.agent = new AgentProxy(connector); | ||
} | ||
|
||
@Override | ||
public Vector<Identity> getIdentities() { | ||
return agent.getIdentities(); | ||
} | ||
|
||
@Override | ||
public boolean add(byte[] identity) { | ||
return agent.addIdentity(identity); | ||
} | ||
|
||
@Override | ||
public boolean remove(byte[] blob) { | ||
return agent.removeIdentity(blob); | ||
} | ||
|
||
@Override | ||
public void removeAll() { | ||
agent.removeAllIdentities(); | ||
} | ||
|
||
@Override | ||
public String getName() { | ||
return agent.getConnector().getName(); | ||
} | ||
|
||
@Override | ||
public int getStatus() { | ||
if(agent.getConnector().isAvailable()){ | ||
return RUNNING; | ||
} | ||
else { | ||
return NOTRUNNING; | ||
} | ||
} | ||
} |
Oops, something went wrong.