OpenBSD CVS

CVS log for src/lib/libssl/bio_ssl.c


[BACK] Up to [local] / src / lib / libssl

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.40 / (download) - annotate - [select for diffs], Wed Jul 19 13:34:33 2023 UTC (10 months, 3 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.39: +2 -2 lines
Diff to previous 1.39 (colored)

Fix two aliases in libcrypto spotted by the new symbols test

ok jsing

Revision 1.39 / (download) - annotate - [select for diffs], Sat Jul 8 16:40:13 2023 UTC (11 months ago) by beck
Branch: MAIN
Changes since 1.38: +5 -1 lines
Diff to previous 1.38 (colored)

Hide all public symbols in libssl

With the guentherizer 9000

ok tb@

Revision 1.38 / (download) - annotate - [select for diffs], Thu Feb 16 08:38:17 2023 UTC (15 months, 3 weeks ago) by tb
Branch: MAIN
CVS Tags: OPENBSD_7_3_BASE, OPENBSD_7_3
Changes since 1.37: +4 -4 lines
Diff to previous 1.37 (colored)

libressl *_namespace.h: adjust *_ALIAS() to require a semicolon

LCRYPTO_ALIAS() and LSSL_ALIAS() contained a trailing semicolon.
This does not conform to style(9), breaks editors and ctags and
(most importantly) my workflow. Fix this by neutering them with
asm("") so that -Wpedantic doesn't complain. There's precedent
in libc's namespace.h

fix suggested by & ok jsing

Revision 1.37 / (download) - annotate - [select for diffs], Sat Nov 26 16:08:55 2022 UTC (18 months, 2 weeks ago) by tb
Branch: MAIN
Changes since 1.36: +2 -2 lines
Diff to previous 1.36 (colored)

Make internal header file names consistent

Libcrypto currently has a mess of *_lcl.h, *_locl.h, and *_local.h names
used for internal headers. Move all these headers we inherited from
OpenSSL to *_local.h, reserving the name *_internal.h for our own code.
Similarly, move dtls_locl.h and ssl_locl.h to dtls_local and ssl_local.h.
constant_time_locl.h is moved to constant_time.h since it's special.

Adjust all .c files in libcrypto, libssl and regress.

The diff is mechanical with the exception of tls13_quic.c, where
#include <ssl_locl.h> was fixed manually.

discussed with jsing,
no objection bcook

Revision 1.36 / (download) - annotate - [select for diffs], Fri Nov 11 11:25:18 2022 UTC (19 months ago) by beck
Branch: MAIN
Changes since 1.35: +4 -1 lines
Diff to previous 1.35 (colored)

Add support for symbol hiding disabled by default.

Fully explained in libcrypto/README. TL;DR make sure libcrypto
and libssl's function calls internally and to each other are via
symbol names that won't get overridden by linking other libraries.

Mostly work by guenther@, which will currently be gated behind a
build setting NAMESPACE=yes. once we convert all the symbols to
this method we will do a major bump and pick up the changes.

ok tb@ jsing@

Revision 1.35 / (download) - annotate - [select for diffs], Wed Oct 5 21:16:14 2022 UTC (20 months ago) by tb
Branch: MAIN
Changes since 1.34: +3 -5 lines
Diff to previous 1.34 (colored)

unwrap two lines for readability

Revision 1.34 / (download) - annotate - [select for diffs], Sun Oct 2 16:36:41 2022 UTC (20 months, 1 week ago) by jsing
Branch: MAIN
Changes since 1.33: +3 -3 lines
Diff to previous 1.33 (colored)

Get rid of SSL_CTX_INTERNAL and SSL_INTERNAL.

These are no longer necessary due to SSL_CTX and SSL now being fully
opaque. Merge SSL_CTX_INTERNAL back into SSL_CTX and SSL_INTERNAL back
into SSL.

Prompted by tb@

Revision 1.33 / (download) - annotate - [select for diffs], Fri Jan 14 09:12:53 2022 UTC (2 years, 4 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.32: +3 -3 lines
Diff to previous 1.32 (colored)

Use the correct type for ssl_callback_ctrl()

Revision 1.32 / (download) - annotate - [select for diffs], Fri Jan 14 09:09:30 2022 UTC (2 years, 4 months ago) by tb
Branch: MAIN
Changes since 1.31: +2 -1 lines
Diff to previous 1.31 (colored)

bio_ssl.c needs to peek into bio_local.h

Revision 1.31 / (download) - annotate - [select for diffs], Thu Jul 1 17:53:39 2021 UTC (2 years, 11 months ago) by jsing
Branch: MAIN
CVS Tags: OPENBSD_7_0_BASE, OPENBSD_7_0
Changes since 1.30: +3 -3 lines
Diff to previous 1.30 (colored)

Merge SSL_METHOD_INTERNAL into SSL_METHOD.

Now that SSL_METHOD is opaque and in internal headers, we can remove
SSL_METHOD_INTERNAL by merging it back into SSL_METHOD.

ok tb@

Revision 1.30 / (download) - annotate - [select for diffs], Fri Jun 11 11:13:53 2021 UTC (3 years ago) by jsing
Branch: MAIN
Changes since 1.29: +4 -4 lines
Diff to previous 1.29 (colored)

Indent all labels with a single space.

This ensures that diff reports the correct function prototype.

Prompted by tb@

Revision 1.29 / (download) - annotate - [select for diffs], Fri Aug 24 20:30:21 2018 UTC (5 years, 9 months ago) by tb
Branch: MAIN
CVS Tags: 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, OPENBSD_6_5_BASE, OPENBSD_6_5, OPENBSD_6_4_BASE, OPENBSD_6_4
Changes since 1.28: +4 -2 lines
Diff to previous 1.28 (colored)

Let SSL_copy_session_id() return an int for error checking.

Accordingly, add some error checking to SSL_copy_session_id(),
BIO_ssl_copy_session_id(), and SSL_dup().
Prompted by OpenSSL commit 17dd65e6e1f

Tested in a bulk build by sthen

ok jsing

Revision 1.28 / (download) - annotate - [select for diffs], Tue May 1 13:30:24 2018 UTC (6 years, 1 month ago) by tb
Branch: MAIN
Changes since 1.27: +3 -3 lines
Diff to previous 1.27 (colored)

const for BIO_f_ssl(),  the last const difference to OpenSSL in our
public API in libssl.

ok beck, jsing

Revision 1.27 / (download) - annotate - [select for diffs], Tue Feb 7 02:08:38 2017 UTC (7 years, 4 months ago) by beck
Branch: MAIN
CVS Tags: OPENBSD_6_3_BASE, OPENBSD_6_3, OPENBSD_6_2_BASE, OPENBSD_6_2, OPENBSD_6_1_BASE, OPENBSD_6_1
Changes since 1.26: +2 -2 lines
Diff to previous 1.26 (colored)

Change SSLerror() back to taking two args, with the first one being an SSL *.
Make a table of "function codes" which maps the internal state of the SSL *
to something like a useful name so in a typical error in the connection you
know in what sort of place in the handshake things happened. (instead of
by arcane function name).
Add SSLerrorx() for when we don't have an SSL *
ok jsing@ after us both being prodded by bluhm@ to make it not terrible

Revision 1.26 / (download) - annotate - [select for diffs], Sun Jan 29 17:49:23 2017 UTC (7 years, 4 months ago) by beck
Branch: MAIN
Changes since 1.25: +2 -2 lines
Diff to previous 1.25 (colored)

Send the function codes from the error functions to the bit bucket,
as was done earlier in libssl. Thanks inoguchi@ for noticing
libssl had more reacharounds into this.
ok jsing@ inoguchi@

Revision 1.25 / (download) - annotate - [select for diffs], Thu Jan 26 12:44:52 2017 UTC (7 years, 4 months ago) by beck
Branch: MAIN
Changes since 1.24: +11 -6 lines
Diff to previous 1.24 (colored)

knf

Revision 1.24 / (download) - annotate - [select for diffs], Mon Jan 23 13:36:12 2017 UTC (7 years, 4 months ago) by jsing
Branch: MAIN
Changes since 1.23: +3 -3 lines
Diff to previous 1.23 (colored)

Split most of SSL_METHOD out into an internal variant, which is opaque.

Discussed with beck@

Revision 1.23 / (download) - annotate - [select for diffs], Mon Jan 23 04:55:26 2017 UTC (7 years, 4 months ago) by beck
Branch: MAIN
Changes since 1.22: +5 -3 lines
Diff to previous 1.22 (colored)

move the callbacks from ssl_st to internal
ok jsing@

Revision 1.22 / (download) - annotate - [select for diffs], Tue Sep 29 18:08:57 2015 UTC (8 years, 8 months ago) by deraadt
Branch: MAIN
Changes since 1.21: +7 -7 lines
Diff to previous 1.21 (colored)

convert "last_time" to a time_t, to handle beyond Y2038
ok guenther miod

Revision 1.21 / (download) - annotate - [select for diffs], Sun Nov 16 14:12:47 2014 UTC (9 years, 6 months ago) by jsing
Branch: MAIN
Changes since 1.20: +4 -3 lines
Diff to previous 1.20 (colored)

Sort and group includes.

Revision 1.20 / (download) - annotate - [select for diffs], Thu Jun 12 15:49:31 2014 UTC (10 years ago) by deraadt
Branch: MAIN
Changes since 1.19: +1 -1 lines
Diff to previous 1.19 (colored)

tags as requested by miod and tedu

Revision 1.19 / (download) - annotate - [select for diffs], Sun Jun 8 14:43:57 2014 UTC (10 years ago) by jsing
Branch: MAIN
Changes since 1.18: +16 -13 lines
Diff to previous 1.18 (colored)

Clean up BIO_free() handling in bio_ssl.c - BIO_free() has its own NULL
check, so do not duplicate it here. Make the error handling consistent
by always using 'goto err' rather than returning in certain cases. Also
add a missing BIO_free(ssl) in BIO_new_ssl_connect().

ok deraadt@

Revision 1.18 / (download) - annotate - [select for diffs], Fri May 30 14:30:50 2014 UTC (10 years ago) by tedu
Branch: MAIN
Changes since 1.17: +0 -17 lines
Diff to previous 1.17 (colored)

remove some #if 0 code. we don't need any more reminders that we're using
a not quite appropriate data structure. ok jsing

Revision 1.17 / (download) - annotate - [select for diffs], Wed May 28 13:03:24 2014 UTC (10 years ago) by jsing
Branch: MAIN
Changes since 1.16: +1 -2 lines
Diff to previous 1.16 (colored)

There is no point in checking if a pointer is non-NULL before calling free,
since free already does this for us. Also remove some pointless NULL
assignments, where the result from malloc(3) is immediately assigned to the
same variable.

ok miod@

Revision 1.16 / (download) - annotate - [select for diffs], Mon May 26 12:48:11 2014 UTC (10 years ago) by jsing
Branch: MAIN
Changes since 1.15: +9 -9 lines
Diff to previous 1.15 (colored)

Use C99 initialisers for BIO_METHOD.

Revision 1.15 / (download) - annotate - [select for diffs], Fri May 2 17:05:41 2014 UTC (10 years, 1 month ago) by jsing
Branch: MAIN
Changes since 1.14: +0 -4 lines
Diff to previous 1.14 (colored)

Nuke OPENSSL_NO_SOCK since any half sane operating system has sockets.

ok beck@

Revision 1.14 / (download) - annotate - [select for diffs], Mon Apr 21 16:34:43 2014 UTC (10 years, 1 month ago) by deraadt
Branch: MAIN
Changes since 1.13: +1 -2 lines
Diff to previous 1.13 (colored)

more malloc/realloc/calloc cleanups; ok beck kettenis

Revision 1.13 / (download) - annotate - [select for diffs], Sat Apr 19 16:50:47 2014 UTC (10 years, 1 month ago) by jsing
Branch: MAIN
Changes since 1.12: +20 -20 lines
Diff to previous 1.12 (colored)

More KNF.

Revision 1.12 / (download) - annotate - [select for diffs], Thu Apr 17 13:37:49 2014 UTC (10 years, 1 month ago) by beck
Branch: MAIN
Changes since 1.11: +2 -2 lines
Diff to previous 1.11 (colored)

Change library to use intrinsic memory allocation functions instead of
OPENSSL_foo wrappers. This changes:
OPENSSL_malloc->malloc
OPENSSL_free->free
OPENSSL_relloc->realloc
OPENSSL_freeFunc->free

Revision 1.11 / (download) - annotate - [select for diffs], Mon Apr 14 14:59:47 2014 UTC (10 years, 2 months ago) by jsing
Branch: MAIN
Changes since 1.10: +270 -275 lines
Diff to previous 1.10 (colored)

First pass at applying KNF to the OpenSSL code, which almost makes it
readable. This pass is whitespace only and can readily be verified using
tr and md5.

Revision 1.10 / (download) - annotate - [select for diffs], Sat Oct 13 21:25:14 2012 UTC (11 years, 8 months ago) by djm
Branch: MAIN
Changes since 1.9: +2 -0 lines
Diff to previous 1.9 (colored)

resolve conflicts

Revision 1.1.1.7 / (download) - annotate - [select for diffs] (vendor branch), Sat Oct 13 21:23:49 2012 UTC (11 years, 8 months ago) by djm
Changes since 1.1.1.6: +2 -0 lines
Diff to previous 1.1.1.6 (colored)

import OpenSSL-1.0.1c

Revision 1.9 / (download) - annotate - [select for diffs], Thu Nov 3 02:34:33 2011 UTC (12 years, 7 months ago) by djm
Branch: MAIN
Changes since 1.8: +4 -0 lines
Diff to previous 1.8 (colored)

openssl-1.0.0e: resolve conflicts

Revision 1.1.1.6 / (download) - annotate - [select for diffs] (vendor branch), Thu Nov 3 02:32:19 2011 UTC (12 years, 7 months ago) by djm
Changes since 1.1.1.5: +4 -0 lines
Diff to previous 1.1.1.5 (colored)

import OpenSSL 1.0.0e

Revision 1.8 / (download) - annotate - [select for diffs], Fri Oct 1 22:59:00 2010 UTC (13 years, 8 months ago) by djm
Branch: MAIN
Changes since 1.7: +11 -10 lines
Diff to previous 1.7 (colored)

resolve conflicts, fix local changes

Revision 1.1.1.5 / (download) - annotate - [select for diffs] (vendor branch), Fri Oct 1 22:54:16 2010 UTC (13 years, 8 months ago) by djm
Changes since 1.1.1.4: +11 -10 lines
Diff to previous 1.1.1.4 (colored)

import OpenSSL-1.0.0a

Revision 1.7 / (download) - annotate - [select for diffs], Sat Sep 6 12:17:53 2008 UTC (15 years, 9 months ago) by djm
Branch: MAIN
Changes since 1.6: +3 -3 lines
Diff to previous 1.6 (colored)

resolve conflicts

Revision 1.1.1.4 / (download) - annotate - [select for diffs] (vendor branch), Sat Sep 6 12:15:51 2008 UTC (15 years, 9 months ago) by djm
Changes since 1.1.1.3: +3 -3 lines
Diff to previous 1.1.1.3 (colored)

import of OpenSSL 0.9.8h

Revision 1.6 / (download) - annotate - [select for diffs], Mon May 12 02:18:39 2003 UTC (21 years, 1 month ago) by markus
Branch: MAIN
Changes since 1.5: +6 -0 lines
Diff to previous 1.5 (colored)

merge 0.9.7b with local changes; crank majors for libssl/libcrypto

Revision 1.1.1.3 / (download) - annotate - [select for diffs] (vendor branch), Sun May 11 21:36:34 2003 UTC (21 years, 1 month ago) by markus
Changes since 1.1.1.2: +6 -0 lines
Diff to previous 1.1.1.2 (colored)

import 0.9.7b (without idea and rc5)

Revision 1.1.1.2 / (download) - annotate - [select for diffs] (vendor branch), Thu Sep 5 12:51:30 2002 UTC (21 years, 9 months ago) by markus
Changes since 1.1.1.1: +61 -54 lines
Diff to previous 1.1.1.1 (colored)

import openssl-0.9.7-beta1

Revision 1.5 / (download) - annotate - [select for diffs], Wed May 15 02:29:20 2002 UTC (22 years, 1 month ago) by beck
Branch: MAIN
Changes since 1.4: +7 -1 lines
Diff to previous 1.4 (colored)

OpenSSL 0.9.7 stable 2002 05 08 merge

Revision 1.4 / (download) - annotate - [select for diffs], Fri Dec 15 02:58:36 2000 UTC (23 years, 6 months ago) by beck
Branch: MAIN
Changes since 1.3: +11 -11 lines
Diff to previous 1.3 (colored)

openssl-engine-0.9.6 merge

Revision 1.3 / (download) - annotate - [select for diffs], Sun Mar 19 11:13:25 2000 UTC (24 years, 2 months ago) by beck
Branch: MAIN
Changes since 1.2: +32 -1 lines
Diff to previous 1.2 (colored)

OpenSSL 0.9.5 merge

*warning* this bumps shared lib minors for libssl and libcrypto from 2.1 to 2.2
if you are using the ssl26 packages for ssh and other things to work you will
need to get new ones (see ~beck/libsslsnap/<arch>) on cvs or ~beck/src-patent.tar.gz on cvs

Revision 1.2 / (download) - annotate - [select for diffs], Wed Sep 29 04:37:25 1999 UTC (24 years, 8 months ago) by beck
Branch: MAIN
Changes since 1.1: +16 -46 lines
Diff to previous 1.1 (colored)

OpenSSL 0.9.4 merge

Revision 1.1.1.1 / (download) - annotate - [select for diffs] (vendor branch), Mon Oct 5 20:13:14 1998 UTC (25 years, 8 months ago) by ryker
Changes since 1.1: +0 -0 lines
Diff to previous 1.1 (colored)

Import of SSLeay-0.9.0b with RSA and IDEA stubbed + OpenBSD build
functionality for shared libs.

Note that routines such as sslv2_init and friends that use RSA will
not work due to lack of RSA in this library.

Needs documentation and help from ports for easy upgrade to full
functionality where legally possible.

Revision 1.1 / (download) - annotate - [select for diffs], Mon Oct 5 20:13:14 1998 UTC (25 years, 8 months ago) by ryker
Branch: MAIN

Initial revision

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.