cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add references to SshSignatureConverter

Browse Source
This commit is contained in:
Christian Hagau
2018-04-27 00:00:00 +00:00
parent ba03969f7c
commit e849ee3ca8
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ssh/signature/SshSignatureConverter.java
View File

@@ -32,15 +32,17 @@ import java.security.NoSuchAlgorithmException;
public class SshSignatureConverter { public class SshSignatureConverter {
private static String getRsaSignatureFormatId(int hashAlgorithm) throws NoSuchAlgorithmException { private static String getRsaSignatureFormatId(int hashAlgorithm) throws NoSuchAlgorithmException {
// https://tools.ietf.org/html/rfc8332
switch (hashAlgorithm) { switch (hashAlgorithm) {
case HashAlgorithmTags.SHA512: case HashAlgorithmTags.SHA512:
// https://tools.ietf.org/html/rfc8332
return "rsa-sha2-512"; return "rsa-sha2-512";
case HashAlgorithmTags.SHA256: case HashAlgorithmTags.SHA256:
// https://tools.ietf.org/html/rfc8332
return "rsa-sha2-256"; return "rsa-sha2-256";
case HashAlgorithmTags.SHA1: case HashAlgorithmTags.SHA1:
// https://tools.ietf.org/html/rfc4253
return "ssh-rsa"; return "ssh-rsa";
default: default:
@@ -105,6 +107,7 @@ public class SshSignatureConverter {
public static byte[] getSshSignatureEdDsa(byte[] rawSignature) { public static byte[] getSshSignatureEdDsa(byte[] rawSignature) {
SshEncodedData signature = new SshEncodedData(); SshEncodedData signature = new SshEncodedData();
// https://tools.ietf.org/html/draft-ietf-curdle-ssh-ed25519-ed448-00
signature.putString("ssh-ed25519"); signature.putString("ssh-ed25519");
signature.putString(rawSignature); signature.putString(rawSignature);
@@ -113,6 +116,7 @@ public class SshSignatureConverter {
public static byte[] getSshSignatureDsa(byte[] rawSignature) { public static byte[] getSshSignatureDsa(byte[] rawSignature) {
SshEncodedData signature = new SshEncodedData(); SshEncodedData signature = new SshEncodedData();
// https://tools.ietf.org/html/rfc4253
signature.putString("ssh-dss"); signature.putString("ssh-dss");
signature.putString(getDsaSignatureBlob(rawSignature)); signature.putString(getDsaSignatureBlob(rawSignature));
@@ -129,6 +133,7 @@ public class SshSignatureConverter {
public static byte[] getSshSignatureEcDsa(byte[] rawSignature, String curveOid) throws NoSuchAlgorithmException { public static byte[] getSshSignatureEcDsa(byte[] rawSignature, String curveOid) throws NoSuchAlgorithmException {
SshEncodedData signature = new SshEncodedData(); SshEncodedData signature = new SshEncodedData();
// https://tools.ietf.org/html/rfc5656
signature.putString("ecdsa-sha2-" + SshUtils.getCurveName(curveOid)); signature.putString("ecdsa-sha2-" + SshUtils.getCurveName(curveOid));
signature.putString(getEcDsaSignatureBlob(rawSignature)); signature.putString(getEcDsaSignatureBlob(rawSignature));