Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIXED JENKINS-30109] Update to bouncycastle 1.53 #8

Merged
merged 3 commits into from Oct 30, 2015
Merged

[FIXED JENKINS-30109] Update to bouncycastle 1.53 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f59f93b
Upgrade to bouncycastle 1.52
seryl Aug 24, 2015
339f294
bump to 1.53
seryl Oct 30, 2015
b4d46d5
remove getLogger() from MinaRemoteAgent exception call
seryl Oct 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Expand Up @@ -101,7 +101,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>1.47</version>
<version>1.53</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
27 changes: 17 additions & 10 deletions src/main/java/com/cloudbees/jenkins/plugins/sshagent/jna/JNRRemoteAgent.java
View file
Open in desktop
Expand Up @@ -28,8 +28,11 @@
import com.cloudbees.jenkins.plugins.sshagent.RemoteAgent;
import hudson.model.TaskListener;
import org.apache.sshd.common.util.SecurityUtils;
import org.bouncycastle.openssl.PEMReader;
import org.bouncycastle.openssl.PasswordFinder;
import org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder;
import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
import org.bouncycastle.openssl.PEMEncryptedKeyPair;
import org.bouncycastle.openssl.PEMDecryptorProvider;
import org.bouncycastle.openssl.PEMParser;

import java.io.IOException;
import java.io.StringReader;
Expand Down Expand Up @@ -82,17 +85,21 @@ public void addIdentity(String privateKey, final String passphrase, String comme
}
}
try {
PEMReader r = new PEMReader(new StringReader(privateKey),
passphrase == null ? null : new PasswordFinder() {
public char[] getPassword() {
return passphrase.toCharArray();
}
});
PEMParser r = new PEMParser(new StringReader(privateKey));
JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("BC");
PEMDecryptorProvider decryptionProv = new JcePEMDecryptorProviderBuilder().build(
passphrase == null ? null : passphrase.toCharArray());
try {
Object o = r.readObject();
if (o instanceof KeyPair) {
agent.getAgent().addIdentity((KeyPair) o, comment);
KeyPair keyPair = null;

if (o instanceof PEMEncryptedKeyPair) {
keyPair = converter.getKeyPair(
((PEMEncryptedKeyPair) o).decryptKeyPair(decryptionProv));
} else if (o instanceof KeyPair) {
keyPair = ((KeyPair) o);
}
agent.getAgent().addIdentity(keyPair, comment);
} finally {
r.close();
}
Expand Down
27 changes: 17 additions & 10 deletions src/main/java/com/cloudbees/jenkins/plugins/sshagent/mina/MinaRemoteAgent.java
View file
Open in desktop
Expand Up @@ -29,8 +29,11 @@
import hudson.model.TaskListener;
import org.apache.sshd.agent.unix.AgentServer;
import org.apache.sshd.common.util.SecurityUtils;
import org.bouncycastle.openssl.PEMReader;
import org.bouncycastle.openssl.PasswordFinder;
import org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder;
import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
import org.bouncycastle.openssl.PEMEncryptedKeyPair;
import org.bouncycastle.openssl.PEMDecryptorProvider;
import org.bouncycastle.openssl.PEMParser;

import java.io.IOException;
import java.io.StringReader;
Expand Down Expand Up @@ -83,17 +86,21 @@ public void addIdentity(String privateKey, final String passphrase, String comme
}
}
try {
PEMReader r = new PEMReader(new StringReader(privateKey),
passphrase == null ? null : new PasswordFinder() {
public char[] getPassword() {
return passphrase.toCharArray();
}
});
PEMParser r = new PEMParser(new StringReader(privateKey));
JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("BC");
PEMDecryptorProvider decryptionProv = new JcePEMDecryptorProviderBuilder().build(
passphrase == null ? null : passphrase.toCharArray());
try {
Object o = r.readObject();
if (o instanceof KeyPair) {
agent.getAgent().addIdentity((KeyPair) o, comment);
KeyPair keyPair = null;

if (o instanceof PEMEncryptedKeyPair) {
keyPair = converter.getKeyPair(
((PEMEncryptedKeyPair) o).decryptKeyPair(decryptionProv));
} else if (o instanceof KeyPair) {
keyPair = ((KeyPair) o);
}
agent.getAgent().addIdentity(keyPair, comment);
} finally {
r.close();
}
Expand Down