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

allow other curves than NIST on security tokens

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-03-10 13:48:58 +01:00
parent 3ea7eb3b2b
commit 95eeb91fc7
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/operations/PsoDecryptTokenOp.java
View File

@@ -30,7 +30,7 @@ import android.support.annotation.VisibleForTesting;
import javax.crypto.Cipher; import javax.crypto.Cipher;
import javax.crypto.NoSuchPaddingException; import javax.crypto.NoSuchPaddingException;
import javax.crypto.spec.SecretKeySpec; import javax.crypto.spec.SecretKeySpec;
import org.bouncycastle.asn1.nist.NISTNamedCurves; import org.bouncycastle.asn1.x9.ECNamedCurveTable;
import org.bouncycastle.asn1.x9.X9ECParameters; import org.bouncycastle.asn1.x9.X9ECParameters;
import org.bouncycastle.crypto.ec.CustomNamedCurves; import org.bouncycastle.crypto.ec.CustomNamedCurves;
import org.bouncycastle.jcajce.util.MessageDigestUtils; import org.bouncycastle.jcajce.util.MessageDigestUtils;
@@ -197,7 +197,7 @@ public class PsoDecryptTokenOp {
if (CustomNamedCurves.CV25519.equals(eckf.getCurveOID())) { if (CustomNamedCurves.CV25519.equals(eckf.getCurveOID())) {
return Arrays.copyOfRange(encryptedPoint, 1, 33); return Arrays.copyOfRange(encryptedPoint, 1, 33);
} else { } else {
X9ECParameters x9Params = NISTNamedCurves.getByOID(eckf.getCurveOID()); X9ECParameters x9Params = ECNamedCurveTable.getByOID(eckf.getCurveOID());
ECPoint p = x9Params.getCurve().decodePoint(encryptedPoint); ECPoint p = x9Params.getCurve().decodePoint(encryptedPoint);
if (!p.isValid()) { if (!p.isValid()) {
throw new CardException("Invalid EC point!"); throw new CardException("Invalid EC point!");