diff options
3 files changed, 16 insertions, 11 deletions
diff --git a/src/cz/crcs/ectester/standalone/consts/SignatureIdent.java b/src/cz/crcs/ectester/standalone/consts/SignatureIdent.java index 42ff050..97276ce 100644 --- a/src/cz/crcs/ectester/standalone/consts/SignatureIdent.java +++ b/src/cz/crcs/ectester/standalone/consts/SignatureIdent.java @@ -79,7 +79,12 @@ public class SignatureIdent extends Ident { ALL.add(new SignatureIdent("SHA224withECGDSA", "1.3.36.3.3.2.5.4.4")); ALL.add(new SignatureIdent("SHA384withECGDSA", "1.3.36.3.3.2.5.4.5")); ALL.add(new SignatureIdent("SHA512withECGDSA", "1.3.36.3.3.2.5.4.6")); - + // Raw ECDSA, result is padded concatenation of (r, s) + ALL.add(new SignatureIdent("SHA1withECDSA(raw)")); + ALL.add(new SignatureIdent("SHA224withECDSA(raw)")); + ALL.add(new SignatureIdent("SHA256withECDSA(raw)")); + ALL.add(new SignatureIdent("SHA384withECDSA(raw)")); + ALL.add(new SignatureIdent("SHA512withECDSA(raw)")); } public static SignatureIdent get(String ident) { diff --git a/src/cz/crcs/ectester/standalone/libs/jni/NativeSignatureSpi.java b/src/cz/crcs/ectester/standalone/libs/jni/NativeSignatureSpi.java index 602b1c4..286945b 100644 --- a/src/cz/crcs/ectester/standalone/libs/jni/NativeSignatureSpi.java +++ b/src/cz/crcs/ectester/standalone/libs/jni/NativeSignatureSpi.java @@ -275,35 +275,35 @@ public abstract class NativeSignatureSpi extends SignatureSpi { public static class CryptoppECDSAwithSHA1 extends Cryptopp { public CryptoppECDSAwithSHA1() { - super("SHA1withECDSA"); + super("SHA1withECDSA(raw)"); } } public static class CryptoppECDSAwithSHA224 extends Cryptopp { public CryptoppECDSAwithSHA224() { - super("SHA224withECDSA"); + super("SHA224withECDSA(raw)"); } } public static class CryptoppECDSAwithSHA256 extends Cryptopp { public CryptoppECDSAwithSHA256() { - super("SHA256withECDSA"); + super("SHA256withECDSA(raw)"); } } public static class CryptoppECDSAwithSHA384 extends Cryptopp { public CryptoppECDSAwithSHA384() { - super("SHA384withECDSA"); + super("SHA384withECDSA(raw)"); } } public static class CryptoppECDSAwithSHA512 extends Cryptopp { public CryptoppECDSAwithSHA512() { - super("SHA512withECDSA"); + super("SHA512withECDSA(raw)"); } } diff --git a/src/cz/crcs/ectester/standalone/libs/jni/cryptopp.cpp b/src/cz/crcs/ectester/standalone/libs/jni/cryptopp.cpp index ccfbd6f..c538d51 100644 --- a/src/cz/crcs/ectester/standalone/libs/jni/cryptopp.cpp +++ b/src/cz/crcs/ectester/standalone/libs/jni/cryptopp.cpp @@ -103,11 +103,11 @@ JNIEXPORT void JNICALL Java_cz_crcs_ectester_standalone_libs_jni_NativeProvider_ add_ka(env, "ECDH", "CryptoppECDH", self, provider_put); - add_sig(env, "SHA1withECDSA", "CryptoppECDSAwithSHA1", self, provider_put); - add_sig(env, "SHA224withECDSA", "CryptoppECDSAwithSHA224", self, provider_put); - add_sig(env, "SHA256withECDSA", "CryptoppECDSAwithSHA256", self, provider_put); - add_sig(env, "SHA384withECDSA", "CryptoppECDSAwithSHA384", self, provider_put); - add_sig(env, "SHA512withECDSA", "CryptoppECDSAwithSHA512", self, provider_put); + add_sig(env, "SHA1withECDSA(raw)", "CryptoppECDSAwithSHA1", self, provider_put); + add_sig(env, "SHA224withECDSA(raw)", "CryptoppECDSAwithSHA224", self, provider_put); + add_sig(env, "SHA256withECDSA(raw)", "CryptoppECDSAwithSHA256", self, provider_put); + add_sig(env, "SHA384withECDSA(raw)", "CryptoppECDSAwithSHA384", self, provider_put); + add_sig(env, "SHA512withECDSA(raw)", "CryptoppECDSAwithSHA512", self, provider_put); init_classes(env, "Cryptopp"); } |