OpenBSD CVS

CVS log for src/usr.bin/openssl/pkcs12.c


[BACK] Up to [local] / src / usr.bin / openssl

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.27 / (download) - annotate - [select for diffs], Wed Feb 28 17:04:38 2024 UTC (2 months, 2 weeks ago) by tb
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, HEAD
Changes since 1.26: +3 -2 lines
Diff to previous 1.26 (colored)

Expand only ever user of PBEPARAM_free() outside of libcrypto

Revision 1.26 / (download) - annotate - [select for diffs], Sun Nov 19 09:29:11 2023 UTC (5 months, 4 weeks ago) by tb
Branch: MAIN
Changes since 1.25: +10 -7 lines
Diff to previous 1.25 (colored)

openssl pkcs12: rewrite without reaching into X509_ALGOR

We can call ASN1_item_unpack() which will end up stuffing the same
arguments into ASN1_item_d2i() as d2i_PBEPARAM(). This eliminates
the last struct access into X509_ALGOR outside libcrypto in the base
tree.

ok jsing

Revision 1.25 / (download) - annotate - [select for diffs], Mon Mar 6 14:32:06 2023 UTC (14 months, 2 weeks ago) by tb
Branch: MAIN
CVS Tags: OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3
Changes since 1.24: +102 -102 lines
Diff to previous 1.24 (colored)

Rename struct ${app}_config to plain cfg

All the structs are static and we need to reach into them many times.
Having a shorter name is more concise and results in less visual clutter.
It also avoids many overlong lines and we will be able to get rid of some
unfortunate line wrapping down the road.

Discussed with jsing

Revision 1.24 / (download) - annotate - [select for diffs], Fri Nov 11 17:07:39 2022 UTC (18 months, 1 week ago) by joshua
Branch: MAIN
Changes since 1.23: +4 -6 lines
Diff to previous 1.23 (colored)

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@

Revision 1.23 / (download) - annotate - [select for diffs], Wed Sep 14 16:31:36 2022 UTC (20 months ago) by tb
Branch: MAIN
CVS Tags: OPENBSD_7_2_BASE, OPENBSD_7_2
Changes since 1.22: +1 -2 lines
Diff to previous 1.22 (colored)

remove an extraneous empty line

Revision 1.22 / (download) - annotate - [select for diffs], Sun Sep 11 18:07:46 2022 UTC (20 months, 1 week ago) by tb
Branch: MAIN
Changes since 1.21: +38 -25 lines
Diff to previous 1.21 (colored)

Adjust for opaque structs in pkcs12.h

ok jsing

Revision 1.21 / (download) - annotate - [select for diffs], Wed Aug 3 20:17:38 2022 UTC (21 months, 2 weeks ago) by tb
Branch: MAIN
Changes since 1.20: +7 -1 lines
Diff to previous 1.20 (colored)

Add workarounds for some symbols that are hidden under !LIBRESSL_INTERNAL
until the next bump exposes new symbols that we can use.

Revision 1.20 / (download) - annotate - [select for diffs], Thu Apr 28 15:42:10 2022 UTC (2 years ago) by inoguchi
Branch: MAIN
Changes since 1.19: +3 -3 lines
Diff to previous 1.19 (colored)

Fix comparison in openssl(1) pkcs12

comment from tb@

Revision 1.19 / (download) - annotate - [select for diffs], Thu Apr 28 15:29:10 2022 UTC (2 years ago) by inoguchi
Branch: MAIN
Changes since 1.18: +31 -31 lines
Diff to previous 1.18 (colored)

Compare pointer value with NULL in openssl(1) pkcs12

ok tb@

Revision 1.18 / (download) - annotate - [select for diffs], Mon Mar 28 11:02:49 2022 UTC (2 years, 1 month ago) by inoguchi
Branch: MAIN
CVS Tags: OPENBSD_7_1_BASE, OPENBSD_7_1
Changes since 1.17: +30 -24 lines
Diff to previous 1.17 (colored)

Change internal functions to static in openssl(1) pkcs12

ok tb@

Revision 1.17 / (download) - annotate - [select for diffs], Mon Mar 28 10:56:26 2022 UTC (2 years, 1 month ago) by inoguchi
Branch: MAIN
Changes since 1.16: +1 -19 lines
Diff to previous 1.16 (colored)

Remove unused function cert_load in openssl(1) pkcs12

ok tb@

Revision 1.16 / (download) - annotate - [select for diffs], Sun Oct 31 16:47:27 2021 UTC (2 years, 6 months ago) by tb
Branch: MAIN
Changes since 1.15: +5 -2 lines
Diff to previous 1.15 (colored)

Various minor adjustments to make openssl(1) compile with opaque
structs in X509.

Revision 1.15 / (download) - annotate - [select for diffs], Sat Oct 23 14:48:33 2021 UTC (2 years, 6 months ago) by tb
Branch: MAIN
Changes since 1.14: +70 -69 lines
Diff to previous 1.14 (colored)

Prepare pcks12 for opaque structs in libcrypto

get_cert_chain() needs some error checking. return X509_V_ errors
instead of trying to overload the NULL and then whine in a comment that
this won't really work.

Fix a bug that printed only the first attribute by factoring out the
thing that did the actual printing.

Sprinkle a few changes to accessors here and there.
This is loosely based on what OpenSSL did with some simplifications by
jsing.

ok beck jsing

Revision 1.14 / (download) - annotate - [select for diffs], Fri Jul 26 12:35:59 2019 UTC (4 years, 9 months ago) by inoguchi
Branch: MAIN
CVS Tags: OPENBSD_7_0_BASE, OPENBSD_7_0, OPENBSD_6_9_BASE, OPENBSD_6_9, OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6
Changes since 1.13: +86 -61 lines
Diff to previous 1.13 (colored)

Code clean up openssl(1) pkcs12

- Add a space before 'export_end:'
- Remove space after '*'
- Wrap lines by 80 columns

Revision 1.13 / (download) - annotate - [select for diffs], Fri Jul 26 11:52:51 2019 UTC (4 years, 9 months ago) by inoguchi
Branch: MAIN
Changes since 1.12: +7 -14 lines
Diff to previous 1.12 (colored)

Remove unnecessary NULL checks before free in openssl(1) pkcs12

ok bcook@ tb@

Revision 1.12 / (download) - annotate - [select for diffs], Wed Jul 24 13:49:24 2019 UTC (4 years, 9 months ago) by inoguchi
Branch: MAIN
Changes since 1.11: +409 -214 lines
Diff to previous 1.11 (colored)

Convert openssl(1) pkcs12 to the newer style of option handling

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@

Revision 1.11 / (download) - annotate - [select for diffs], Tue Jul 23 10:18:32 2019 UTC (4 years, 9 months ago) by inoguchi
Branch: MAIN
Changes since 1.10: +136 -125 lines
Diff to previous 1.10 (colored)

Moving variables into struct in openssl(1) pkcs12

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@

Revision 1.10 / (download) - annotate - [select for diffs], Wed Feb 7 05:47:55 2018 UTC (6 years, 3 months ago) by jsing
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4, OPENBSD_6_3_BASE, OPENBSD_6_3
Changes since 1.9: +4 -4 lines
Diff to previous 1.9 (colored)

Indent labels with a single space so that diff prototypes are more useful.

Revision 1.9 / (download) - annotate - [select for diffs], Fri Jan 20 08:57:12 2017 UTC (7 years, 3 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_6_2_BASE, OPENBSD_6_2, OPENBSD_6_1_BASE, OPENBSD_6_1
Changes since 1.8: +2 -2 lines
Diff to previous 1.8 (colored)

rearrange pledge promises into the canonical order; easier to eyeball

Revision 1.8 / (download) - annotate - [select for diffs], Fri Dec 30 15:59:58 2016 UTC (7 years, 4 months ago) by jsing
Branch: MAIN
Changes since 1.7: +3 -3 lines
Diff to previous 1.7 (colored)

Stop using M_PKCS12_* compatibility macros here as well.

Revision 1.7 / (download) - annotate - [select for diffs], Sat Oct 17 15:00:11 2015 UTC (8 years, 7 months ago) by doug
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0, OPENBSD_5_9_BASE, OPENBSD_5_9
Changes since 1.6: +4 -2 lines
Diff to previous 1.6 (colored)

Exit if a pledge call fails in non-interactive mode.

ok semarie@

Revision 1.6 / (download) - annotate - [select for diffs], Sat Oct 17 07:51:10 2015 UTC (8 years, 7 months ago) by semarie
Branch: MAIN
Changes since 1.5: +2 -2 lines
Diff to previous 1.5 (colored)

add "tty" for several subcommands of openssl

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@

Revision 1.5 / (download) - annotate - [select for diffs], Sat Oct 10 22:28:51 2015 UTC (8 years, 7 months ago) by doug
Branch: MAIN
Changes since 1.4: +6 -1 lines
Diff to previous 1.4 (colored)

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.

Revision 1.4 / (download) - annotate - [select for diffs], Fri Sep 11 14:30:23 2015 UTC (8 years, 8 months ago) by bcook
Branch: MAIN
Changes since 1.3: +4 -23 lines
Diff to previous 1.3 (colored)

Remove engine command and parameters from openssl(1).

We do not have any builtin or dynamic engines, meaning openssl(1) has
no way to use the engine command or parameters at all.

ok jsing@

Revision 1.3 / (download) - annotate - [select for diffs], Sat Aug 22 16:36:05 2015 UTC (8 years, 8 months ago) by jsing
Branch: MAIN
Changes since 1.2: +1 -3 lines
Diff to previous 1.2 (colored)

Remove all duplicate prototypes for *_main functions (these are already
provided by progs.h). Also, move the FUNCTION type (and flags) into
openssl.c since that is the only place of use. Lastly, remove pointless
'extern' from the prototypes and use char **argv instead of char *argv[]
(the former is used elsewhere).

ok deraadt@ doug@

Revision 1.2 / (download) - annotate - [select for diffs], Thu Aug 28 14:23:52 2014 UTC (9 years, 8 months ago) by jsing
Branch: MAIN
CVS Tags: OPENBSD_5_8_BASE, OPENBSD_5_8, OPENBSD_5_7_BASE, OPENBSD_5_7
Changes since 1.1: +1 -4 lines
Diff to previous 1.1 (colored)

openssl_setup() calls SSL_load_error_strings(), which happens to call
ERR_load_crypto_strings() - as such, we do not need to call the same
function from most of the applications.

Revision 1.1 / (download) - annotate - [select for diffs], Tue Aug 26 17:47:25 2014 UTC (9 years, 8 months ago) by jsing
Branch: MAIN

Move openssl(1) from /usr/sbin/openssl to /usr/bin/openssl, since it is not
a system/superuser binary. At the same time, move the source code from its
current lib/libssl/src/apps location to a more appropriate home under
usr.bin/openssl.

ok deraadt@ miod@

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.