openbsd/src/usr.bin/openssl/pkcs12.c, branch OPENBSD_6_8_BASE A mirror of https://github.com/libressl/openbsd.git https://git.lua4.win/openbsd/atom?h=OPENBSD_6_8_BASE 2019-07-26T12:35:59+00:00 Code clean up openssl(1) pkcs12 2019-07-26T12:35:59+00:00 inoguchi 2019-07-26T12:35:59+00:00 urn:sha1:4defd45879158050c06cedd85d4d31f3ce967b45 - Add a space before 'export_end:' - Remove space after '*' - Wrap lines by 80 columns Remove unnecessary NULL checks before free in openssl(1) pkcs12 2019-07-26T11:52:51+00:00 inoguchi 2019-07-26T11:52:51+00:00 urn:sha1:55948284d7f5c955c58cfce1e8ee302c8b8a764a ok bcook@ tb@ Convert openssl(1) pkcs12 to the newer style of option handling 2019-07-24T13:49:24+00:00 inoguchi 2019-07-24T13:49:24+00:00 urn:sha1:e64dbbf5e10b4c67309e6acbbdb26d7ed2eefb96 Adapt openssl(1) pkcs12 command to new option handling. Added pkcs12_options struct, and replaced for-if-strcmp handling with options_parse(). ok and comments jsing@ Moving variables into struct in openssl(1) pkcs12 2019-07-23T10:18:32+00:00 inoguchi 2019-07-23T10:18:32+00:00 urn:sha1:ddc6d941b8b9d1cdea5fa91c83e5072da120f50d First step to adapt openssl(1) pkcs12 command to new option handling. There is no functional changes by this diff, and just moving variables into pkcs12_config struct. I still keep long lines more than 80 for this review to minimize diffs. ok jsing@ tb@ Indent labels with a single space so that diff prototypes are more useful. 2018-02-07T05:47:55+00:00 jsing 2018-02-07T05:47:55+00:00 urn:sha1:6d829832b5c1cafa0527a7c2595749b17b0b8efe rearrange pledge promises into the canonical order; easier to eyeball 2017-01-20T08:57:12+00:00 deraadt 2017-01-20T08:57:12+00:00 urn:sha1:ff6fa3ffece7ca61b2a5e2a66b4920c710d4e36b Stop using M_PKCS12_* compatibility macros here as well. 2016-12-30T15:59:58+00:00 jsing 2016-12-30T15:59:58+00:00 urn:sha1:d3543522c5ea49e9c3074c032cb4a34ce8e9fb18 Exit if a pledge call fails in non-interactive mode. 2015-10-17T15:00:11+00:00 doug 2015-10-17T15:00:11+00:00 urn:sha1:db101f70294bca3ebe9eaa1f16aaae8cd872d2e4 ok semarie@ add "tty" for several subcommands of openssl 2015-10-17T07:51:10+00:00 semarie 2015-10-17T07:51:10+00:00 urn:sha1:c93eb1877de5865e80d306506ac0af05c8ac5bde it is needed in order to let libssl UI_* function plays with echo on/off when asking for password on terminal. passwd subcommand needs additionnal "wpath cpath" in order to let it calls fopen("/dev/tty", "w") (O_WRONLY with O_CREAT | O_TRUNC). problem reported by several with and ok doug@ Initial support for pledges in openssl(1) commands. 2015-10-10T22:28:51+00:00 doug 2015-10-10T22:28:51+00:00 urn:sha1:503cf2bd70538bb9cc734a5fd58230b90be4d1d8 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.