OpenBSD CVS

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


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

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.31 / (download) - annotate - [select for diffs], Sat Jul 29 17:15:45 2023 UTC (9 months, 2 weeks ago) by tb
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, OPENBSD_7_4_BASE, OPENBSD_7_4, HEAD
Changes since 1.30: +2 -4 lines
Diff to previous 1.30 (colored)

Drop unused conf, pem, and x509 headers, add unistd for pledge

Revision 1.30 / (download) - annotate - [select for diffs], Sun Jun 11 12:06:08 2023 UTC (11 months, 1 week ago) by tb
Branch: MAIN
Changes since 1.29: +14 -20 lines
Diff to previous 1.29 (colored)

openssl enc: drop a few parens and unwrap a few lines

No binary change on amd64

Revision 1.29 / (download) - annotate - [select for diffs], Sun Jun 11 11:54:44 2023 UTC (11 months, 1 week ago) by tb
Branch: MAIN
Changes since 1.28: +2 -4 lines
Diff to previous 1.28 (colored)

openssl enc: small style fixup after ZLIB unifdef

Revision 1.28 / (download) - annotate - [select for diffs], Sun Jun 11 05:45:20 2023 UTC (11 months, 1 week ago) by tb
Branch: MAIN
Changes since 1.27: +1 -39 lines
Diff to previous 1.27 (colored)

Unifdef ZLIB

This is very dead code: the openssl app was never compiled with -DZLIB
after January 1, 2015.

Revision 1.27 / (download) - annotate - [select for diffs], Mon Mar 6 14:32:06 2023 UTC (14 months, 1 week ago) by tb
Branch: MAIN
CVS Tags: OPENBSD_7_3_BASE, OPENBSD_7_3
Changes since 1.26: +116 -116 lines
Diff to previous 1.26 (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.26 / (download) - annotate - [select for diffs], Sat Mar 4 21:58:54 2023 UTC (14 months, 2 weeks ago) by tb
Branch: MAIN
Changes since 1.25: +30 -2 lines
Diff to previous 1.25 (colored)

openssl enc doesn't really support AEAD ciphers and XTS mode

Do not display such ciphers in the usage display and error out if
they are given. As pointed out by Pauli Dale, the current situation
is confusing.

Fixes GH issues #786 and #819

ok jsing

Revision 1.25 / (download) - annotate - [select for diffs], Fri Nov 11 17:07:39 2022 UTC (18 months ago) by joshua
Branch: MAIN
Changes since 1.24: +4 -6 lines
Diff to previous 1.24 (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.24 / (download) - annotate - [select for diffs], Tue Dec 7 20:13:15 2021 UTC (2 years, 5 months ago) by tb
Branch: MAIN
CVS Tags: OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1
Changes since 1.23: +9 -5 lines
Diff to previous 1.23 (colored)

Simple conversion to opaque EVP_CIPHER.

Revision 1.23 / (download) - annotate - [select for diffs], Thu Jul 25 11:42:12 2019 UTC (4 years, 9 months ago) by bcook
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.22: +1 -2 lines
Diff to previous 1.22 (colored)

remove superfluous comment

Revision 1.22 / (download) - annotate - [select for diffs], Thu Jul 25 11:41:03 2019 UTC (4 years, 9 months ago) by bcook
Branch: MAIN
Changes since 1.21: +4 -2 lines
Diff to previous 1.21 (colored)

zero tmpkeyiv buffer after use when encrypting

from Steven Roberts

Revision 1.21 / (download) - annotate - [select for diffs], Sun Jul 14 03:30:45 2019 UTC (4 years, 10 months ago) by guenther
Branch: MAIN
Changes since 1.20: +2 -2 lines
Diff to previous 1.20 (colored)

Mark the initialized struct options arrays as both static and const.
This moves them from .data to .data.rel.ro

ok deraadt@ inoguchi@

Revision 1.20 / (download) - annotate - [select for diffs], Mon Apr 1 16:06:54 2019 UTC (5 years, 1 month ago) by jsing
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5
Changes since 1.19: +3 -3 lines
Diff to previous 1.19 (colored)

Sort.

Revision 1.19 / (download) - annotate - [select for diffs], Mon Apr 1 16:05:14 2019 UTC (5 years, 1 month ago) by jsing
Branch: MAIN
Changes since 1.18: +2 -2 lines
Diff to previous 1.18 (colored)

Make the openssl(1) enc -iter flag actually work.

Diff from Steven Roberts <sroberts at fenderq dot com> - thanks!

Revision 1.18 / (download) - annotate - [select for diffs], Sat Feb 9 15:49:21 2019 UTC (5 years, 3 months ago) by inoguchi
Branch: MAIN
Changes since 1.17: +4 -2 lines
Diff to previous 1.17 (colored)

Fix weird wrap showing cipher list in interactive mode

ok jsing@ tb@

Revision 1.17 / (download) - annotate - [select for diffs], Sat Feb 9 06:27:37 2019 UTC (5 years, 3 months ago) by inoguchi
Branch: MAIN
Changes since 1.16: +2 -14 lines
Diff to previous 1.16 (colored)

Summarize the 4 same name functions and move it to apps.c

ok tb@ jsing@

Revision 1.16 / (download) - annotate - [select for diffs], Fri Jan 18 22:47:34 2019 UTC (5 years, 4 months ago) by naddy
Branch: MAIN
Changes since 1.15: +17 -15 lines
Diff to previous 1.15 (colored)

Add -iter and -pbkdf2 to the usage synopsis.
Reorder option descriptions so -iter and -pbkdf2 show up alphabetically.
Add missing argument name for -iter.
ok jmc@

Revision 1.15 / (download) - annotate - [select for diffs], Fri Jan 18 03:45:47 2019 UTC (5 years, 4 months ago) by beck
Branch: MAIN
Changes since 1.14: +44 -5 lines
Diff to previous 1.14 (colored)

Change the default digest type to sha256, and add support for
pbkdf2 with OpenSSL compatible flags
ok jsing@

Revision 1.14 / (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_4_BASE, OPENBSD_6_4, OPENBSD_6_3_BASE, OPENBSD_6_3
Changes since 1.13: +2 -2 lines
Diff to previous 1.13 (colored)

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

Revision 1.13 / (download) - annotate - [select for diffs], Wed Feb 7 04:57:06 2018 UTC (6 years, 3 months ago) by jsing
Branch: MAIN
Changes since 1.12: +2 -3 lines
Diff to previous 1.12 (colored)

Remove guards around *_free() calls since these functions handle NULL.

Revision 1.12 / (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.11: +2 -2 lines
Diff to previous 1.11 (colored)

rearrange pledge promises into the canonical order; easier to eyeball

Revision 1.11 / (download) - annotate - [select for diffs], Thu Apr 7 20:02:19 2016 UTC (8 years, 1 month ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_6_0_BASE, OPENBSD_6_0
Changes since 1.10: +4 -4 lines
Diff to previous 1.10 (colored)

hexidecimal->hexadecimal; from mmcc
ok beck

Revision 1.10 / (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_5_9_BASE, OPENBSD_5_9
Changes since 1.9: +4 -2 lines
Diff to previous 1.9 (colored)

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

ok semarie@

Revision 1.9 / (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.8: +2 -2 lines
Diff to previous 1.8 (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.8 / (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.7: +6 -1 lines
Diff to previous 1.7 (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.7 / (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.6: +2 -18 lines
Diff to previous 1.6 (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.6 / (download) - annotate - [select for diffs], Thu Sep 10 16:01:06 2015 UTC (8 years, 8 months ago) by jsing
Branch: MAIN
Changes since 1.5: +3 -3 lines
Diff to previous 1.5 (colored)

Correct spelling of OPENSSL_cleanse.

Revision 1.5 / (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.4: +1 -3 lines
Diff to previous 1.4 (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.4 / (download) - annotate - [select for diffs], Thu Jan 1 13:55:03 2015 UTC (9 years, 4 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.3: +382 -250 lines
Diff to previous 1.3 (colored)

Convert the openssl(1) enc command to the new option parsing and usage.

With input from doug@

Revision 1.3 / (download) - annotate - [select for diffs], Wed Oct 22 13:54:03 2014 UTC (9 years, 6 months ago) by jsing
Branch: MAIN
Changes since 1.2: +4 -4 lines
Diff to previous 1.2 (colored)

Use arc4random_buf() instead of RAND(_pseudo)?_bytes().

ok bcook@

Revision 1.2 / (download) - annotate - [select for diffs], Mon Sep 1 20:54:37 2014 UTC (9 years, 8 months ago) by doug
Branch: MAIN
Changes since 1.1: +4 -4 lines
Diff to previous 1.1 (colored)

Enable -Wshadow in openssl(1) and fix a few shadow warnings.

ok jsing@

Revision 1.1 / (download) - annotate - [select for diffs], Tue Aug 26 17:47:24 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.