From: tb <tb@openbsd.org>
Date: Mon, 1 May 2023 07:54:08 +0000 (+0000)
Subject: Clean up handling of nist_curves[]
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=034a9b39558580d5444d4361e2d3d960ad08d3b7;p=openbsd

Clean up handling of nist_curves[]

There's no point in introducing a typedef only for two sizeof() calls.
We might as well use an anonymous struct for this list. Make it const
while there, drop some braces and compare strcmp() return value to 0.

ok jsing
---

diff --git a/lib/libcrypto/ec/ec_curve.c b/lib/libcrypto/ec/ec_curve.c
index 898e2334292..56959941f8a 100644
--- a/lib/libcrypto/ec/ec_curve.c
+++ b/lib/libcrypto/ec/ec_curve.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_curve.c,v 1.27 2023/04/25 19:53:30 tb Exp $ */
+/* $OpenBSD: ec_curve.c,v 1.28 2023/05/01 07:54:08 tb Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -2021,16 +2021,10 @@ EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems)
 	return curve_list_length;
 }
 
-/*
- * Functions to translate between common NIST curve names and NIDs.
- */
-
-typedef struct {
-	const char *name;	/* NIST Name of curve */
-	int nid;		/* Curve NID */
-} EC_NIST_NAME;
-
-static EC_NIST_NAME nist_curves[] = {
+static const struct {
+	const char *name;
+	int nid;
+} nist_curves[] = {
 	{ "B-163", NID_sect163r2 },
 	{ "B-233", NID_sect233r1 },
 	{ "B-283", NID_sect283r1 },
@@ -2053,11 +2047,12 @@ EC_curve_nid2nist(int nid)
 {
 	size_t i;
 
-	for (i = 0; i < sizeof(nist_curves) / sizeof(EC_NIST_NAME); i++) {
+	for (i = 0; i < sizeof(nist_curves) / sizeof(nist_curves[0]); i++) {
 		if (nist_curves[i].nid == nid)
-			return (nist_curves[i].name);
+			return nist_curves[i].name;
 	}
-	return (NULL);
+
+	return NULL;
 }
 
 int
@@ -2065,9 +2060,10 @@ EC_curve_nist2nid(const char *name)
 {
 	size_t i;
 
-	for (i = 0; i < sizeof(nist_curves) / sizeof(EC_NIST_NAME); i++) {
-		if (!strcmp(nist_curves[i].name, name))
-			return (nist_curves[i].nid);
+	for (i = 0; i < sizeof(nist_curves) / sizeof(nist_curves[0]); i++) {
+		if (strcmp(nist_curves[i].name, name) == 0)
+			return nist_curves[i].nid;
 	}
-	return (NID_undef);
+
+	return NID_undef;
 }