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

Improve error handling for curve OID to SSH curve identifier translation

Browse Source
This commit is contained in:
Christian Hagau
2017-11-28 00:00:00 +00:00
parent d4c9f69696
commit de695fa2b0
6 changed files with 105 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,7 +128,7 @@ public class SshSignatureConverter {
return signature.getBytes();
}
public static byte[] getSshSignatureEcDsa(byte[] rawSignature, String curveOid) {
public static byte[] getSshSignatureEcDsa(byte[] rawSignature, String curveOid) throws NoSuchAlgorithmException {
SshEncodedData signature = new SshEncodedData();
signature.putString("ecdsa-sha2-" + SshUtils.getCurveName(curveOid));
signature.putString(getEcDsaSignatureBlob(rawSignature));

24
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ssh/utils/SshUtils.java
View File

@@ -17,9 +17,11 @@
package org.sufficientlysecure.keychain.ssh.utils;
import java.security.NoSuchAlgorithmException;
public class SshUtils {
public static String getCurveName(String curveOid) {
public static String getCurveName(String curveOid) throws NoSuchAlgorithmException {
// see RFC5656 section 10.{1,2}
switch (curveOid) {
// REQUIRED curves
@@ -32,26 +34,26 @@ public class SshUtils {
// RECOMMENDED curves
case "1.3.132.0.1":
return "1.3.132.0.1";
return "1.3.132.0.1";
case "1.2.840.10045.3.1.1":
return "1.2.840.10045.3.1.1";
return "1.2.840.10045.3.1.1";
case "1.3.132.0.33":
return "1.3.132.0.33";
return "1.3.132.0.33";
case "1.3.132.0.26":
return "1.3.132.0.26";
return "1.3.132.0.26";
case "1.3.132.0.27":
return "1.3.132.0.27";
return "1.3.132.0.27";
case "1.3.132.0.16":
return "1.3.132.0.16";
return "1.3.132.0.16";
case "1.3.132.0.36":
return "1.3.132.0.36";
return "1.3.132.0.36";
case "1.3.132.0.37":
return "1.3.132.0.37";
return "1.3.132.0.37";
case "1.3.132.0.38":
return "1.3.132.0.38";
return "1.3.132.0.38";
default:
return null;
throw new NoSuchAlgorithmException("Can't translate curve OID to SSH curve identifier");
}
}
}