From: tb <tb@openbsd.org>
Date: Fri, 31 Mar 2023 07:28:46 +0000 (+0000)
Subject: Guard use of GROUP_EC2N with #ifndef OPENSSL_NO_EC2M
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f51d8a344da2c3e0999375e44a80acaae4c4543b;p=openbsd

Guard use of GROUP_EC2N with #ifndef OPENSSL_NO_EC2M

This allows compiling isakmpd with a libcrypto that has binary field
support removed. Leave the enum value itself unguarded on claudio's
request.

ok beck claudio jsing
---

diff --git a/sbin/isakmpd/dh.c b/sbin/isakmpd/dh.c
index 78d9e491015..09f4eaedd51 100644
--- a/sbin/isakmpd/dh.c
+++ b/sbin/isakmpd/dh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dh.c,v 1.26 2023/03/28 16:32:42 tb Exp $	*/
+/*	$OpenBSD: dh.c,v 1.27 2023/03/31 07:28:46 tb Exp $	*/
 
 /*
  * Copyright (c) 2010-2014 Reyk Floeter <reyk@openbsd.org>
@@ -64,8 +64,10 @@ struct group_id ike_groups[] = {
 	    "FFFFFFFFFFFFFFFF",
 	    "02"
 	},
+#ifndef OPENSSL_NO_EC2M
 	{ GROUP_EC2N, 3, 155, NULL, NULL, NID_ipsec3 },
 	{ GROUP_EC2N, 4, 185, NULL, NULL, NID_ipsec4 },
+#endif
 	{ GROUP_MODP, 5, 1536,
 	    "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
 	    "29024E088A67CC74020BBEA63B139B22514A08798E3404DD"
@@ -277,7 +279,9 @@ group_get(u_int32_t id)
 		group->exchange = modp_create_exchange;
 		group->shared = modp_create_shared;
 		break;
+#ifndef OPENSSL_NO_EC2M
 	case GROUP_EC2N:
+#endif
 	case GROUP_ECP:
 		group->init = ec_init;
 		group->getlen = ec_getlen;