diff options
author | joshua <> | 2022-11-11 17:07:39 +0000 |
---|---|---|
committer | joshua <> | 2022-11-11 17:07:39 +0000 |
commit | f8749b129444d560b9e645a68ec7b045800243ed (patch) | |
tree | 34334d4d84a0e642e816557dc806adc84e7a2f27 /src/usr.bin/openssl/passwd.c | |
parent | c3cccf93ef7724489b269171de95147b247b7799 (diff) | |
download | openbsd-f8749b129444d560b9e645a68ec7b045800243ed.tar.gz openbsd-f8749b129444d560b9e645a68ec7b045800243ed.tar.bz2 openbsd-f8749b129444d560b9e645a68ec7b045800243ed.zip |
Remove the legacy interactive mode from openssl(1).
This removes the legacy interactive mode from openssl(1) since it is
rarely used, complicates the code, and has also been removed from
OpenSSL in version 3.x.x.
ok tb@ jsing@
Diffstat (limited to 'src/usr.bin/openssl/passwd.c')
-rw-r--r-- | src/usr.bin/openssl/passwd.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/usr.bin/openssl/passwd.c b/src/usr.bin/openssl/passwd.c index 11b43d653a..f05751f165 100644 --- a/src/usr.bin/openssl/passwd.c +++ b/src/usr.bin/openssl/passwd.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: passwd.c,v 1.12 2021/12/12 20:40:25 tb Exp $ */ | 1 | /* $OpenBSD: passwd.c,v 1.13 2022/11/11 17:07:39 joshua Exp $ */ |
2 | 2 | ||
3 | #if defined OPENSSL_NO_MD5 | 3 | #if defined OPENSSL_NO_MD5 |
4 | #define NO_MD5CRYPT_1 | 4 | #define NO_MD5CRYPT_1 |
@@ -145,11 +145,9 @@ passwd_main(int argc, char **argv) | |||
145 | int argsused; | 145 | int argsused; |
146 | int ret = 1; | 146 | int ret = 1; |
147 | 147 | ||
148 | if (single_execution) { | 148 | if (pledge("stdio cpath wpath rpath tty", NULL) == -1) { |
149 | if (pledge("stdio cpath wpath rpath tty", NULL) == -1) { | 149 | perror("pledge"); |
150 | perror("pledge"); | 150 | exit(1); |
151 | exit(1); | ||
152 | } | ||
153 | } | 151 | } |
154 | 152 | ||
155 | memset(&passwd_config, 0, sizeof(passwd_config)); | 153 | memset(&passwd_config, 0, sizeof(passwd_config)); |