From: tb <tb@openbsd.org>
Date: Fri, 14 Jan 2022 10:17:30 +0000 (+0000)
Subject: Enable openssl pkey -{,pub}check and pkeyparam -check
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e304febbdb12df3a33b34960143cb527e0e8069e;p=openbsd

Enable openssl pkey -{,pub}check and pkeyparam -check
---

diff --git a/usr.bin/openssl/pkey.c b/usr.bin/openssl/pkey.c
index 9134fc71925..dcddd976b4c 100644
--- a/usr.bin/openssl/pkey.c
+++ b/usr.bin/openssl/pkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkey.c,v 1.16 2022/01/10 12:17:49 tb Exp $ */
+/* $OpenBSD: pkey.c,v 1.17 2022/01/14 10:17:30 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006
  */
@@ -266,7 +266,6 @@ pkey_main(int argc, char **argv)
 	if (!pkey)
 		goto end;
 
-#if notyet
 	if (pkey_config.check) {
 		if (!pkey_check(out, pkey, EVP_PKEY_check, "Key pair"))
 			goto end;
@@ -274,7 +273,6 @@ pkey_main(int argc, char **argv)
 		if (!pkey_check(out, pkey, EVP_PKEY_public_check, "Public key"))
 			goto end;
 	}
-#endif
 
 	if (!pkey_config.noout) {
 		if (pkey_config.outformat == FORMAT_PEM) {
diff --git a/usr.bin/openssl/pkeyparam.c b/usr.bin/openssl/pkeyparam.c
index 6ac45585789..924c39eddb7 100644
--- a/usr.bin/openssl/pkeyparam.c
+++ b/usr.bin/openssl/pkeyparam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkeyparam.c,v 1.13 2022/01/10 12:17:49 tb Exp $ */
+/* $OpenBSD: pkeyparam.c,v 1.14 2022/01/14 10:17:30 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006
  */
@@ -165,12 +165,10 @@ pkeyparam_main(int argc, char **argv)
 		goto end;
 	}
 
-#if notyet
 	if (pkeyparam_config.check) {
 		if (!pkey_check(out, pkey, EVP_PKEY_param_check, "Parameters"))
 			goto end;
 	}
-#endif
 
 	if (!pkeyparam_config.noout)
 		PEM_write_bio_Parameters(out, pkey);