diff options
Diffstat (limited to 'lib/libcrypto/ec')
-rw-r--r-- | lib/libcrypto/ec/ec_key.c | 4 | ||||
-rw-r--r-- | lib/libcrypto/ec/ec_kmeth.c | 16 | ||||
-rw-r--r-- | lib/libcrypto/ec/ec_local.h | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/lib/libcrypto/ec/ec_key.c b/lib/libcrypto/ec/ec_key.c index 1006d2d89da..a15d06b0197 100644 --- a/lib/libcrypto/ec/ec_key.c +++ b/lib/libcrypto/ec/ec_key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_key.c,v 1.34 2023/07/03 09:35:26 tb Exp $ */ +/* $OpenBSD: ec_key.c,v 1.35 2023/07/05 08:39:40 tb Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -241,7 +241,7 @@ EC_KEY_generate_key(EC_KEY *eckey) } int -ossl_ec_key_gen(EC_KEY *eckey) +ec_key_gen(EC_KEY *eckey) { BIGNUM *priv_key = NULL; EC_POINT *pub_key = NULL; diff --git a/lib/libcrypto/ec/ec_kmeth.c b/lib/libcrypto/ec/ec_kmeth.c index 4e296cfa688..65bf1f99c26 100644 --- a/lib/libcrypto/ec/ec_kmeth.c +++ b/lib/libcrypto/ec/ec_kmeth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_kmeth.c,v 1.8 2023/06/25 18:52:27 tb Exp $ */ +/* $OpenBSD: ec_kmeth.c,v 1.9 2023/07/05 08:39:40 tb Exp $ */ /* * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. @@ -74,15 +74,15 @@ static const EC_KEY_METHOD openssl_ec_key_method = { .set_private = NULL, .set_public = NULL, - .keygen = ossl_ec_key_gen, - .compute_key = ossl_ecdh_compute_key, + .keygen = ec_key_gen, + .compute_key = ecdh_compute_key, - .sign = ossl_ecdsa_sign, - .sign_setup = ossl_ecdsa_sign_setup, - .sign_sig = ossl_ecdsa_sign_sig, + .sign = ecdsa_sign, + .sign_setup = ecdsa_sign_setup, + .sign_sig = ecdsa_sign_sig, - .verify = ossl_ecdsa_verify, - .verify_sig = ossl_ecdsa_verify_sig, + .verify = ecdsa_verify, + .verify_sig = ecdsa_verify_sig, }; const EC_KEY_METHOD *default_ec_key_meth = &openssl_ec_key_method; diff --git a/lib/libcrypto/ec/ec_local.h b/lib/libcrypto/ec/ec_local.h index 0d219e8e214..7a1f90886d1 100644 --- a/lib/libcrypto/ec/ec_local.h +++ b/lib/libcrypto/ec/ec_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_local.h,v 1.23 2023/07/03 07:26:40 tb Exp $ */ +/* $OpenBSD: ec_local.h,v 1.24 2023/07/05 08:39:40 tb Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -341,12 +341,12 @@ struct ec_key_method_st { #define EC_KEY_METHOD_DYNAMIC 1 -int ossl_ec_key_gen(EC_KEY *eckey); -int ossl_ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh, +int ec_key_gen(EC_KEY *eckey); +int ecdh_compute_key(void *out, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh, void *(*KDF) (const void *in, size_t inlen, void *out, size_t *outlen)); -int ossl_ecdsa_verify(int type, const unsigned char *dgst, int dgst_len, +int ecdsa_verify(int type, const unsigned char *dgst, int dgst_len, const unsigned char *sigbuf, int sig_len, EC_KEY *eckey); -int ossl_ecdsa_verify_sig(const unsigned char *dgst, int dgst_len, +int ecdsa_verify_sig(const unsigned char *dgst, int dgst_len, const ECDSA_SIG *sig, EC_KEY *eckey); /* |