Update EDSA

tests/ecdsatest.c

@@ -17,6 +17,7 @@
 #include <gmssl/rand.h>
 #include <gmssl/error.h>
 #include <gmssl/ecdsa.h>
+#include <gmssl/secp256r1_ecdsa.h>
 
 /*
 d  0x5
@@ -33,7 +34,7 @@ v  0x5ecbe4d1a6330a44c8f7ef951d4bf165e6c6b721efada985fb41661bc6e7fd6c
 static int test_ecdsa(void)
 {
 	SECP256R1_KEY key;
-	ECDSA_SIGNATURE sig;
+	SECP256R1_ECDSA_SIGNATURE sig;
 	uint8_t dgst[32];
 	secp256r1_t d;
 	secp256r1_t k;
@@ -54,13 +55,13 @@ static int test_ecdsa(void)
 	dgst[31] = 2;
 
 	/*
-	if (ecdsa_do_sign_ex(&key, k, dgst, &sig) != 1) {
+	if (secp256r1_ecdsa_do_sign_ex(&key, k, dgst, &sig) != 1) {
 		error_print();
 		return -1;
 	}
 	*/
 
-	if (ecdsa_do_sign(&key, dgst, &sig) != 1) {
+	if (secp256r1_ecdsa_do_sign(&key, dgst, &sig) != 1) {
 		error_print();
 		return -1;
 	}
@@ -71,7 +72,7 @@ static int test_ecdsa(void)
 	secp256r1_print(stderr, 0, 0, "s", sig.s);
 
 
-	if (ecdsa_do_verify(&key, dgst, &sig) != 1) {
+	if (secp256r1_ecdsa_do_verify(&key, dgst, &sig) != 1) {
 		error_print();
 		return -1;
 	}
@@ -83,7 +84,7 @@ static int test_ecdsa(void)
 static int test_ecdsa_verify_infinity(void)
 {
 	SECP256R1_KEY key;
-	ECDSA_SIGNATURE sig;
+	SECP256R1_ECDSA_SIGNATURE sig;
 	secp256r1_t d;
 	uint8_t dgst[32];
 	size_t dgstlen;
@@ -103,7 +104,51 @@ static int test_ecdsa_verify_infinity(void)
 		error_print();
 		return -1;
 	}
-	if (ecdsa_do_verify(&key, dgst, &sig) != 0) {
+	if (secp256r1_ecdsa_do_verify(&key, dgst, &sig) != 0) {
+		error_print();
+		return -1;
+	}
+
+	printf("%s() ok\n", __FUNCTION__);
+	return 1;
+}
+
+static int test_ecdsa_generic(void)
+{
+	EC_KEY key;
+	uint8_t dgst32[32];
+	uint8_t dgst48[48];
+	uint8_t sig[SECP256R1_ECDSA_SIGNATURE_MAX_SIZE];
+	size_t siglen;
+
+	key.oid = OID_secp256r1;
+	if (secp256r1_key_generate(&key.u.secp256r1_key) != 1) {
+		error_print();
+		return -1;
+	}
+	memset(dgst32, 0x11, sizeof(dgst32));
+	memset(dgst48, 0x22, sizeof(dgst48));
+
+	if (ecdsa_sign(&key, dgst32, sizeof(dgst32), sig, &siglen) != 1
+		|| siglen > sizeof(sig)
+		|| ecdsa_verify(&key, dgst32, sizeof(dgst32), sig, siglen) != 1) {
+		error_print();
+		return -1;
+	}
+	dgst32[0] ^= 0x01;
+	if (ecdsa_verify(&key, dgst32, sizeof(dgst32), sig, siglen) != 0) {
+		error_print();
+		return -1;
+	}
+
+	if (ecdsa_sign(&key, dgst48, sizeof(dgst48), sig, &siglen) != 1
+		|| siglen > sizeof(sig)
+		|| ecdsa_verify(&key, dgst48, sizeof(dgst48), sig, siglen) != 1) {
+		error_print();
+		return -1;
+	}
+	if (ecdsa_sign_fixed_len(&key, dgst48, sizeof(dgst48), siglen, sig) != 1
+		|| ecdsa_verify(&key, dgst48, sizeof(dgst48), sig, siglen) != 1) {
 		error_print();
 		return -1;
 	}
@@ -116,6 +161,7 @@ int main(void)
 {
 	if (test_ecdsa() != 1) goto err;
 	if (test_ecdsa_verify_infinity() != 1) goto err;
+	if (test_ecdsa_generic() != 1) goto err;
 
 	printf("%s all tests passed\n", __FILE__);
 	return 0;

tests/secp384r1_ecdsatest.c

@@ -0,0 +1,213 @@
+/*
+ *  Copyright 2014-2026 The GmSSL Project. All Rights Reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License); you may
+ *  not use this file except in compliance with the License.
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ */
+
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <gmssl/bn.h>
+#include <gmssl/hex.h>
+#include <gmssl/rand.h>
+#include <gmssl/error.h>
+#include <gmssl/ecdsa.h>
+#include <gmssl/secp384r1_ecdsa.h>
+
+static int test_secp384r1_ecdsa_do_sign(void)
+{
+	SECP384R1_KEY key;
+	SECP384R1_ECDSA_SIGNATURE sig;
+	uint8_t dgst[48];
+	secp384r1_t d;
+	secp384r1_t k;
+
+	// d = 5
+	bn_set_word(d, 5, 8);
+	secp384r1_key_set_private_key(&key, d);
+
+	secp384r1_private_key_print(stderr, 0, 0, "private_key", &key);
+
+	// k = 3
+	bn_set_word(k, 3, 8);
+
+	// e = 2
+	memset(dgst, 0, sizeof(dgst));
+	dgst[47] = 2;
+
+	if (secp384r1_ecdsa_do_sign_ex(&key, k, dgst, &sig) != 1) {
+		error_print();
+		return -1;
+	}
+
+	secp384r1_print(stderr, 0, 0, "r", sig.r);
+	secp384r1_print(stderr, 0, 0, "s", sig.s);
+
+
+	if (secp384r1_ecdsa_do_verify(&key, dgst, &sig) != 1) {
+		error_print();
+		return -1;
+	}
+
+	printf("%s() ok\n", __FUNCTION__);
+	return 1;
+}
+
+static int test_secp384r1_ecdsa_sign(void)
+{
+	SECP384R1_KEY key;
+	uint8_t dgst[48];
+	uint8_t sig[SECP384R1_ECDSA_SIGNATURE_MAX_SIZE];
+	size_t siglen;
+
+	if (secp384r1_key_generate(&key) != 1) {
+		error_print();
+		return -1;
+	}
+	memset(dgst, 0x5a, sizeof(dgst));
+
+	if (secp384r1_ecdsa_sign(&key, dgst, sig, &siglen) != 1
+		|| siglen > sizeof(sig)) {
+		error_print();
+		return -1;
+	}
+	if (secp384r1_ecdsa_verify(&key, dgst, sig, siglen) != 1) {
+		error_print();
+		return -1;
+	}
+	dgst[0] ^= 0x01;
+	if (secp384r1_ecdsa_verify(&key, dgst, sig, siglen) != 0) {
+		error_print();
+		return -1;
+	}
+
+	printf("%s() ok\n", __FUNCTION__);
+	return 1;
+}
+
+static int test_secp384r1_ecdsa_ctx(void)
+{
+	SECP384R1_KEY key;
+	SECP384R1_ECDSA_SIGN_CTX sign_ctx;
+	SECP384R1_ECDSA_SIGN_CTX verify_ctx;
+	uint8_t sig[SECP384R1_ECDSA_SIGNATURE_MAX_SIZE];
+	size_t siglen;
+	uint8_t msg[] = "message";
+
+	if (secp384r1_key_generate(&key) != 1) {
+		error_print();
+		return -1;
+	}
+	if (secp384r1_ecdsa_sign_init(&sign_ctx, &key, NULL) != 1
+		|| secp384r1_ecdsa_sign_update(&sign_ctx, msg, sizeof(msg) - 1) != 1
+		|| secp384r1_ecdsa_sign_finish(&sign_ctx, sig, &siglen) != 1
+		|| siglen > sizeof(sig)) {
+		error_print();
+		return -1;
+	}
+	if (secp384r1_ecdsa_verify_init(&verify_ctx, &key, NULL, sig, siglen) != 1
+		|| secp384r1_ecdsa_verify_update(&verify_ctx, msg, sizeof(msg) - 1) != 1
+		|| secp384r1_ecdsa_verify_finish(&verify_ctx) != 1) {
+		error_print();
+		return -1;
+	}
+
+	printf("%s() ok\n", __FUNCTION__);
+	return 1;
+}
+
+static int test_secp384r1_ecdsa_verify_infinity(void)
+{
+	SECP384R1_KEY key;
+	SECP384R1_ECDSA_SIGNATURE sig;
+	secp384r1_t d;
+	uint8_t dgst[48];
+	size_t dgstlen;
+
+	if (secp384r1_set_one(d) != 1
+		|| secp384r1_key_set_private_key(&key, d) != 1
+		|| secp384r1_set_one(sig.r) != 1
+		|| secp384r1_set_one(sig.s) != 1) {
+		error_print();
+		return -1;
+	}
+
+	// e = n - 1, so u1 * G + u2 * Q = (n - 1)G + G = O for Q = G
+	if (hex_to_bytes("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC7634D81F4372DDF581A0DB248B0A77AECEC196ACCC52972",
+			96, dgst, &dgstlen) != 1
+		|| dgstlen != sizeof(dgst)) {
+		error_print();
+		return -1;
+	}
+	if (secp384r1_ecdsa_do_verify(&key, dgst, &sig) != 0) {
+		error_print();
+		return -1;
+	}
+
+	printf("%s() ok\n", __FUNCTION__);
+	return 1;
+}
+
+static int test_secp384r1_ecdsa_generic(void)
+{
+	EC_KEY key;
+	uint8_t dgst32[32];
+	uint8_t dgst48[48];
+	uint8_t sig[SECP384R1_ECDSA_SIGNATURE_MAX_SIZE];
+	size_t siglen;
+
+	key.oid = OID_secp384r1;
+	if (secp384r1_key_generate(&key.u.secp384r1_key) != 1) {
+		error_print();
+		return -1;
+	}
+	memset(dgst32, 0x33, sizeof(dgst32));
+	memset(dgst48, 0x44, sizeof(dgst48));
+
+	if (ecdsa_sign(&key, dgst48, sizeof(dgst48), sig, &siglen) != 1
+		|| siglen > sizeof(sig)
+		|| ecdsa_verify(&key, dgst48, sizeof(dgst48), sig, siglen) != 1) {
+		error_print();
+		return -1;
+	}
+	dgst48[0] ^= 0x01;
+	if (ecdsa_verify(&key, dgst48, sizeof(dgst48), sig, siglen) != 0) {
+		error_print();
+		return -1;
+	}
+
+	if (ecdsa_sign(&key, dgst32, sizeof(dgst32), sig, &siglen) != 1
+		|| siglen > sizeof(sig)
+		|| ecdsa_verify(&key, dgst32, sizeof(dgst32), sig, siglen) != 1) {
+		error_print();
+		return -1;
+	}
+	if (ecdsa_sign_fixed_len(&key, dgst32, sizeof(dgst32), siglen, sig) != 1
+		|| ecdsa_verify(&key, dgst32, sizeof(dgst32), sig, siglen) != 1) {
+		error_print();
+		return -1;
+	}
+
+	printf("%s() ok\n", __FUNCTION__);
+	return 1;
+}
+
+int main(void)
+{
+	if (test_secp384r1_ecdsa_do_sign() != 1) goto err;
+	if (test_secp384r1_ecdsa_sign() != 1) goto err;
+	if (test_secp384r1_ecdsa_ctx() != 1) goto err;
+	if (test_secp384r1_ecdsa_verify_infinity() != 1) goto err;
+	if (test_secp384r1_ecdsa_generic() != 1) goto err;
+
+	printf("%s all tests passed\n", __FILE__);
+	return 0;
+err:
+	error_print();
+	return 1;
+}

tests/secp384r1_keytest.c

@@ -0,0 +1,329 @@
+/*
+ *  Copyright 2014-2026 The GmSSL Project. All Rights Reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the License); you may
+ *  not use this file except in compliance with the License.
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ */
+
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <gmssl/hex.h>
+#include <gmssl/rand.h>
+#include <gmssl/mem.h>
+#include <gmssl/error.h>
+#include <gmssl/secp384r1_key.h>
+
+
+static int test_secp384r1_key_generate(void)
+{
+	SECP384R1_KEY key;
+
+	if (secp384r1_key_generate(&key) != 1) {
+		error_print();
+		return -1;
+	}
+	secp384r1_public_key_print(stderr, 0, 4, "public_key", &key);
+	secp384r1_private_key_print(stderr, 0, 4, "private_key", &key);
+	gmssl_secure_clear(&key, sizeof(key));
+	secp384r1_private_key_print(stderr, 0, 4, "private_key", &key);
+
+	printf("%s() ok\n", __FUNCTION__);
+	return 1;
+}
+
+static int test_secp384r1_key_set_private_key(void)
+{
+	SECP384R1_KEY key;
+	secp384r1_t private_key;
+	uint8_t bytes[48];
+	size_t len;
+
+	// key = 1
+	memset(bytes, 0, sizeof(bytes));
+	bytes[47] = 1;
+	secp384r1_from_48bytes(private_key, bytes);
+	if (secp384r1_key_set_private_key(&key, private_key) != 1) {
+		error_print();
+		return -1;
+	}
+	secp384r1_private_key_print(stderr, 0, 4, "private_key = 1", &key);
+
+
+	// key = n-1
+	hex_to_bytes("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC7634D81F4372DDF581A0DB248B0A77AECEC196ACCC52972", 96, bytes, &len);
+	secp384r1_from_48bytes(private_key, bytes);
+	if (secp384r1_key_set_private_key(&key, private_key) != 1) {
+		error_print();
+		return -1;
+	}
+
+
+	// key = 0, should fail
+	memset(bytes, 0, sizeof(bytes));
+	secp384r1_from_48bytes(private_key, bytes);
+	if (secp384r1_key_set_private_key(&key, private_key) >= 0) {
+		error_print();
+		return -1;
+	}
+
+	// key = n, should fail
+	hex_to_bytes("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC7634D81F4372DDF581A0DB248B0A77AECEC196ACCC52973", 96, bytes, &len);
+	secp384r1_from_48bytes(private_key, bytes);
+	if (secp384r1_key_set_private_key(&key, private_key) >= 0) {
+		error_print();
+		return -1;
+	}
+
+	// key = 0xff..f, should fail
+	memset(bytes, 0xff, sizeof(bytes));
+	secp384r1_from_48bytes(private_key, bytes);
+	if (secp384r1_key_set_private_key(&key, private_key) >= 0) {
+		error_print();
+		return -1;
+	}
+
+	printf("%s() ok\n", __FUNCTION__);
+	return 1;
+}
+
+static int test_secp384r1_public_key_to_bytes(void)
+{
+	SECP384R1_KEY key;
+	SECP384R1_KEY key1;
+	uint8_t bytes[512];
+	uint8_t *p = bytes;
+	const uint8_t *cp = bytes;
+	size_t len = 0;
+
+	if (secp384r1_key_generate(&key) != 1) {
+		error_print();
+		return -1;
+	}
+	if (secp384r1_public_key_to_bytes(&key, &p, &len) != 1) {
+		error_print();
+		return -1;
+	}
+	if (secp384r1_public_key_from_bytes(&key1, &cp, &len) != 1) {
+		error_print();
+		return -1;
+	}
+	if (len) {
+		error_print();
+		return -1;
+	}
+	if (secp384r1_public_key_equ(&key, &key1) != 1) {
+		error_print();
+		return -1;
+	}
+
+	printf("%s() ok\n", __FUNCTION__);
+	return 1;
+}
+
+static int test_secp384r1_public_key_to_der(void)
+{
+	SECP384R1_KEY key;
+	SECP384R1_KEY key1;
+	uint8_t bytes[512];
+	uint8_t *p = bytes;
+	const uint8_t *cp = bytes;
+	size_t len = 0;
+
+	if (secp384r1_key_generate(&key) != 1) {
+		error_print();
+		return -1;
+	}
+	if (secp384r1_public_key_to_der(&key, &p, &len) != 1) {
+		error_print();
+		return -1;
+	}
+	if (secp384r1_public_key_from_der(&key1, &cp, &len) != 1) {
+		error_print();
+		return -1;
+	}
+	if (len) {
+		error_print();
+		return -1;
+	}
+	if (secp384r1_public_key_equ(&key, &key1) != 1) {
+		error_print();
+		return -1;
+	}
+
+	printf("%s() ok\n", __FUNCTION__);
+	return 1;
+}
+
+static int test_secp384r1_private_key_to_der(void)
+{
+	SECP384R1_KEY key;
+	SECP384R1_KEY key1;
+	uint8_t bytes[512];
+	uint8_t *p = bytes;
+	const uint8_t *cp = bytes;
+	size_t len = 0;
+
+	if (secp384r1_key_generate(&key) != 1) {
+		error_print();
+		return -1;
+	}
+	if (secp384r1_private_key_to_der(&key, &p, &len) != 1) {
+		error_print();
+		return -1;
+	}
+	if (secp384r1_private_key_from_der(&key1, &cp, &len) != 1) {
+		error_print();
+		return -1;
+	}
+	if (len) {
+		error_print();
+		return -1;
+	}
+	if (secp384r1_public_key_equ(&key, &key1) != 1) {
+		error_print();
+		return -1;
+	}
+
+	printf("%s() ok\n", __FUNCTION__);
+	return 1;
+}
+
+static int test_secp384r1_private_key_info_to_der(void)
+{
+	SECP384R1_KEY key;
+	SECP384R1_KEY key1;
+	uint8_t bytes[512];
+	uint8_t *p = bytes;
+	const uint8_t *cp = bytes;
+	size_t len = 0;
+	const uint8_t *attrs;
+	size_t attrslen;
+
+	if (secp384r1_key_generate(&key) != 1) {
+		error_print();
+		return -1;
+	}
+	if (secp384r1_private_key_info_to_der(&key, &p, &len) != 1) {
+		error_print();
+		return -1;
+	}
+	if (secp384r1_private_key_info_from_der(&key1, &attrs, &attrslen, &cp, &len) != 1) {
+		error_print();
+		return -1;
+	}
+	if (len) {
+		error_print();
+		return -1;
+	}
+	if (secp384r1_public_key_equ(&key, &key1) != 1) {
+		error_print();
+		return -1;
+	}
+
+	printf("%s() ok\n", __FUNCTION__);
+	return 1;
+}
+
+static int test_secp384r1_private_key_info_encrypt_to_der(void)
+{
+	SECP384R1_KEY key;
+	SECP384R1_KEY key1;
+	uint8_t bytes[512];
+	uint8_t *p = bytes;
+	const uint8_t *cp = bytes;
+	size_t len = 0;
+	char *pass = "password";
+	const uint8_t *attrs;
+	size_t attrslen;
+
+	if (secp384r1_key_generate(&key) != 1) {
+		error_print();
+		return -1;
+	}
+	if (secp384r1_private_key_info_encrypt_to_der(&key, pass, &p, &len) != 1) {
+		error_print();
+		return -1;
+	}
+	if (secp384r1_private_key_info_decrypt_from_der(&key1, &attrs, &attrslen, pass, &cp, &len) != 1) {
+		error_print();
+		return -1;
+	}
+	if (len) {
+		error_print();
+		return -1;
+	}
+	if (secp384r1_public_key_equ(&key, &key1) != 1) {
+		error_print();
+		return -1;
+	}
+
+	printf("%s() ok\n", __FUNCTION__);
+	return 1;
+}
+
+static int test_secp384r1_ecdh(void)
+{
+	SECP384R1_KEY key;
+	SECP384R1_KEY peer_key;
+	uint8_t peer_public_key[97];
+	uint8_t shared_key[48];
+	uint8_t peer_shared_key[48];
+	uint8_t *p = peer_public_key;
+	size_t len = 0;
+
+	if (secp384r1_key_generate(&key) != 1
+		|| secp384r1_key_generate(&peer_key) != 1
+		|| secp384r1_do_ecdh(&key, &peer_key, shared_key) != 1
+		|| secp384r1_do_ecdh(&peer_key, &key, peer_shared_key) != 1) {
+		error_print();
+		return -1;
+	}
+	if (memcmp(shared_key, peer_shared_key, sizeof(shared_key)) != 0) {
+		error_print();
+		return -1;
+	}
+	if (secp384r1_public_key_to_bytes(&peer_key, &p, &len) != 1
+		|| len != sizeof(peer_public_key)
+		|| secp384r1_ecdh(&key, peer_public_key, peer_shared_key) != 1) {
+		error_print();
+		return -1;
+	}
+	if (memcmp(shared_key, peer_shared_key, sizeof(shared_key)) != 0) {
+		error_print();
+		return -1;
+	}
+
+	printf("%s() ok\n", __FUNCTION__);
+	return 1;
+}
+
+
+
+
+
+
+
+
+
+int main(void)
+{
+	if (test_secp384r1_key_generate() != 1) goto err;
+	if (test_secp384r1_key_set_private_key() != 1) goto err;
+	if (test_secp384r1_public_key_to_bytes() != 1) goto err;
+	if (test_secp384r1_public_key_to_der() != 1) goto err;
+	if (test_secp384r1_private_key_to_der() != 1) goto err;
+	if (test_secp384r1_private_key_info_to_der() != 1) goto err;
+	if (test_secp384r1_private_key_info_encrypt_to_der() != 1) goto err;
+	if (test_secp384r1_ecdh() != 1) goto err;
+
+	printf("%s all tests passed\n", __FILE__);
+	return 0;
+err:
+	error_print();
+	return 1;
+}