Mirrors/sshj
1
0
Fork 0
mirror of https://github.com/hierynomus/sshj.git synced 2025-12-08 08:10:55 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added support for RSA certificates as host key (#514)

Browse Source 
* Added support for RSA certificates as host key

* removed not needed check

* added rsa cert signature verification test
This commit is contained in:
Adam Iwaniuk
2019-05-27 10:46:01 +02:00
committed by Jeroen van Erp
parent 3c594d9a1c
commit 633b42fec8
3 changed files with 94 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/schmizz/sshj/DefaultConfig.java
View File

@@ -214,6 +214,7 @@ public class DefaultConfig
new SignatureECDSA.Factory384(),
new SignatureECDSA.Factory521(),
new SignatureRSA.Factory(),
new SignatureRSA.FactoryCERT(),
new SignatureDSA.Factory()
);
}

45
src/main/java/net/schmizz/sshj/signature/SignatureRSA.java
View File

@@ -15,10 +15,14 @@
*/
package net.schmizz.sshj.signature;
import com.hierynomus.sshj.userauth.certificate.Certificate;
import net.schmizz.sshj.common.KeyType;
import net.schmizz.sshj.common.SSHRuntimeException;
import java.security.InvalidKeyException;
import java.security.PublicKey;
import java.security.SignatureException;
import java.util.Date;
/** RSA {@link Signature} */
public class SignatureRSA
@@ -30,7 +34,7 @@ public class SignatureRSA
@Override
public Signature create() {
return new SignatureRSA();
return new SignatureRSA(KeyType.RSA.toString());
}
@Override
@@ -40,8 +44,42 @@ public class SignatureRSA
}
public SignatureRSA() {
/** A named factory for RSA {@link Signature} */
public static class FactoryCERT
implements net.schmizz.sshj.common.Factory.Named<Signature> {
@Override
public Signature create() {
return new SignatureRSA(KeyType.RSA_CERT.toString());
}
@Override
public String getName() {
return KeyType.RSA_CERT.toString();
}
}
private String keyTypeName;
public SignatureRSA(String keyTypeName) {
super("SHA1withRSA");
this.keyTypeName = keyTypeName;
}
@Override
@SuppressWarnings("unchecked")
public void initVerify(PublicKey publicKey) {
try {
if (this.keyTypeName.equals(KeyType.RSA_CERT.toString()) && publicKey instanceof Certificate) {
signature.initVerify(((Certificate<PublicKey>) publicKey).getKey());
} else {
signature.initVerify(publicKey);
}
} catch (InvalidKeyException e) {
throw new SSHRuntimeException(e);
}
}
@Override
@@ -51,12 +89,11 @@ public class SignatureRSA
@Override
public boolean verify(byte[] sig) {
sig = extractSig(sig, "ssh-rsa");
sig = extractSig(sig, KeyType.RSA.toString());
try {
return signature.verify(sig);
} catch (SignatureException e) {
throw new SSHRuntimeException(e);
}
}
}