From c0426f1b41e9bc8978d813df0b687ceeeeb473d7 Mon Sep 17 00:00:00 2001 From: J08nY Date: Thu, 28 Mar 2024 10:21:30 +0100 Subject: Use vendored mbedTLS. Remove MatrixSSL. --- .../ectester/standalone/ECTesterStandalone.java | 1 - .../crcs/ectester/standalone/libs/MatrixsslLib.java | 20 -------------------- .../standalone/libs/jni/NativeECPrivateKey.java | 7 ------- .../standalone/libs/jni/NativeECPublicKey.java | 7 ------- .../standalone/libs/jni/NativeKeyAgreementSpi.java | 20 -------------------- .../libs/jni/NativeKeyPairGeneratorSpi.java | 19 ------------------- .../standalone/libs/jni/NativeProvider.java | 11 ----------- .../standalone/libs/jni/NativeSignatureSpi.java | 21 --------------------- 8 files changed, 106 deletions(-) delete mode 100644 standalone/src/main/java/cz/crcs/ectester/standalone/libs/MatrixsslLib.java (limited to 'standalone/src/main/java') diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java b/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java index cfdb964..53e9024 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java @@ -121,7 +121,6 @@ public class ECTesterStandalone { WolfCryptLib.class, MbedTLSLib.class, IppcpLib.class, - MatrixsslLib.class, NettleLib.class, LibresslLib.class}; for (Class c : libClasses) { diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/MatrixsslLib.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/MatrixsslLib.java deleted file mode 100644 index fcc13ea..0000000 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/MatrixsslLib.java +++ /dev/null @@ -1,20 +0,0 @@ -package cz.crcs.ectester.standalone.libs; - -import java.security.Provider; -import java.util.Set; - -/** - * @author Jan Jancar johny@neuromancer.sk - */ -public class MatrixsslLib extends NativeECLibrary { - - public MatrixsslLib() { - super("matrixssl_provider"); - } - - @Override - native Provider createProvider(); - - @Override - public native Set getCurves(); -} diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeECPrivateKey.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeECPrivateKey.java index 34f04e9..a788181 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeECPrivateKey.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeECPrivateKey.java @@ -119,13 +119,6 @@ public abstract class NativeECPrivateKey implements ECPrivateKey { } } - @SuppressWarnings("serial") - public static class Matrixssl extends Raw { - public Matrixssl(byte[] keyData, ECParameterSpec params) { - super(keyData, params); - } - } - @SuppressWarnings("serial") public static class Libressl extends Raw { public Libressl(byte[] keyData, ECParameterSpec params) { diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeECPublicKey.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeECPublicKey.java index 16d903d..4761f11 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeECPublicKey.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeECPublicKey.java @@ -120,13 +120,6 @@ public abstract class NativeECPublicKey implements ECPublicKey { } } - @SuppressWarnings("serial") - public static class Matrixssl extends ANSIX962 { - public Matrixssl(byte[] keyData, ECParameterSpec params) { - super(keyData, params); - } - } - @SuppressWarnings("serial") public static class Libressl extends ANSIX962 { public Libressl(byte[] keyData, ECParameterSpec params) { diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java index 938af73..894da27 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeKeyAgreementSpi.java @@ -354,26 +354,6 @@ public abstract class NativeKeyAgreementSpi extends KeyAgreementSpi { } } - public abstract static class Matrixssl extends SimpleKeyAgreementSpi { - private final String type; - - public Matrixssl(String type) { - this.type = type; - } - - @Override - native byte[] generateSecret(byte[] pubkey, byte[] privkey, ECParameterSpec params); - - @Override - native SecretKey generateSecret(byte[] pubkey, byte[] privkey, ECParameterSpec params, String algorithm); - } - - public static class MatrixsslECDH extends Matrixssl { - public MatrixsslECDH() { - super("ECDH"); - } - } - public abstract static class Libressl extends SimpleKeyAgreementSpi { private final String type; diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeKeyPairGeneratorSpi.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeKeyPairGeneratorSpi.java index 4b5d652..0a9487f 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeKeyPairGeneratorSpi.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeKeyPairGeneratorSpi.java @@ -293,25 +293,6 @@ public abstract class NativeKeyPairGeneratorSpi extends KeyPairGeneratorSpi { @Override native KeyPair generate(AlgorithmParameterSpec params, SecureRandom random); } - - public static class Matrixssl extends NativeKeyPairGeneratorSpi { - - public Matrixssl() { - initialize(256, new SecureRandom()); - } - - @Override - native boolean keysizeSupported(int keysize); - - @Override - native boolean paramsSupported(AlgorithmParameterSpec params); - - @Override - native KeyPair generate(int keysize, SecureRandom random); - - @Override - native KeyPair generate(AlgorithmParameterSpec params, SecureRandom random); - } public static class Libressl extends NativeKeyPairGeneratorSpi { diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeProvider.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeProvider.java index e036937..9ea1186 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeProvider.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeProvider.java @@ -124,17 +124,6 @@ public abstract class NativeProvider extends Provider { native void setup(); } - @SuppressWarnings("serial") - public static class Matrixssl extends NativeProvider { - - public Matrixssl(String name, double version, String info) { - super(name, version, info); - } - - @Override - native void setup(); - } - @SuppressWarnings("serial") public static class Libressl extends NativeProvider { diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeSignatureSpi.java b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeSignatureSpi.java index fd8d5ca..571a2ee 100644 --- a/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeSignatureSpi.java +++ b/standalone/src/main/java/cz/crcs/ectester/standalone/libs/jni/NativeSignatureSpi.java @@ -505,27 +505,6 @@ public abstract class NativeSignatureSpi extends SignatureSpi { } } - public abstract static class Matrixssl extends SimpleSignatureSpi { - private final String type; - - public Matrixssl(String type) { - this.type = type; - } - - @Override - native byte[] sign(byte[] data, byte[] privkey, ECParameterSpec params); - - @Override - native boolean verify(byte[] signature, byte[] data, byte[] pubkey, ECParameterSpec params); - } - - public static class MatrixsslECDSAwithNONE extends Matrixssl { - - public MatrixsslECDSAwithNONE() { - super("NONEwithECDSA"); - } - } - public abstract static class Mscng extends ExtendedSignatureSpi { private final String type; -- cgit v1.3