summaryrefslogtreecommitdiff
path: root/lib/libcrypto
diff options
context:
space:
mode:
authorTheo Buehler <tb@cvs.openbsd.org>2021-08-31 20:14:41 +0000
committerTheo Buehler <tb@cvs.openbsd.org>2021-08-31 20:14:41 +0000
commitb4baf54e3243389c4764ea47d453d92efcaba394 (patch)
tree7e0430fb186dd734fd5aabb82821397fbe1327a5 /lib/libcrypto
parent433d1fae90784c26748f0dfe3fc8aa48cc25fa7a (diff)
Remove some dead code that was missed in an earlier cleanup and
fix a stale comment. Found by mortimer with clang 13's -Wunused-but-set-variable. ok beck
Diffstat (limited to 'lib/libcrypto')
-rw-r--r--lib/libcrypto/ec/ec_asn1.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/libcrypto/ec/ec_asn1.c b/lib/libcrypto/ec/ec_asn1.c
index 06320b65886..befeee99afb 100644
--- a/lib/libcrypto/ec/ec_asn1.c
+++ b/lib/libcrypto/ec/ec_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_asn1.c,v 1.33 2021/04/20 17:12:43 tb Exp $ */
+/* $OpenBSD: ec_asn1.c,v 1.34 2021/08/31 20:14:40 tb Exp $ */
/*
* Written by Nils Larsch for the OpenSSL project.
*/
@@ -801,12 +801,12 @@ ec_asn1_group2fieldid(const EC_GROUP * group, X9_62_FIELDID * field)
static int
ec_asn1_group2curve(const EC_GROUP * group, X9_62_CURVE * curve)
{
- int ok = 0, nid;
BIGNUM *tmp_1 = NULL, *tmp_2 = NULL;
unsigned char *buffer_1 = NULL, *buffer_2 = NULL, *a_buf = NULL,
*b_buf = NULL;
size_t len_1, len_2;
unsigned char char_zero = 0;
+ int ok = 0;
if (!group || !curve || !curve->a || !curve->b)
return 0;
@@ -815,7 +815,6 @@ ec_asn1_group2curve(const EC_GROUP * group, X9_62_CURVE * curve)
ECerror(ERR_R_MALLOC_FAILURE);
goto err;
}
- nid = EC_METHOD_get_field_type(EC_GROUP_method_of(group));
/* get a and b */
if (!EC_GROUP_get_curve(group, NULL, tmp_1, tmp_2, NULL)) {
@@ -1018,7 +1017,7 @@ ec_asn1_group2pkparameters(const EC_GROUP * group, ECPKPARAMETERS * params)
if ((ret->value.named_curve = OBJ_nid2obj(tmp)) == NULL)
ok = 0;
} else
- /* we don't kmow the nid => ERROR */
+ /* we don't know the group => ERROR */
ok = 0;
} else {
/* use the ECPARAMETERS structure */