Skip to content

Commit 309aebf

Browse files
authored
crypto.ecdsa: clean out old deprecated keypair opaque from the module, make -cstrict pass for all the tests, and with both gcc and clang (#23887)
1 parent 03d033f commit 309aebf

File tree

4 files changed

+118
-416
lines changed

4 files changed

+118
-416
lines changed

vlib/crypto/ecdsa/ecdsa.c.v

+3-31
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,14 @@ struct C.EVP_PKEY {}
3838

3939
fn C.EVP_PKEY_new() &C.EVP_PKEY
4040
fn C.EVP_PKEY_free(key &C.EVP_PKEY)
41-
fn C.EVP_PKEY_get1_EC_KEY(pkey &C.EVP_PKEY) &C.EC_KEY
4241
fn C.EVP_PKEY_base_id(key &C.EVP_PKEY) int
4342
fn C.EVP_PKEY_bits(pkey &C.EVP_PKEY) int
4443
fn C.EVP_PKEY_size(key &C.EVP_PKEY) int
4544
fn C.EVP_PKEY_eq(a &C.EVP_PKEY, b &C.EVP_PKEY) int
45+
fn C.EVP_PKEY_check(ctx &C.EVP_PKEY_CTX) int
46+
fn C.EVP_PKEY_public_check(ctx &C.EVP_PKEY_CTX) int
4647

48+
fn C.EVP_PKEY_get_group_name(pkey &C.EVP_PKEY, gname &u8, gname_sz u32, gname_len &usize) int
4749
fn C.EVP_PKEY_get1_encoded_public_key(pkey &C.EVP_PKEY, ppub &&u8) int
4850
fn C.EVP_PKEY_get_bn_param(pkey &C.EVP_PKEY, key_name &u8, bn &&C.BIGNUM) int
4951
fn C.EVP_PKEY_fromdata_init(ctx &C.EVP_PKEY_CTX) int
@@ -86,23 +88,6 @@ fn C.EVP_PKEY_CTX_free(ctx &C.EVP_PKEY_CTX)
8688

8789
fn C.EVP_PKEY_get_bits(pkey &C.EVP_PKEY) int
8890

89-
// Elliptic curve keypair declarations
90-
@[typedef]
91-
struct C.EC_KEY {}
92-
93-
fn C.EC_KEY_new_by_curve_name(nid int) &C.EC_KEY
94-
fn C.EC_KEY_generate_key(key &C.EC_KEY) int
95-
fn C.EC_KEY_dup(src &C.EC_KEY) &C.EC_KEY
96-
fn C.EC_KEY_free(key &C.EC_KEY)
97-
fn C.EC_KEY_set_public_key(key &C.EC_KEY, &C.EC_POINT) int
98-
fn C.EC_KEY_set_private_key(key &C.EC_KEY, prv &C.BIGNUM) int
99-
fn C.EC_KEY_get0_group(key &C.EC_KEY) &C.EC_GROUP
100-
fn C.EC_KEY_get0_private_key(key &C.EC_KEY) &C.BIGNUM
101-
fn C.EC_KEY_get0_public_key(key &C.EC_KEY) &C.EC_POINT
102-
fn C.EC_KEY_get_conv_form(k &C.EC_KEY) int
103-
fn C.EC_KEY_check_key(key &C.EC_KEY) int
104-
fn C.EC_KEY_up_ref(key &C.EC_KEY) int
105-
10691
// BIO input output declarations.
10792
@[typedef]
10893
struct C.BIO_METHOD {}
@@ -126,19 +111,14 @@ struct C.EC_POINT {}
126111

127112
fn C.EC_POINT_new(group &C.EC_GROUP) &C.EC_POINT
128113
fn C.EC_POINT_mul(group &C.EC_GROUP, r &C.EC_POINT, n &C.BIGNUM, q &C.EC_POINT, m &C.BIGNUM, ctx &C.BN_CTX) int
129-
fn C.EC_POINT_point2oct(g &C.EC_GROUP, p &C.EC_POINT, form int, buf &u8, max_out int, ctx &C.BN_CTX) int
130114
fn C.EC_POINT_point2buf(group &C.EC_GROUP, point &C.EC_POINT, form int, pbuf &&u8, ctx &C.BN_CTX) int
131-
fn C.EC_POINT_cmp(group &C.EC_GROUP, a &C.EC_POINT, b &C.EC_POINT, ctx &C.BN_CTX) int
132115
fn C.EC_POINT_free(point &C.EC_POINT)
133116

134117
// Elliptic group (curve) related declarations.
135118
@[typedef]
136119
struct C.EC_GROUP {}
137120

138121
fn C.EC_GROUP_free(group &C.EC_GROUP)
139-
fn C.EC_GROUP_get_degree(g &C.EC_GROUP) int
140-
fn C.EC_GROUP_get_curve_name(g &C.EC_GROUP) int
141-
fn C.EC_GROUP_cmp(a &C.EC_GROUP, b &C.EC_GROUP, ctx &C.BN_CTX) int
142122
fn C.EC_GROUP_new_by_curve_name(nid int) &C.EC_GROUP
143123

144124
// Elliptic BIGNUM related declarations.
@@ -160,14 +140,6 @@ struct C.BN_CTX {}
160140
fn C.BN_CTX_new() &C.BN_CTX
161141
fn C.BN_CTX_free(ctx &C.BN_CTX)
162142

163-
// ELliptic ECDSA signing and verifying related declarations.
164-
@[typedef]
165-
struct C.ECDSA_SIG {}
166-
167-
fn C.ECDSA_size(key &C.EC_KEY) u32
168-
fn C.ECDSA_sign(type_ int, dgst &u8, dgstlen int, sig &u8, siglen &u32, eckey &C.EC_KEY) int
169-
fn C.ECDSA_verify(type_ int, dgst &u8, dgstlen int, sig &u8, siglen int, eckey &C.EC_KEY) int
170-
171143
@[typedef]
172144
struct C.EVP_MD_CTX {}
173145

0 commit comments

Comments
 (0)