summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/pkcs12.c
diff options
context:
space:
mode:
authordoug <>2015-10-17 15:00:11 +0000
committerdoug <>2015-10-17 15:00:11 +0000
commit543f0f34095fd3775350a028db241378f1e4dd80 (patch)
tree9f56dde9b92f4c14124c4eab1e2457907ad59f71 /src/usr.bin/openssl/pkcs12.c
parent0713745868dc436c5b2e8e3b2b1951e7a897b163 (diff)
downloadopenbsd-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/pkcs12.c')
-rw-r--r--src/usr.bin/openssl/pkcs12.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/usr.bin/openssl/pkcs12.c b/src/usr.bin/openssl/pkcs12.c
index 2eb04a58b7..0cd1ed7893 100644
--- a/src/usr.bin/openssl/pkcs12.c
+++ b/src/usr.bin/openssl/pkcs12.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkcs12.c,v 1.6 2015/10/17 07:51:10 semarie Exp $ */ 1/* $OpenBSD: pkcs12.c,v 1.7 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. 3 * project.
4 */ 4 */
@@ -125,8 +125,10 @@ pkcs12_main(int argc, char **argv)
125 char *CApath = NULL, *CAfile = NULL; 125 char *CApath = NULL, *CAfile = NULL;
126 126
127 if (single_execution) { 127 if (single_execution) {
128 if (pledge("stdio rpath wpath cpath tty", NULL) == -1) 128 if (pledge("stdio rpath wpath cpath tty", NULL) == -1) {
129 perror("pledge"); 129 perror("pledge");
130 exit(1);
131 }
130 } 132 }
131 133
132 cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC; 134 cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC;