aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJ08nY2021-08-24 13:19:01 +0200
committerJ08nY2021-08-24 13:19:01 +0200
commit7ac1d3730eb0544be12b12e39c911d7d596af8f3 (patch)
tree5614640ce2e6cd7f6058e294128c79bf802bb1ed /src
parent1ceb048d2e127cd0930aa3ebc43ffd241326869a (diff)
downloadECTester-7ac1d3730eb0544be12b12e39c911d7d596af8f3.tar.gz
ECTester-7ac1d3730eb0544be12b12e39c911d7d596af8f3.tar.zst
ECTester-7ac1d3730eb0544be12b12e39c911d7d596af8f3.zip
Diffstat (limited to 'src')
-rw-r--r--src/cz/crcs/ectester/applet/EC_Consts.java1
-rw-r--r--src/cz/crcs/ectester/common/cli/TreeCommandLine.java1
-rw-r--r--src/cz/crcs/ectester/common/ec/RawECPrivateKey.java1
-rw-r--r--src/cz/crcs/ectester/common/ec/RawECPublicKey.java1
-rw-r--r--src/cz/crcs/ectester/common/test/TestException.java1
-rw-r--r--src/cz/crcs/ectester/common/test/TestSuiteException.java1
-rw-r--r--src/cz/crcs/ectester/standalone/libs/jni/NativeECPrivateKey.java15
-rw-r--r--src/cz/crcs/ectester/standalone/libs/jni/NativeECPublicKey.java14
-rw-r--r--src/cz/crcs/ectester/standalone/libs/jni/NativeProvider.java15
9 files changed, 48 insertions, 2 deletions
diff --git a/src/cz/crcs/ectester/applet/EC_Consts.java b/src/cz/crcs/ectester/applet/EC_Consts.java
index 2883ff1..81016ac 100644
--- a/src/cz/crcs/ectester/applet/EC_Consts.java
+++ b/src/cz/crcs/ectester/applet/EC_Consts.java
@@ -1472,6 +1472,7 @@ public class EC_Consts {
return curve <= FP_CURVES ? KeyPair.ALG_EC_FP : KeyPair.ALG_EC_F2M;
}
+ @SuppressWarnings("fallthrough")
public static short toX962(byte form, byte[] outputBuffer, short outputOffset, byte[] xBuffer, short xOffset, short xLength, byte[] yBuffer, short yOffset, short yLength) {
short size = 1;
size += xLength;
diff --git a/src/cz/crcs/ectester/common/cli/TreeCommandLine.java b/src/cz/crcs/ectester/common/cli/TreeCommandLine.java
index 6a044d2..d758b78 100644
--- a/src/cz/crcs/ectester/common/cli/TreeCommandLine.java
+++ b/src/cz/crcs/ectester/common/cli/TreeCommandLine.java
@@ -13,6 +13,7 @@ import java.util.function.BiFunction;
/**
* @author Jan Jancar johny@neuromancer.sk
*/
+@SuppressWarnings("serial")
public class TreeCommandLine extends CommandLine {
private String name = "";
private TreeCommandLine next;
diff --git a/src/cz/crcs/ectester/common/ec/RawECPrivateKey.java b/src/cz/crcs/ectester/common/ec/RawECPrivateKey.java
index f4556a0..479118f 100644
--- a/src/cz/crcs/ectester/common/ec/RawECPrivateKey.java
+++ b/src/cz/crcs/ectester/common/ec/RawECPrivateKey.java
@@ -9,6 +9,7 @@ import java.security.spec.ECParameterSpec;
/**
* @author Jan Jancar johny@neuromancer.sk
*/
+@SuppressWarnings("serial")
public class RawECPrivateKey implements ECPrivateKey {
private BigInteger scalar;
private ECParameterSpec params;
diff --git a/src/cz/crcs/ectester/common/ec/RawECPublicKey.java b/src/cz/crcs/ectester/common/ec/RawECPublicKey.java
index f09feef..7888854 100644
--- a/src/cz/crcs/ectester/common/ec/RawECPublicKey.java
+++ b/src/cz/crcs/ectester/common/ec/RawECPublicKey.java
@@ -9,6 +9,7 @@ import java.security.spec.ECPoint;
/**
* @author Jan Jancar johny@neuromancer.sk
*/
+@SuppressWarnings("serial")
public class RawECPublicKey implements ECPublicKey {
private ECPoint point;
private ECParameterSpec params;
diff --git a/src/cz/crcs/ectester/common/test/TestException.java b/src/cz/crcs/ectester/common/test/TestException.java
index 291a073..0b605eb 100644
--- a/src/cz/crcs/ectester/common/test/TestException.java
+++ b/src/cz/crcs/ectester/common/test/TestException.java
@@ -7,6 +7,7 @@ package cz.crcs.ectester.common.test;
*
* @author Jan Jancar johny@neuromancer.sk
*/
+@SuppressWarnings("serial")
public class TestException extends RuntimeException {
public TestException(Throwable e) {
super(e);
diff --git a/src/cz/crcs/ectester/common/test/TestSuiteException.java b/src/cz/crcs/ectester/common/test/TestSuiteException.java
index cc3cfda..2d1ea09 100644
--- a/src/cz/crcs/ectester/common/test/TestSuiteException.java
+++ b/src/cz/crcs/ectester/common/test/TestSuiteException.java
@@ -6,6 +6,7 @@ package cz.crcs.ectester.common.test;
*
* @author Jan Jancar johny@neuromancer.sk
*/
+@SuppressWarnings("serial")
public class TestSuiteException extends RuntimeException {
public TestSuiteException(Throwable e) {
super(e);
diff --git a/src/cz/crcs/ectester/standalone/libs/jni/NativeECPrivateKey.java b/src/cz/crcs/ectester/standalone/libs/jni/NativeECPrivateKey.java
index 7885c0d..81bd387 100644
--- a/src/cz/crcs/ectester/standalone/libs/jni/NativeECPrivateKey.java
+++ b/src/cz/crcs/ectester/standalone/libs/jni/NativeECPrivateKey.java
@@ -10,6 +10,7 @@ import java.security.spec.ECParameterSpec;
/**
* @author Jan Jancar johny@neuromancer.sk
*/
+@SuppressWarnings("serial")
public abstract class NativeECPrivateKey implements ECPrivateKey {
private String algorithm;
private String format;
@@ -38,6 +39,7 @@ public abstract class NativeECPrivateKey implements ECPrivateKey {
public abstract byte[] getData();
+ @SuppressWarnings("serial")
private static class Raw extends NativeECPrivateKey {
byte[] keyData;
@@ -61,66 +63,77 @@ public abstract class NativeECPrivateKey implements ECPrivateKey {
}
}
+ @SuppressWarnings("serial")
public static class TomCrypt extends Raw {
public TomCrypt(byte[] keyData, ECParameterSpec params) {
super(keyData, params);
}
}
+ @SuppressWarnings("serial")
public static class Botan extends Raw {
public Botan(byte[] keyData, ECParameterSpec params) {
super(keyData, params);
}
}
+ @SuppressWarnings("serial")
public static class Cryptopp extends Raw {
public Cryptopp(byte[] keyData, ECParameterSpec params) {
super(keyData, params);
}
}
+ @SuppressWarnings("serial")
public static class Openssl extends Raw {
public Openssl(byte[] keyData, ECParameterSpec params) {
super(keyData, params);
}
}
+ @SuppressWarnings("serial")
public static class Boringssl extends Raw {
public Boringssl(byte[] keyData, ECParameterSpec params) {
super(keyData, params);
}
}
+ @SuppressWarnings("serial")
public static class Gcrypt extends Raw {
public Gcrypt(byte[] keyData, ECParameterSpec params) {
super(keyData, params);
}
}
+ @SuppressWarnings("serial")
public static class MbedTLS extends Raw {
public MbedTLS(byte[] keyData, ECParameterSpec params) {
super(keyData, params);
}
}
+ @SuppressWarnings("serial")
public static class Ippcp extends Raw {
public Ippcp(byte[] keyData, ECParameterSpec params) {
super(keyData, params);
}
}
+ @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) {
super(keyData, params);
}
}
+ @SuppressWarnings("serial")
public static class Mscng extends Raw {
// 0 -> implicit (meta = curveName UTF16, header = full);
// 1 -> explicit (meta = null, header = full);
@@ -162,10 +175,10 @@ public abstract class NativeECPrivateKey implements ECPrivateKey {
}
}
+ @SuppressWarnings("serial")
public static class Nettle extends Raw {
public Nettle(byte[] keyData, ECParameterSpec params) {
super(keyData, params);
}
}
-
}
diff --git a/src/cz/crcs/ectester/standalone/libs/jni/NativeECPublicKey.java b/src/cz/crcs/ectester/standalone/libs/jni/NativeECPublicKey.java
index aec68d0..7a8de83 100644
--- a/src/cz/crcs/ectester/standalone/libs/jni/NativeECPublicKey.java
+++ b/src/cz/crcs/ectester/standalone/libs/jni/NativeECPublicKey.java
@@ -11,6 +11,7 @@ import java.security.spec.ECPoint;
/**
* @author Jan Jancar johny@neuromancer.sk
*/
+@SuppressWarnings("serial")
public abstract class NativeECPublicKey implements ECPublicKey {
private String algorithm;
private String format;
@@ -39,6 +40,7 @@ public abstract class NativeECPublicKey implements ECPublicKey {
public abstract byte[] getData();
+ @SuppressWarnings("serial")
private static class ANSIX962 extends NativeECPublicKey {
byte[] keyData;
@@ -62,66 +64,77 @@ public abstract class NativeECPublicKey implements ECPublicKey {
}
}
+ @SuppressWarnings("serial")
public static class TomCrypt extends ANSIX962 {
public TomCrypt(byte[] keyData, ECParameterSpec params) {
super(keyData, params);
}
}
+ @SuppressWarnings("serial")
public static class Botan extends ANSIX962 {
public Botan(byte[] keyData, ECParameterSpec params) {
super(keyData, params);
}
}
+ @SuppressWarnings("serial")
public static class Cryptopp extends ANSIX962 {
public Cryptopp(byte[] keyData, ECParameterSpec params) {
super(keyData, params);
}
}
+ @SuppressWarnings("serial")
public static class Openssl extends ANSIX962 {
public Openssl(byte[] keyData, ECParameterSpec params) {
super(keyData, params);
}
}
+ @SuppressWarnings("serial")
public static class Boringssl extends ANSIX962 {
public Boringssl(byte[] keyData, ECParameterSpec params) {
super(keyData, params);
}
}
+ @SuppressWarnings("serial")
public static class Gcrypt extends ANSIX962 {
public Gcrypt(byte[] keyData, ECParameterSpec params) {
super(keyData, params);
}
}
+ @SuppressWarnings("serial")
public static class MbedTLS extends ANSIX962 {
public MbedTLS(byte[] keyData, ECParameterSpec params) {
super(keyData, params);
}
}
+ @SuppressWarnings("serial")
public static class Ippcp extends ANSIX962 {
public Ippcp(byte[] keyData, ECParameterSpec params) {
super(keyData, params);
}
}
+ @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) {
super(keyData, params);
}
}
+ @SuppressWarnings("serial")
public static class Mscng extends ANSIX962 {
// 0 -> implicit (meta = curveName UTF16, header = full);
// 1 -> explicit (meta = null, header = full);
@@ -163,6 +176,7 @@ public abstract class NativeECPublicKey implements ECPublicKey {
}
}
+ @SuppressWarnings("serial")
public static class Nettle extends ANSIX962 {
public Nettle(byte[] keyData, ECParameterSpec params) {
super(keyData, params);
diff --git a/src/cz/crcs/ectester/standalone/libs/jni/NativeProvider.java b/src/cz/crcs/ectester/standalone/libs/jni/NativeProvider.java
index 3d9a38a..e036937 100644
--- a/src/cz/crcs/ectester/standalone/libs/jni/NativeProvider.java
+++ b/src/cz/crcs/ectester/standalone/libs/jni/NativeProvider.java
@@ -7,6 +7,7 @@ import java.security.Provider;
/**
* @author Jan Jancar johny@neuromancer.sk
*/
+@SuppressWarnings("serial")
public abstract class NativeProvider extends Provider {
public NativeProvider(String name, double version, String info) {
@@ -24,6 +25,7 @@ public abstract class NativeProvider extends Provider {
abstract void setup();
+ @SuppressWarnings("serial")
public static class TomCrypt extends NativeProvider {
public TomCrypt(String name, double version, String info) {
@@ -34,6 +36,7 @@ public abstract class NativeProvider extends Provider {
native void setup();
}
+ @SuppressWarnings("serial")
public static class Botan extends NativeProvider {
public Botan(String name, double version, String info) {
@@ -44,6 +47,7 @@ public abstract class NativeProvider extends Provider {
native void setup();
}
+ @SuppressWarnings("serial")
public static class Cryptopp extends NativeProvider {
public Cryptopp(String name, double version, String info) {
@@ -54,6 +58,7 @@ public abstract class NativeProvider extends Provider {
native void setup();
}
+ @SuppressWarnings("serial")
public static class Openssl extends NativeProvider {
public Openssl(String name, double version, String info) {
@@ -64,6 +69,7 @@ public abstract class NativeProvider extends Provider {
native void setup();
}
+ @SuppressWarnings("serial")
public static class Boringssl extends NativeProvider {
public Boringssl(String name, double version, String info) {
@@ -74,6 +80,7 @@ public abstract class NativeProvider extends Provider {
native void setup();
}
+ @SuppressWarnings("serial")
public static class Gcrypt extends NativeProvider {
public Gcrypt(String name, double version, String info) {
@@ -84,6 +91,7 @@ public abstract class NativeProvider extends Provider {
native void setup();
}
+ @SuppressWarnings("serial")
public static class Mscng extends NativeProvider {
public Mscng(String name, double version, String info) {
@@ -94,6 +102,7 @@ public abstract class NativeProvider extends Provider {
native void setup();
}
+ @SuppressWarnings("serial")
public static class MbedTLS extends NativeProvider {
public MbedTLS(String name, double version, String info) {
@@ -104,6 +113,7 @@ public abstract class NativeProvider extends Provider {
native void setup();
}
+ @SuppressWarnings("serial")
public static class Ippcp extends NativeProvider {
public Ippcp(String name, double version, String info) {
@@ -114,6 +124,7 @@ 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) {
@@ -123,7 +134,8 @@ public abstract class NativeProvider extends Provider {
@Override
native void setup();
}
-
+
+ @SuppressWarnings("serial")
public static class Libressl extends NativeProvider {
public Libressl(String name, double version, String info) {
@@ -134,6 +146,7 @@ public abstract class NativeProvider extends Provider {
native void setup();
}
+ @SuppressWarnings("serial")
public static class Nettle extends NativeProvider {
public Nettle(String name, double version, String info) {