History log of /openbsd-current/lib/libcrypto/evp/bio_md.c
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 1.22 09-Apr-2024 beck

Hide public symbols in evp.h

largely mechanically done by the guentherizer 9000

ok tb@


Revision tags: OPENBSD_7_4_BASE OPENBSD_7_5_BASE
# 1.21 07-Jul-2023 beck

Unbreak the namespace build after a broken mk.conf and tool misfire had
me aliasing symbols not in the headers I was procesing.

This unbreaks the namespace build so it will pass again

ok tb@


# 1.20 07-Jul-2023 beck

Hide symbols in hkdf, evp, err, ecdsa, and ec

(part 2 of commit)

ok jsing@


Revision tags: OPENBSD_7_3_BASE
# 1.19 26-Nov-2022 tb

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 tags: OPENBSD_7_1_BASE OPENBSD_7_2_BASE
# 1.18 14-Jan-2022 tb

Implement new-style OpenSSL BIO callbacks

This provides support for new-style BIO callbacks in
BIO_{read,write,gets,puts}() and a helper function to
work out whether it should call the new or the old
style callback. It also adds a few typedefs and minor
code cleanup as well as the BIO_{get,set}_callback_ex()

from jsing, ok tb


# 1.17 07-Jan-2022 tb

Add a new, mostly empty, bio_local.h and include it in the files
that will need it in the upcoming bump.

discussed with jsing


# 1.16 12-Dec-2021 tb

Include evp_locl.h where it will be needed once most structs from
evp.h will be moved to evp_locl.h in an upcoming bump.

ok inoguchi


Revision tags: OPENBSD_6_4_BASE OPENBSD_6_5_BASE OPENBSD_6_6_BASE OPENBSD_6_7_BASE OPENBSD_6_8_BASE OPENBSD_6_9_BASE OPENBSD_7_0_BASE
# 1.15 02-May-2018 tb

Add const qualifiers to return value of BIO_f_{base64,cipher,md}().

tested in bulk by sthen
ok jsing


Revision tags: OPENBSD_6_1_BASE OPENBSD_6_2_BASE OPENBSD_6_3_BASE
# 1.14 11-Jul-2014 jsing

Only import cryptlib.h in the four source files that actually need it.
Remove the openssl public includes from cryptlib.h and add a small number
of includes into the source files that actually need them. While here,
also sort/group/tidy the includes.

ok beck@ miod@


# 1.13 12-Jun-2014 deraadt

tags as requested by miod and tedu


# 1.12 03-May-2014 jsing

KNF.


# 1.11 27-Apr-2014 miod

Use C99 initializers for the various FOO_METHOD structs. More readable, and
avoid unreadable/unmaintainable constructs like that:

const EVP_PKEY_ASN1_METHOD cmac_asn1_meth =
{
EVP_PKEY_CMAC,
EVP_PKEY_CMAC,
0,

"CMAC",
"OpenSSL CMAC method",

0,0,0,0,

0,0,0,

cmac_size,
0,
0,0,0,0,0,0,0,

cmac_key_free,
0,
0,0
};

ok matthew@ deraadt@


# 1.10 13-Oct-2012 djm

resolve conflicts


# 1.9 01-Oct-2010 djm

resolve conflicts, fix local changes


# 1.8 09-Jan-2009 djm

resolve conflicts


# 1.7 06-Sep-2008 djm

resolve conflicts


# 1.6 29-Apr-2005 djm

resolve conflicts


# 1.5 15-May-2002 beck

OpenSSL 0.9.7 stable 2002 05 08 merge


# 1.4 15-Dec-2000 beck

openssl-engine-0.9.6 merge


# 1.3 19-Mar-2000 beck

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


# 1.2 29-Sep-1999 beck

OpenSSL 0.9.4 merge


# 1.1 05-Oct-1998 ryker

branches: 1.1.1;
Initial revision


# 1.21 07-Jul-2023 beck

Unbreak the namespace build after a broken mk.conf and tool misfire had
me aliasing symbols not in the headers I was procesing.

This unbreaks the namespace build so it will pass again

ok tb@


# 1.20 07-Jul-2023 beck

Hide symbols in hkdf, evp, err, ecdsa, and ec

(part 2 of commit)

ok jsing@


Revision tags: OPENBSD_7_3_BASE
# 1.19 26-Nov-2022 tb

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 tags: OPENBSD_7_1_BASE OPENBSD_7_2_BASE
# 1.18 14-Jan-2022 tb

Implement new-style OpenSSL BIO callbacks

This provides support for new-style BIO callbacks in
BIO_{read,write,gets,puts}() and a helper function to
work out whether it should call the new or the old
style callback. It also adds a few typedefs and minor
code cleanup as well as the BIO_{get,set}_callback_ex()

from jsing, ok tb


# 1.17 07-Jan-2022 tb

Add a new, mostly empty, bio_local.h and include it in the files
that will need it in the upcoming bump.

discussed with jsing


# 1.16 12-Dec-2021 tb

Include evp_locl.h where it will be needed once most structs from
evp.h will be moved to evp_locl.h in an upcoming bump.

ok inoguchi


Revision tags: OPENBSD_6_4_BASE OPENBSD_6_5_BASE OPENBSD_6_6_BASE OPENBSD_6_7_BASE OPENBSD_6_8_BASE OPENBSD_6_9_BASE OPENBSD_7_0_BASE
# 1.15 02-May-2018 tb

Add const qualifiers to return value of BIO_f_{base64,cipher,md}().

tested in bulk by sthen
ok jsing


Revision tags: OPENBSD_6_1_BASE OPENBSD_6_2_BASE OPENBSD_6_3_BASE
# 1.14 11-Jul-2014 jsing

Only import cryptlib.h in the four source files that actually need it.
Remove the openssl public includes from cryptlib.h and add a small number
of includes into the source files that actually need them. While here,
also sort/group/tidy the includes.

ok beck@ miod@


# 1.13 12-Jun-2014 deraadt

tags as requested by miod and tedu


# 1.12 03-May-2014 jsing

KNF.


# 1.11 27-Apr-2014 miod

Use C99 initializers for the various FOO_METHOD structs. More readable, and
avoid unreadable/unmaintainable constructs like that:

const EVP_PKEY_ASN1_METHOD cmac_asn1_meth =
{
EVP_PKEY_CMAC,
EVP_PKEY_CMAC,
0,

"CMAC",
"OpenSSL CMAC method",

0,0,0,0,

0,0,0,

cmac_size,
0,
0,0,0,0,0,0,0,

cmac_key_free,
0,
0,0
};

ok matthew@ deraadt@


# 1.10 13-Oct-2012 djm

resolve conflicts


# 1.9 01-Oct-2010 djm

resolve conflicts, fix local changes


# 1.8 09-Jan-2009 djm

resolve conflicts


# 1.7 06-Sep-2008 djm

resolve conflicts


# 1.6 29-Apr-2005 djm

resolve conflicts


# 1.5 15-May-2002 beck

OpenSSL 0.9.7 stable 2002 05 08 merge


# 1.4 15-Dec-2000 beck

openssl-engine-0.9.6 merge


# 1.3 19-Mar-2000 beck

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


# 1.2 29-Sep-1999 beck

OpenSSL 0.9.4 merge


# 1.1 05-Oct-1998 ryker

branches: 1.1.1;
Initial revision


# 1.19 26-Nov-2022 tb

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 tags: OPENBSD_7_1_BASE OPENBSD_7_2_BASE
# 1.18 14-Jan-2022 tb

Implement new-style OpenSSL BIO callbacks

This provides support for new-style BIO callbacks in
BIO_{read,write,gets,puts}() and a helper function to
work out whether it should call the new or the old
style callback. It also adds a few typedefs and minor
code cleanup as well as the BIO_{get,set}_callback_ex()

from jsing, ok tb


# 1.17 07-Jan-2022 tb

Add a new, mostly empty, bio_local.h and include it in the files
that will need it in the upcoming bump.

discussed with jsing


# 1.16 12-Dec-2021 tb

Include evp_locl.h where it will be needed once most structs from
evp.h will be moved to evp_locl.h in an upcoming bump.

ok inoguchi


Revision tags: OPENBSD_6_4_BASE OPENBSD_6_5_BASE OPENBSD_6_6_BASE OPENBSD_6_7_BASE OPENBSD_6_8_BASE OPENBSD_6_9_BASE OPENBSD_7_0_BASE
# 1.15 02-May-2018 tb

Add const qualifiers to return value of BIO_f_{base64,cipher,md}().

tested in bulk by sthen
ok jsing


Revision tags: OPENBSD_6_1_BASE OPENBSD_6_2_BASE OPENBSD_6_3_BASE
# 1.14 11-Jul-2014 jsing

Only import cryptlib.h in the four source files that actually need it.
Remove the openssl public includes from cryptlib.h and add a small number
of includes into the source files that actually need them. While here,
also sort/group/tidy the includes.

ok beck@ miod@


# 1.13 12-Jun-2014 deraadt

tags as requested by miod and tedu


# 1.12 03-May-2014 jsing

KNF.


# 1.11 27-Apr-2014 miod

Use C99 initializers for the various FOO_METHOD structs. More readable, and
avoid unreadable/unmaintainable constructs like that:

const EVP_PKEY_ASN1_METHOD cmac_asn1_meth =
{
EVP_PKEY_CMAC,
EVP_PKEY_CMAC,
0,

"CMAC",
"OpenSSL CMAC method",

0,0,0,0,

0,0,0,

cmac_size,
0,
0,0,0,0,0,0,0,

cmac_key_free,
0,
0,0
};

ok matthew@ deraadt@


# 1.10 13-Oct-2012 djm

resolve conflicts


# 1.9 01-Oct-2010 djm

resolve conflicts, fix local changes


# 1.8 09-Jan-2009 djm

resolve conflicts


# 1.7 06-Sep-2008 djm

resolve conflicts


# 1.6 29-Apr-2005 djm

resolve conflicts


# 1.5 15-May-2002 beck

OpenSSL 0.9.7 stable 2002 05 08 merge


# 1.4 15-Dec-2000 beck

openssl-engine-0.9.6 merge


# 1.3 19-Mar-2000 beck

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


# 1.2 29-Sep-1999 beck

OpenSSL 0.9.4 merge


# 1.1 05-Oct-1998 ryker

branches: 1.1.1;
Initial revision


# 1.18 14-Jan-2022 tb

Implement new-style OpenSSL BIO callbacks

This provides support for new-style BIO callbacks in
BIO_{read,write,gets,puts}() and a helper function to
work out whether it should call the new or the old
style callback. It also adds a few typedefs and minor
code cleanup as well as the BIO_{get,set}_callback_ex()

from jsing, ok tb


# 1.17 07-Jan-2022 tb

Add a new, mostly empty, bio_local.h and include it in the files
that will need it in the upcoming bump.

discussed with jsing


# 1.16 12-Dec-2021 tb

Include evp_locl.h where it will be needed once most structs from
evp.h will be moved to evp_locl.h in an upcoming bump.

ok inoguchi


Revision tags: OPENBSD_6_4_BASE OPENBSD_6_5_BASE OPENBSD_6_6_BASE OPENBSD_6_7_BASE OPENBSD_6_8_BASE OPENBSD_6_9_BASE OPENBSD_7_0_BASE
# 1.15 02-May-2018 tb

Add const qualifiers to return value of BIO_f_{base64,cipher,md}().

tested in bulk by sthen
ok jsing


Revision tags: OPENBSD_6_1_BASE OPENBSD_6_2_BASE OPENBSD_6_3_BASE
# 1.14 11-Jul-2014 jsing

Only import cryptlib.h in the four source files that actually need it.
Remove the openssl public includes from cryptlib.h and add a small number
of includes into the source files that actually need them. While here,
also sort/group/tidy the includes.

ok beck@ miod@


# 1.13 12-Jun-2014 deraadt

tags as requested by miod and tedu


# 1.12 03-May-2014 jsing

KNF.


# 1.11 27-Apr-2014 miod

Use C99 initializers for the various FOO_METHOD structs. More readable, and
avoid unreadable/unmaintainable constructs like that:

const EVP_PKEY_ASN1_METHOD cmac_asn1_meth =
{
EVP_PKEY_CMAC,
EVP_PKEY_CMAC,
0,

"CMAC",
"OpenSSL CMAC method",

0,0,0,0,

0,0,0,

cmac_size,
0,
0,0,0,0,0,0,0,

cmac_key_free,
0,
0,0
};

ok matthew@ deraadt@


# 1.10 13-Oct-2012 djm

resolve conflicts


# 1.9 01-Oct-2010 djm

resolve conflicts, fix local changes


# 1.8 09-Jan-2009 djm

resolve conflicts


# 1.7 06-Sep-2008 djm

resolve conflicts


# 1.6 29-Apr-2005 djm

resolve conflicts


# 1.5 15-May-2002 beck

OpenSSL 0.9.7 stable 2002 05 08 merge


# 1.4 15-Dec-2000 beck

openssl-engine-0.9.6 merge


# 1.3 19-Mar-2000 beck

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


# 1.2 29-Sep-1999 beck

OpenSSL 0.9.4 merge


# 1.1 05-Oct-1998 ryker

branches: 1.1.1;
Initial revision


# 1.17 07-Jan-2022 tb

Add a new, mostly empty, bio_local.h and include it in the files
that will need it in the upcoming bump.

discussed with jsing


# 1.16 12-Dec-2021 tb

Include evp_locl.h where it will be needed once most structs from
evp.h will be moved to evp_locl.h in an upcoming bump.

ok inoguchi


Revision tags: OPENBSD_6_4_BASE OPENBSD_6_5_BASE OPENBSD_6_6_BASE OPENBSD_6_7_BASE OPENBSD_6_8_BASE OPENBSD_6_9_BASE OPENBSD_7_0_BASE
# 1.15 02-May-2018 tb

Add const qualifiers to return value of BIO_f_{base64,cipher,md}().

tested in bulk by sthen
ok jsing


Revision tags: OPENBSD_6_1_BASE OPENBSD_6_2_BASE OPENBSD_6_3_BASE
# 1.14 11-Jul-2014 jsing

Only import cryptlib.h in the four source files that actually need it.
Remove the openssl public includes from cryptlib.h and add a small number
of includes into the source files that actually need them. While here,
also sort/group/tidy the includes.

ok beck@ miod@


# 1.13 12-Jun-2014 deraadt

tags as requested by miod and tedu


# 1.12 03-May-2014 jsing

KNF.


# 1.11 27-Apr-2014 miod

Use C99 initializers for the various FOO_METHOD structs. More readable, and
avoid unreadable/unmaintainable constructs like that:

const EVP_PKEY_ASN1_METHOD cmac_asn1_meth =
{
EVP_PKEY_CMAC,
EVP_PKEY_CMAC,
0,

"CMAC",
"OpenSSL CMAC method",

0,0,0,0,

0,0,0,

cmac_size,
0,
0,0,0,0,0,0,0,

cmac_key_free,
0,
0,0
};

ok matthew@ deraadt@


# 1.10 13-Oct-2012 djm

resolve conflicts


# 1.9 01-Oct-2010 djm

resolve conflicts, fix local changes


# 1.8 09-Jan-2009 djm

resolve conflicts


# 1.7 06-Sep-2008 djm

resolve conflicts


# 1.6 29-Apr-2005 djm

resolve conflicts


# 1.5 15-May-2002 beck

OpenSSL 0.9.7 stable 2002 05 08 merge


# 1.4 15-Dec-2000 beck

openssl-engine-0.9.6 merge


# 1.3 19-Mar-2000 beck

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


# 1.2 29-Sep-1999 beck

OpenSSL 0.9.4 merge


# 1.1 05-Oct-1998 ryker

branches: 1.1.1;
Initial revision


# 1.16 12-Dec-2021 tb

Include evp_locl.h where it will be needed once most structs from
evp.h will be moved to evp_locl.h in an upcoming bump.

ok inoguchi


Revision tags: OPENBSD_6_4_BASE OPENBSD_6_5_BASE OPENBSD_6_6_BASE OPENBSD_6_7_BASE OPENBSD_6_8_BASE OPENBSD_6_9_BASE OPENBSD_7_0_BASE
# 1.15 02-May-2018 tb

Add const qualifiers to return value of BIO_f_{base64,cipher,md}().

tested in bulk by sthen
ok jsing


Revision tags: OPENBSD_6_1_BASE OPENBSD_6_2_BASE OPENBSD_6_3_BASE
# 1.14 11-Jul-2014 jsing

Only import cryptlib.h in the four source files that actually need it.
Remove the openssl public includes from cryptlib.h and add a small number
of includes into the source files that actually need them. While here,
also sort/group/tidy the includes.

ok beck@ miod@


# 1.13 12-Jun-2014 deraadt

tags as requested by miod and tedu


# 1.12 03-May-2014 jsing

KNF.


# 1.11 27-Apr-2014 miod

Use C99 initializers for the various FOO_METHOD structs. More readable, and
avoid unreadable/unmaintainable constructs like that:

const EVP_PKEY_ASN1_METHOD cmac_asn1_meth =
{
EVP_PKEY_CMAC,
EVP_PKEY_CMAC,
0,

"CMAC",
"OpenSSL CMAC method",

0,0,0,0,

0,0,0,

cmac_size,
0,
0,0,0,0,0,0,0,

cmac_key_free,
0,
0,0
};

ok matthew@ deraadt@


# 1.10 13-Oct-2012 djm

resolve conflicts


# 1.9 01-Oct-2010 djm

resolve conflicts, fix local changes


# 1.8 09-Jan-2009 djm

resolve conflicts


# 1.7 06-Sep-2008 djm

resolve conflicts


# 1.6 29-Apr-2005 djm

resolve conflicts


# 1.5 15-May-2002 beck

OpenSSL 0.9.7 stable 2002 05 08 merge


# 1.4 15-Dec-2000 beck

openssl-engine-0.9.6 merge


# 1.3 19-Mar-2000 beck

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


# 1.2 29-Sep-1999 beck

OpenSSL 0.9.4 merge


# 1.1 05-Oct-1998 ryker

branches: 1.1.1;
Initial revision


# 1.15 02-May-2018 tb

Add const qualifiers to return value of BIO_f_{base64,cipher,md}().

tested in bulk by sthen
ok jsing


Revision tags: OPENBSD_6_1_BASE OPENBSD_6_2_BASE OPENBSD_6_3_BASE
# 1.14 11-Jul-2014 jsing

Only import cryptlib.h in the four source files that actually need it.
Remove the openssl public includes from cryptlib.h and add a small number
of includes into the source files that actually need them. While here,
also sort/group/tidy the includes.

ok beck@ miod@


# 1.13 12-Jun-2014 deraadt

tags as requested by miod and tedu


# 1.12 03-May-2014 jsing

KNF.


# 1.11 27-Apr-2014 miod

Use C99 initializers for the various FOO_METHOD structs. More readable, and
avoid unreadable/unmaintainable constructs like that:

const EVP_PKEY_ASN1_METHOD cmac_asn1_meth =
{
EVP_PKEY_CMAC,
EVP_PKEY_CMAC,
0,

"CMAC",
"OpenSSL CMAC method",

0,0,0,0,

0,0,0,

cmac_size,
0,
0,0,0,0,0,0,0,

cmac_key_free,
0,
0,0
};

ok matthew@ deraadt@


# 1.10 13-Oct-2012 djm

resolve conflicts


# 1.9 01-Oct-2010 djm

resolve conflicts, fix local changes


# 1.8 09-Jan-2009 djm

resolve conflicts


# 1.7 06-Sep-2008 djm

resolve conflicts


# 1.6 29-Apr-2005 djm

resolve conflicts


# 1.5 15-May-2002 beck

OpenSSL 0.9.7 stable 2002 05 08 merge


# 1.4 15-Dec-2000 beck

openssl-engine-0.9.6 merge


# 1.3 19-Mar-2000 beck

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


# 1.2 29-Sep-1999 beck

OpenSSL 0.9.4 merge


# 1.1 05-Oct-1998 ryker

branches: 1.1.1;
Initial revision


Revision tags: OPENBSD_6_1_BASE OPENBSD_6_2_BASE
# 1.14 11-Jul-2014 jsing

Only import cryptlib.h in the four source files that actually need it.
Remove the openssl public includes from cryptlib.h and add a small number
of includes into the source files that actually need them. While here,
also sort/group/tidy the includes.

ok beck@ miod@


# 1.13 12-Jun-2014 deraadt

tags as requested by miod and tedu


# 1.12 03-May-2014 jsing

KNF.


# 1.11 27-Apr-2014 miod

Use C99 initializers for the various FOO_METHOD structs. More readable, and
avoid unreadable/unmaintainable constructs like that:

const EVP_PKEY_ASN1_METHOD cmac_asn1_meth =
{
EVP_PKEY_CMAC,
EVP_PKEY_CMAC,
0,

"CMAC",
"OpenSSL CMAC method",

0,0,0,0,

0,0,0,

cmac_size,
0,
0,0,0,0,0,0,0,

cmac_key_free,
0,
0,0
};

ok matthew@ deraadt@


# 1.10 13-Oct-2012 djm

resolve conflicts


# 1.9 01-Oct-2010 djm

resolve conflicts, fix local changes


# 1.8 09-Jan-2009 djm

resolve conflicts


# 1.7 06-Sep-2008 djm

resolve conflicts


# 1.6 29-Apr-2005 djm

resolve conflicts


# 1.5 15-May-2002 beck

OpenSSL 0.9.7 stable 2002 05 08 merge


# 1.4 15-Dec-2000 beck

openssl-engine-0.9.6 merge


# 1.3 19-Mar-2000 beck

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


# 1.2 29-Sep-1999 beck

OpenSSL 0.9.4 merge


# 1.1 05-Oct-1998 ryker

branches: 1.1.1;
Initial revision