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/pkcs7.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/pkcs7.c')
-rw-r--r-- | src/usr.bin/openssl/pkcs7.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/usr.bin/openssl/pkcs7.c b/src/usr.bin/openssl/pkcs7.c index c29a9c8df2..382a8bfa2c 100644 --- a/src/usr.bin/openssl/pkcs7.c +++ b/src/usr.bin/openssl/pkcs7.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pkcs7.c,v 1.7 2015/10/10 22:28:51 doug Exp $ */ | 1 | /* $OpenBSD: pkcs7.c,v 1.8 2015/10/17 15:00:11 doug Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -155,8 +155,10 @@ pkcs7_main(int argc, char **argv) | |||
155 | int i; | 155 | int i; |
156 | 156 | ||
157 | if (single_execution) { | 157 | if (single_execution) { |
158 | if (pledge("stdio rpath wpath cpath", NULL) == -1) | 158 | if (pledge("stdio rpath wpath cpath", NULL) == -1) { |
159 | perror("pledge"); | 159 | perror("pledge"); |
160 | exit(1); | ||
161 | } | ||
160 | } | 162 | } |
161 | 163 | ||
162 | memset(&pkcs7_config, 0, sizeof(pkcs7_config)); | 164 | memset(&pkcs7_config, 0, sizeof(pkcs7_config)); |