From e50518a9a1aa677e1d49d4309c8e4d4d9be0454e Mon Sep 17 00:00:00 2001 From: tb <> Date: Fri, 29 Dec 2023 18:49:06 +0000 Subject: eckey: adjust some variable names and unwrap function definitions ok jsing --- src/lib/libcrypto/ec/ec_ameth.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'src/lib') diff --git a/src/lib/libcrypto/ec/ec_ameth.c b/src/lib/libcrypto/ec/ec_ameth.c index 660e5bffd1..c22f38b345 100644 --- a/src/lib/libcrypto/ec/ec_ameth.c +++ b/src/lib/libcrypto/ec/ec_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_ameth.c,v 1.49 2023/12/29 18:48:25 tb Exp $ */ +/* $OpenBSD: ec_ameth.c,v 1.50 2023/12/29 18:49:06 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -571,29 +571,26 @@ eckey_param_decode(EVP_PKEY *pkey, const unsigned char **param, int param_len) } static int -eckey_param_encode(const EVP_PKEY *pkey, unsigned char **pder) +eckey_param_encode(const EVP_PKEY *pkey, unsigned char **param) { - return i2d_ECParameters(pkey->pkey.ec, pder); + return i2d_ECParameters(pkey->pkey.ec, param); } static int -eckey_param_print(BIO *bp, const EVP_PKEY *pkey, int indent, - ASN1_PCTX *ctx) +eckey_param_print(BIO *bp, const EVP_PKEY *pkey, int indent, ASN1_PCTX *ctx) { return do_EC_KEY_print(bp, pkey->pkey.ec, indent, 0); } static int -eckey_pub_print(BIO *bp, const EVP_PKEY *pkey, int indent, - ASN1_PCTX *ctx) +eckey_pub_print(BIO *bp, const EVP_PKEY *pkey, int indent, ASN1_PCTX *ctx) { return do_EC_KEY_print(bp, pkey->pkey.ec, indent, 1); } static int -eckey_priv_print(BIO *bp, const EVP_PKEY *pkey, int indent, - ASN1_PCTX *ctx) +eckey_priv_print(BIO *bp, const EVP_PKEY *pkey, int indent, ASN1_PCTX *ctx) { return do_EC_KEY_print(bp, pkey->pkey.ec, indent, 2); } @@ -619,9 +616,9 @@ old_ec_priv_decode(EVP_PKEY *pkey, const unsigned char **priv, int priv_len) } static int -old_ec_priv_encode(const EVP_PKEY *pkey, unsigned char **pder) +old_ec_priv_encode(const EVP_PKEY *pkey, unsigned char **priv) { - return i2d_ECPrivateKey(pkey->pkey.ec, pder); + return i2d_ECPrivateKey(pkey->pkey.ec, priv); } static int -- cgit v1.2.3-55-g6feb