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

Make KeyType compatible with Android Keystore #586

Merged
merged 5 commits into from
May 28, 2020
Merged

Make KeyType compatible with Android Keystore #586

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e523966
Make KeyType compatible with Android Keystore
FabianHenneke May 26, 2020
3382edb
Merge branch 'master' into fhenneke_aks
hierynomus May 27, 2020
07afbbc
Extract RSA, DSA, ECDSA and EC into constants
fmeum May 28, 2020
87d9aa3
Fix license lint issue
fmeum May 28, 2020
30f0361
Merge branch 'master' into fhenneke_aks
FabianHenneke May 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/net/schmizz/sshj/common/ECDSAVariationsAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ static void writePubKeyContentsIntoBuffer(PublicKey pk, Buffer<?> buf) {
}

static boolean isECKeyWithFieldSize(Key key, int fieldSize) {
return "ECDSA".equals(key.getAlgorithm())
return ("ECDSA".equals(key.getAlgorithm()) || "EC".equals(key.getAlgorithm()))
fmeum marked this conversation as resolved.
Show resolved Hide resolved
&& fieldSizeFromKey((ECKey) key) == fieldSize;
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/schmizz/sshj/common/KeyType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ protected void writePubKeyContentsIntoBuffer(PublicKey pk, Buffer<?> buf) {

@Override
protected boolean isMyType(Key key) {
return (key instanceof RSAPublicKey || key instanceof RSAPrivateKey);
return "RSA".equals(key.getAlgorithm());
fmeum marked this conversation as resolved.
Show resolved Hide resolved
}
},

Expand Down Expand Up @@ -99,7 +99,7 @@ protected void writePubKeyContentsIntoBuffer(PublicKey pk, Buffer<?> buf) {

@Override
protected boolean isMyType(Key key) {
return (key instanceof DSAPublicKey || key instanceof DSAPrivateKey);
return "DSA".equals(key.getAlgorithm());
}

},
Expand Down