From e2b8fb178a65a0dcfa097c0256646345e6d229a2 Mon Sep 17 00:00:00 2001 From: tb <> Date: Wed, 5 Jul 2023 08:39:40 +0000 Subject: Drop useless ossl_ prefixes discussed with jsing --- src/lib/libcrypto/ecdsa/ecs_lib.c | 8 ++++---- src/lib/libcrypto/ecdsa/ecs_local.h | 8 ++++---- src/lib/libcrypto/ecdsa/ecs_ossl.c | 13 ++++++------- 3 files changed, 14 insertions(+), 15 deletions(-) (limited to 'src/lib/libcrypto/ecdsa') diff --git a/src/lib/libcrypto/ecdsa/ecs_lib.c b/src/lib/libcrypto/ecdsa/ecs_lib.c index 743d517165..69aa1b732b 100644 --- a/src/lib/libcrypto/ecdsa/ecs_lib.c +++ b/src/lib/libcrypto/ecdsa/ecs_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecs_lib.c,v 1.22 2023/06/25 19:33:39 tb Exp $ */ +/* $OpenBSD: ecs_lib.c,v 1.23 2023/07/05 08:39:40 tb Exp $ */ /* ==================================================================== * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved. * @@ -70,9 +70,9 @@ static const ECDSA_METHOD *default_ECDSA_method = NULL; static const ECDSA_METHOD openssl_ecdsa_meth = { .name = "OpenSSL ECDSA method", - .ecdsa_do_sign = ossl_ecdsa_sign_sig, - .ecdsa_sign_setup = ossl_ecdsa_sign_setup, - .ecdsa_do_verify = ossl_ecdsa_verify_sig, + .ecdsa_do_sign = ecdsa_sign_sig, + .ecdsa_sign_setup = ecdsa_sign_setup, + .ecdsa_do_verify = ecdsa_verify_sig, }; const ECDSA_METHOD * diff --git a/src/lib/libcrypto/ecdsa/ecs_local.h b/src/lib/libcrypto/ecdsa/ecs_local.h index 20ad0c246e..4f1140483f 100644 --- a/src/lib/libcrypto/ecdsa/ecs_local.h +++ b/src/lib/libcrypto/ecdsa/ecs_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ecs_local.h,v 1.3 2023/06/25 18:45:56 tb Exp $ */ +/* $OpenBSD: ecs_local.h,v 1.4 2023/07/05 08:39:40 tb Exp $ */ /* * Written by Nils Larsch for the OpenSSL project */ @@ -68,12 +68,12 @@ struct ECDSA_SIG_st { BIGNUM *s; }; -int ossl_ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp, +int ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp); -int ossl_ecdsa_sign(int type, const unsigned char *dgst, int dlen, +int ecdsa_sign(int type, const unsigned char *dgst, int dlen, unsigned char *sig, unsigned int *siglen, const BIGNUM *kinv, const BIGNUM *r, EC_KEY *eckey); -ECDSA_SIG *ossl_ecdsa_sign_sig(const unsigned char *dgst, int dgst_len, +ECDSA_SIG *ecdsa_sign_sig(const unsigned char *dgst, int dgst_len, const BIGNUM *in_kinv, const BIGNUM *in_r, EC_KEY *eckey); __END_HIDDEN_DECLS diff --git a/src/lib/libcrypto/ecdsa/ecs_ossl.c b/src/lib/libcrypto/ecdsa/ecs_ossl.c index 0ca2651f25..223cc655da 100644 --- a/src/lib/libcrypto/ecdsa/ecs_ossl.c +++ b/src/lib/libcrypto/ecdsa/ecs_ossl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecs_ossl.c,v 1.71 2023/07/04 15:09:31 tb Exp $ */ +/* $OpenBSD: ecs_ossl.c,v 1.72 2023/07/05 08:39:40 tb Exp $ */ /* * Written by Nils Larsch for the OpenSSL project */ @@ -97,7 +97,7 @@ ecdsa_prepare_digest(const unsigned char *digest, int digest_len, } int -ossl_ecdsa_sign(int type, const unsigned char *digest, int digest_len, +ecdsa_sign(int type, const unsigned char *digest, int digest_len, unsigned char *signature, unsigned int *signature_len, const BIGNUM *kinv, const BIGNUM *r, EC_KEY *key) { @@ -128,8 +128,7 @@ ossl_ecdsa_sign(int type, const unsigned char *digest, int digest_len, */ int -ossl_ecdsa_sign_setup(EC_KEY *key, BN_CTX *in_ctx, BIGNUM **out_kinv, - BIGNUM **out_r) +ecdsa_sign_setup(EC_KEY *key, BN_CTX *in_ctx, BIGNUM **out_kinv, BIGNUM **out_r) { const EC_GROUP *group; EC_POINT *point = NULL; @@ -392,7 +391,7 @@ ecdsa_compute_s(BIGNUM **out_s, const BIGNUM *e, const BIGNUM *kinv, */ ECDSA_SIG * -ossl_ecdsa_sign_sig(const unsigned char *digest, int digest_len, +ecdsa_sign_sig(const unsigned char *digest, int digest_len, const BIGNUM *in_kinv, const BIGNUM *in_r, EC_KEY *key) { BN_CTX *ctx = NULL; @@ -485,7 +484,7 @@ ossl_ecdsa_sign_sig(const unsigned char *digest, int digest_len, } int -ossl_ecdsa_verify(int type, const unsigned char *digest, int digest_len, +ecdsa_verify(int type, const unsigned char *digest, int digest_len, const unsigned char *sigbuf, int sig_len, EC_KEY *key) { ECDSA_SIG *s; @@ -522,7 +521,7 @@ ossl_ecdsa_verify(int type, const unsigned char *digest, int digest_len, */ int -ossl_ecdsa_verify_sig(const unsigned char *digest, int digest_len, +ecdsa_verify_sig(const unsigned char *digest, int digest_len, const ECDSA_SIG *sig, EC_KEY *key) { const EC_GROUP *group; -- cgit v1.2.3-55-g6feb