Skip to content

Commit d963dd2

Browse files
committed
Clarify keystore types; improve exception message
1 parent 0445e84 commit d963dd2

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/main/java/com/hardssh/provider/SSHKeyStoreSpi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ private void reload() throws CertificateException {
323323
// Alias name: ...
324324
// Creation date: null
325325
// Unknown Entry Type
326-
var e = new SSHProvider.KeyPairEntry(identity.getKey().getJavaKey(), priv);
326+
var e = new SSHProvider.KeyPairEntry(identity.getKey(), priv);
327327
entries.put(identity.getFingerprint(), e);
328328
} else {
329329
throw new CertificateException("Unknown signer type: %s".formatted(identity));

src/main/java/com/hardssh/provider/SSHSignatureSpi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ private SSHSignature agent_sign(byte[] dtbs, SSHAgentPrivateKey keyref) throws S
118118
var p = SignResponse.fromByteBuffer(r);
119119
return p.getSignature();
120120
} else {
121-
throw new SignatureException("Could not sign: " + code);
121+
throw new SignatureException("Could not sign: " + AgentMessage.name(code));
122122
}
123123
} catch (IOException e) {
124124
throw new SignatureException("Can not transmit sign request: " + e.getMessage(), e);

src/test/java/com/hardssh/provider/TestProviderKeyStore.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void testKeyStore() throws Exception {
7272
var verify = Signature.getInstance("SHA256withECDSA");
7373
// XXX: this should not trigger.
7474
Assert.assertNotEquals(verify.getProvider().getName(), SSHProvider.NAME, "unexpected provider for native verification");
75-
verify.initVerify(keypair.publicKey());
75+
verify.initVerify(((SSHPublicKey) keypair.publicKey()).getJavaKey()); // FIXME: the types in entries need clarification
7676
verify.update(payload);
7777
Assert.assertTrue(verify.verify(result), "Native verification failed");
7878

0 commit comments

Comments
 (0)