diff options
author | doug <> | 2015-10-17 15:00:11 +0000 |
---|---|---|
committer | doug <> | 2015-10-17 15:00:11 +0000 |
commit | 543f0f34095fd3775350a028db241378f1e4dd80 (patch) | |
tree | 9f56dde9b92f4c14124c4eab1e2457907ad59f71 /src/usr.bin/openssl/pkcs8.c | |
parent | 0713745868dc436c5b2e8e3b2b1951e7a897b163 (diff) | |
download | openbsd-543f0f34095fd3775350a028db241378f1e4dd80.tar.gz openbsd-543f0f34095fd3775350a028db241378f1e4dd80.tar.bz2 openbsd-543f0f34095fd3775350a028db241378f1e4dd80.zip |
Exit if a pledge call fails in non-interactive mode.
ok semarie@
Diffstat (limited to 'src/usr.bin/openssl/pkcs8.c')
-rw-r--r-- | src/usr.bin/openssl/pkcs8.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/usr.bin/openssl/pkcs8.c b/src/usr.bin/openssl/pkcs8.c index 5b54cbfb98..9c620c8619 100644 --- a/src/usr.bin/openssl/pkcs8.c +++ b/src/usr.bin/openssl/pkcs8.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pkcs8.c,v 1.8 2015/10/17 07:51:10 semarie Exp $ */ | 1 | /* $OpenBSD: pkcs8.c,v 1.9 2015/10/17 15:00:11 doug 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 1999-2004. | 3 | * project 1999-2004. |
4 | */ | 4 | */ |
@@ -227,8 +227,10 @@ pkcs8_main(int argc, char **argv) | |||
227 | int ret = 1; | 227 | int ret = 1; |
228 | 228 | ||
229 | if (single_execution) { | 229 | if (single_execution) { |
230 | if (pledge("stdio rpath wpath cpath tty", NULL) == -1) | 230 | if (pledge("stdio rpath wpath cpath tty", NULL) == -1) { |
231 | perror("pledge"); | 231 | perror("pledge"); |
232 | exit(1); | ||
233 | } | ||
232 | } | 234 | } |
233 | 235 | ||
234 | memset(&pkcs8_config, 0, sizeof(pkcs8_config)); | 236 | memset(&pkcs8_config, 0, sizeof(pkcs8_config)); |