diff options
| author | tb <> | 2022-01-14 10:17:30 +0000 |
|---|---|---|
| committer | tb <> | 2022-01-14 10:17:30 +0000 |
| commit | 4d6ecef5cde1993d152ea7386898945d1e5050e9 (patch) | |
| tree | 13a730666ff1f2fdd3584d3cef95ac6dc4b6d187 /src | |
| parent | 256ebebe0a83a12984fcfea58daf6f31ef81571a (diff) | |
| download | openbsd-4d6ecef5cde1993d152ea7386898945d1e5050e9.tar.gz openbsd-4d6ecef5cde1993d152ea7386898945d1e5050e9.tar.bz2 openbsd-4d6ecef5cde1993d152ea7386898945d1e5050e9.zip | |
Enable openssl pkey -{,pub}check and pkeyparam -check
Diffstat (limited to '')
| -rw-r--r-- | src/usr.bin/openssl/pkey.c | 4 | ||||
| -rw-r--r-- | src/usr.bin/openssl/pkeyparam.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/usr.bin/openssl/pkey.c b/src/usr.bin/openssl/pkey.c index 9134fc7192..dcddd976b4 100644 --- a/src/usr.bin/openssl/pkey.c +++ b/src/usr.bin/openssl/pkey.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pkey.c,v 1.16 2022/01/10 12:17:49 tb Exp $ */ | 1 | /* $OpenBSD: pkey.c,v 1.17 2022/01/14 10:17:30 tb Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2006 | 3 | * project 2006 |
| 4 | */ | 4 | */ |
| @@ -266,7 +266,6 @@ pkey_main(int argc, char **argv) | |||
| 266 | if (!pkey) | 266 | if (!pkey) |
| 267 | goto end; | 267 | goto end; |
| 268 | 268 | ||
| 269 | #if notyet | ||
| 270 | if (pkey_config.check) { | 269 | if (pkey_config.check) { |
| 271 | if (!pkey_check(out, pkey, EVP_PKEY_check, "Key pair")) | 270 | if (!pkey_check(out, pkey, EVP_PKEY_check, "Key pair")) |
| 272 | goto end; | 271 | goto end; |
| @@ -274,7 +273,6 @@ pkey_main(int argc, char **argv) | |||
| 274 | if (!pkey_check(out, pkey, EVP_PKEY_public_check, "Public key")) | 273 | if (!pkey_check(out, pkey, EVP_PKEY_public_check, "Public key")) |
| 275 | goto end; | 274 | goto end; |
| 276 | } | 275 | } |
| 277 | #endif | ||
| 278 | 276 | ||
| 279 | if (!pkey_config.noout) { | 277 | if (!pkey_config.noout) { |
| 280 | if (pkey_config.outformat == FORMAT_PEM) { | 278 | if (pkey_config.outformat == FORMAT_PEM) { |
diff --git a/src/usr.bin/openssl/pkeyparam.c b/src/usr.bin/openssl/pkeyparam.c index 6ac4558578..924c39eddb 100644 --- a/src/usr.bin/openssl/pkeyparam.c +++ b/src/usr.bin/openssl/pkeyparam.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pkeyparam.c,v 1.13 2022/01/10 12:17:49 tb Exp $ */ | 1 | /* $OpenBSD: pkeyparam.c,v 1.14 2022/01/14 10:17:30 tb Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2006 | 3 | * project 2006 |
| 4 | */ | 4 | */ |
| @@ -165,12 +165,10 @@ pkeyparam_main(int argc, char **argv) | |||
| 165 | goto end; | 165 | goto end; |
| 166 | } | 166 | } |
| 167 | 167 | ||
| 168 | #if notyet | ||
| 169 | if (pkeyparam_config.check) { | 168 | if (pkeyparam_config.check) { |
| 170 | if (!pkey_check(out, pkey, EVP_PKEY_param_check, "Parameters")) | 169 | if (!pkey_check(out, pkey, EVP_PKEY_param_check, "Parameters")) |
| 171 | goto end; | 170 | goto end; |
| 172 | } | 171 | } |
| 173 | #endif | ||
| 174 | 172 | ||
| 175 | if (!pkeyparam_config.noout) | 173 | if (!pkeyparam_config.noout) |
| 176 | PEM_write_bio_Parameters(out, pkey); | 174 | PEM_write_bio_Parameters(out, pkey); |
