summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2024-11-14 10:20:17 +0000
committertb <>2024-11-14 10:20:17 +0000
commit9b33962fef8e82c51592ac8863409f5c3bbfc418 (patch)
treef8ea1be1d13315074bd3fe6ebbbe7aaecca86903
parent34feb8ce45dfd14d621768a6831a51fe5748a704 (diff)
downloadopenbsd-9b33962fef8e82c51592ac8863409f5c3bbfc418.tar.gz
openbsd-9b33962fef8e82c51592ac8863409f5c3bbfc418.tar.bz2
openbsd-9b33962fef8e82c51592ac8863409f5c3bbfc418.zip
eck_prn: use ec_key rather than x for an EC_KEY
-rw-r--r--src/lib/libcrypto/ec/eck_prn.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libcrypto/ec/eck_prn.c b/src/lib/libcrypto/ec/eck_prn.c
index 2ae917dbbc..5fbe21e083 100644
--- a/src/lib/libcrypto/ec/eck_prn.c
+++ b/src/lib/libcrypto/ec/eck_prn.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: eck_prn.c,v 1.34 2024/11/14 10:18:00 tb Exp $ */ 1/* $OpenBSD: eck_prn.c,v 1.35 2024/11/14 10:20:17 tb Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -72,7 +72,7 @@
72#include "ec_local.h" 72#include "ec_local.h"
73 73
74int 74int
75EC_KEY_print(BIO *bio, const EC_KEY *x, int off) 75EC_KEY_print(BIO *bio, const EC_KEY *ec_key, int off)
76{ 76{
77 EVP_PKEY *pk; 77 EVP_PKEY *pk;
78 int ret = 0; 78 int ret = 0;
@@ -80,7 +80,7 @@ EC_KEY_print(BIO *bio, const EC_KEY *x, int off)
80 if ((pk = EVP_PKEY_new()) == NULL) 80 if ((pk = EVP_PKEY_new()) == NULL)
81 goto err; 81 goto err;
82 82
83 if (!EVP_PKEY_set1_EC_KEY(pk, (EC_KEY *) x)) 83 if (!EVP_PKEY_set1_EC_KEY(pk, (EC_KEY *)ec_key))
84 goto err; 84 goto err;
85 85
86 ret = EVP_PKEY_print_private(bio, pk, off, NULL); 86 ret = EVP_PKEY_print_private(bio, pk, off, NULL);
@@ -93,7 +93,7 @@ EC_KEY_print(BIO *bio, const EC_KEY *x, int off)
93LCRYPTO_ALIAS(EC_KEY_print); 93LCRYPTO_ALIAS(EC_KEY_print);
94 94
95int 95int
96EC_KEY_print_fp(FILE *fp, const EC_KEY *x, int off) 96EC_KEY_print_fp(FILE *fp, const EC_KEY *ec_key, int off)
97{ 97{
98 BIO *bio; 98 BIO *bio;
99 int ret; 99 int ret;
@@ -105,7 +105,7 @@ EC_KEY_print_fp(FILE *fp, const EC_KEY *x, int off)
105 105
106 BIO_set_fp(bio, fp, BIO_NOCLOSE); 106 BIO_set_fp(bio, fp, BIO_NOCLOSE);
107 107
108 ret = EC_KEY_print(bio, x, off); 108 ret = EC_KEY_print(bio, ec_key, off);
109 109
110 BIO_free(bio); 110 BIO_free(bio);
111 111
@@ -114,7 +114,7 @@ EC_KEY_print_fp(FILE *fp, const EC_KEY *x, int off)
114LCRYPTO_ALIAS(EC_KEY_print_fp); 114LCRYPTO_ALIAS(EC_KEY_print_fp);
115 115
116int 116int
117ECParameters_print(BIO *bio, const EC_KEY *x) 117ECParameters_print(BIO *bio, const EC_KEY *ec_key)
118{ 118{
119 EVP_PKEY *pk; 119 EVP_PKEY *pk;
120 int ret = 0; 120 int ret = 0;
@@ -122,7 +122,7 @@ ECParameters_print(BIO *bio, const EC_KEY *x)
122 if ((pk = EVP_PKEY_new()) == NULL) 122 if ((pk = EVP_PKEY_new()) == NULL)
123 goto err; 123 goto err;
124 124
125 if (!EVP_PKEY_set1_EC_KEY(pk, (EC_KEY *) x)) 125 if (!EVP_PKEY_set1_EC_KEY(pk, (EC_KEY *)ec_key))
126 goto err; 126 goto err;
127 127
128 ret = EVP_PKEY_print_params(bio, pk, 4, NULL); 128 ret = EVP_PKEY_print_params(bio, pk, 4, NULL);
@@ -135,7 +135,7 @@ ECParameters_print(BIO *bio, const EC_KEY *x)
135LCRYPTO_ALIAS(ECParameters_print); 135LCRYPTO_ALIAS(ECParameters_print);
136 136
137int 137int
138ECParameters_print_fp(FILE *fp, const EC_KEY *x) 138ECParameters_print_fp(FILE *fp, const EC_KEY *ec_key)
139{ 139{
140 BIO *bio; 140 BIO *bio;
141 int ret; 141 int ret;
@@ -147,7 +147,7 @@ ECParameters_print_fp(FILE *fp, const EC_KEY *x)
147 147
148 BIO_set_fp(bio, fp, BIO_NOCLOSE); 148 BIO_set_fp(bio, fp, BIO_NOCLOSE);
149 149
150 ret = ECParameters_print(bio, x); 150 ret = ECParameters_print(bio, ec_key);
151 151
152 BIO_free(bio); 152 BIO_free(bio);
153 153