summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/sess_id.c
diff options
context:
space:
mode:
authordoug <>2015-10-10 22:28:51 +0000
committerdoug <>2015-10-10 22:28:51 +0000
commitedaaa7bf2f0b5ce874b24101100d02d3f3d0747f (patch)
treea1bec6cdad41903b9c145025632c4b983a111465 /src/usr.bin/openssl/sess_id.c
parenta7ed9884b640e4bc924d95a4f6587d129a0228c6 (diff)
downloadopenbsd-edaaa7bf2f0b5ce874b24101100d02d3f3d0747f.tar.gz
openbsd-edaaa7bf2f0b5ce874b24101100d02d3f3d0747f.tar.bz2
openbsd-edaaa7bf2f0b5ce874b24101100d02d3f3d0747f.zip
Initial support for pledges in openssl(1) commands.
openssl(1) has two mechanisms for operating: either a single execution of one command (looking at argv[0] or argv[1]) or as an interactive session than may execute any number of commands. We already have a top level pledge that should cover all commands and that's what interactive mode must continue using. However, we can tighten up the pledges when only executing one command. This is an initial stab at support and may contain regressions. Most commands only need "stdio rpath wpath cpath". The pledges could be further restricted by evaluating the situation after parsing options. deraadt@ and beck@ are roughly fine with this approach.
Diffstat (limited to 'src/usr.bin/openssl/sess_id.c')
-rw-r--r--src/usr.bin/openssl/sess_id.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/usr.bin/openssl/sess_id.c b/src/usr.bin/openssl/sess_id.c
index d7f3339509..7bf14adbea 100644
--- a/src/usr.bin/openssl/sess_id.c
+++ b/src/usr.bin/openssl/sess_id.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sess_id.c,v 1.5 2015/08/19 18:25:31 deraadt Exp $ */ 1/* $OpenBSD: sess_id.c,v 1.6 2015/10/10 22:28:51 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 *
@@ -158,6 +158,11 @@ sess_id_main(int argc, char **argv)
158 int ret = 1, i; 158 int ret = 1, i;
159 BIO *out = NULL; 159 BIO *out = NULL;
160 160
161 if (single_execution) {
162 if (pledge("stdio rpath wpath cpath", NULL) == -1)
163 perror("pledge");
164 }
165
161 memset(&sess_id_config, 0, sizeof(sess_id_config)); 166 memset(&sess_id_config, 0, sizeof(sess_id_config));
162 167
163 sess_id_config.informat = FORMAT_PEM; 168 sess_id_config.informat = FORMAT_PEM;