Stop using pem2.h.

Somewhere in the past 25 years, the circular dependency between err and pem
went away. Stop pulling in pem2.h and just use pem.h directly (pem2.h can
probably be removed at some point, but that remains for another day).

ok joshua@ tb@

Bye bye gost, bye, bye turdiness

ok beck

Remove some GOST relics

Unifdef OPENSSL_NO_ENGINE in libcrypto

This is mechanical apart from a few manual edits to avoid doubled empty
lines.

ok jsing

Drop DSO and define OPENSSL_NO_DSO

DSO and in particular dlopen() was used for dynamic engines, which we
removed a long time ago and for dynamic conf modules, which we removed
only very recently. Now remove this dangerous interface.

ok jsing

Remove ECDH errors

Much like the ECDSA errors, the ECDH errors have been unused for a
while. Garbage collect them.

ok jsing

Remove ecs_err.c

These error codes have been unused for a while, so the public API loading
them is pointless.

ok jsing

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

(part 2 of commit)

ok jsing@

Unifdef ZLIB

This has long been unused code and compilation with -DZLIB was broken
for a long time after BIO was made opaque.

ok jsing

Sort alphabetically so that future omissions will be easier to spot.

discussed with jsing

Add missing ERR_load_{COMP,CT,KDF}_strings()

ok beck

Load CMS error strings.

Bring in compatibility for OpenSSL 1.1 style init functions.

This adds OPENSSL_init_crypto and OPENSSL_init_ssl, as well
thread safety modifications for the existing LibreSSL init
functions. The initialization routines are called automatically
by the normal entry points into the library, as in newer OpenSSL

ok jsing@, nits by tb@ and deraadt@

unifdef OPENSSL_NO_CMS

Guenther has plans for OPENSSL_NO_CMS, so revert this for the moment.

get rid of OPENSSL_NO_CMS code we do not use.
ok miod@

get rid of OPENSSL_NO_COMP code we don't use.
jajaja miod@

GOST crypto algorithms (well, most of them), ported from the removed GOST
engine to regular EVP citizens, contributed by Dmitry Eremin-Solenikov;
libcrypto bits only for now.

This is a verbatim import of Dmitry's work, and does not compile in this
state; the forthcoming commits will address these issues.

None of the GOST code is enabled in libcrypto yet, for it still gets
compiled with OPENSSL_NO_GOST defined. However, the public header gost.h
will be installed.

Sort/group includes.

Remove JPAKE remnants - there is no jpake.h, so if OPENSSL_NO_JPAKE was
removed from opensslconf.h, this would no longer compile.

Explicitly include <openssl/opensslconf.h> in every file that references
an OPENSSL_NO_* define. This avoids relying on something else pulling it
in for us, plus it fixes several cases where the #ifndef OPENSSL_NO_XYZ is
never going to do anything, since OPENSSL_NO_XYZ will never defined, due
to the fact that opensslconf.h has not been included.

This also includes some miscellaneous sorting/tidying of headers.

tags as requested by miod and tedu

KNF.

remove FIPS mode support. people who require FIPS can buy something that
meets their needs, but dumping it in here only penalizes the rest of us.
ok beck deraadt

Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.

resolve conflicts

resolve conflicts, fix local changes

resolve conflicts

resolve conflicts

resolve conflicts

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

OpenSSL 0.9.7 stable 2002 05 08 merge

openssl-engine-0.9.6 merge

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

OpenSSL 0.9.4 merge

branches: 1.1.1;
Initial revision

Bye bye gost, bye, bye turdiness

ok beck

Remove some GOST relics

Unifdef OPENSSL_NO_ENGINE in libcrypto

This is mechanical apart from a few manual edits to avoid doubled empty
lines.

ok jsing

Drop DSO and define OPENSSL_NO_DSO

DSO and in particular dlopen() was used for dynamic engines, which we
removed a long time ago and for dynamic conf modules, which we removed
only very recently. Now remove this dangerous interface.

ok jsing

Remove ECDH errors

Much like the ECDSA errors, the ECDH errors have been unused for a
while. Garbage collect them.

ok jsing

Remove ecs_err.c

These error codes have been unused for a while, so the public API loading
them is pointless.

ok jsing

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

(part 2 of commit)

ok jsing@

Unifdef ZLIB

This has long been unused code and compilation with -DZLIB was broken
for a long time after BIO was made opaque.

ok jsing

Sort alphabetically so that future omissions will be easier to spot.

discussed with jsing

Add missing ERR_load_{COMP,CT,KDF}_strings()

ok beck

Load CMS error strings.

Bring in compatibility for OpenSSL 1.1 style init functions.

This adds OPENSSL_init_crypto and OPENSSL_init_ssl, as well
thread safety modifications for the existing LibreSSL init
functions. The initialization routines are called automatically
by the normal entry points into the library, as in newer OpenSSL

ok jsing@, nits by tb@ and deraadt@

unifdef OPENSSL_NO_CMS

Guenther has plans for OPENSSL_NO_CMS, so revert this for the moment.

get rid of OPENSSL_NO_CMS code we do not use.
ok miod@

get rid of OPENSSL_NO_COMP code we don't use.
jajaja miod@

GOST crypto algorithms (well, most of them), ported from the removed GOST
engine to regular EVP citizens, contributed by Dmitry Eremin-Solenikov;
libcrypto bits only for now.

This is a verbatim import of Dmitry's work, and does not compile in this
state; the forthcoming commits will address these issues.

None of the GOST code is enabled in libcrypto yet, for it still gets
compiled with OPENSSL_NO_GOST defined. However, the public header gost.h
will be installed.

Sort/group includes.

Remove JPAKE remnants - there is no jpake.h, so if OPENSSL_NO_JPAKE was
removed from opensslconf.h, this would no longer compile.

Explicitly include <openssl/opensslconf.h> in every file that references
an OPENSSL_NO_* define. This avoids relying on something else pulling it
in for us, plus it fixes several cases where the #ifndef OPENSSL_NO_XYZ is
never going to do anything, since OPENSSL_NO_XYZ will never defined, due
to the fact that opensslconf.h has not been included.

This also includes some miscellaneous sorting/tidying of headers.

tags as requested by miod and tedu

KNF.

remove FIPS mode support. people who require FIPS can buy something that
meets their needs, but dumping it in here only penalizes the rest of us.
ok beck deraadt

Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.

resolve conflicts

resolve conflicts, fix local changes

resolve conflicts

resolve conflicts

resolve conflicts

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

OpenSSL 0.9.7 stable 2002 05 08 merge

openssl-engine-0.9.6 merge

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

OpenSSL 0.9.4 merge

branches: 1.1.1;
Initial revision

Remove some GOST relics

Unifdef OPENSSL_NO_ENGINE in libcrypto

This is mechanical apart from a few manual edits to avoid doubled empty
lines.

ok jsing

Drop DSO and define OPENSSL_NO_DSO

DSO and in particular dlopen() was used for dynamic engines, which we
removed a long time ago and for dynamic conf modules, which we removed
only very recently. Now remove this dangerous interface.

ok jsing

Remove ECDH errors

Much like the ECDSA errors, the ECDH errors have been unused for a
while. Garbage collect them.

ok jsing

Remove ecs_err.c

These error codes have been unused for a while, so the public API loading
them is pointless.

ok jsing

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

(part 2 of commit)

ok jsing@

Unifdef ZLIB

This has long been unused code and compilation with -DZLIB was broken
for a long time after BIO was made opaque.

ok jsing

Sort alphabetically so that future omissions will be easier to spot.

discussed with jsing

Add missing ERR_load_{COMP,CT,KDF}_strings()

ok beck

Load CMS error strings.

Bring in compatibility for OpenSSL 1.1 style init functions.

This adds OPENSSL_init_crypto and OPENSSL_init_ssl, as well
thread safety modifications for the existing LibreSSL init
functions. The initialization routines are called automatically
by the normal entry points into the library, as in newer OpenSSL

ok jsing@, nits by tb@ and deraadt@

unifdef OPENSSL_NO_CMS

Guenther has plans for OPENSSL_NO_CMS, so revert this for the moment.

get rid of OPENSSL_NO_CMS code we do not use.
ok miod@

get rid of OPENSSL_NO_COMP code we don't use.
jajaja miod@

GOST crypto algorithms (well, most of them), ported from the removed GOST
engine to regular EVP citizens, contributed by Dmitry Eremin-Solenikov;
libcrypto bits only for now.

This is a verbatim import of Dmitry's work, and does not compile in this
state; the forthcoming commits will address these issues.

None of the GOST code is enabled in libcrypto yet, for it still gets
compiled with OPENSSL_NO_GOST defined. However, the public header gost.h
will be installed.

Sort/group includes.

Remove JPAKE remnants - there is no jpake.h, so if OPENSSL_NO_JPAKE was
removed from opensslconf.h, this would no longer compile.

Explicitly include <openssl/opensslconf.h> in every file that references
an OPENSSL_NO_* define. This avoids relying on something else pulling it
in for us, plus it fixes several cases where the #ifndef OPENSSL_NO_XYZ is
never going to do anything, since OPENSSL_NO_XYZ will never defined, due
to the fact that opensslconf.h has not been included.

This also includes some miscellaneous sorting/tidying of headers.

tags as requested by miod and tedu

KNF.

remove FIPS mode support. people who require FIPS can buy something that
meets their needs, but dumping it in here only penalizes the rest of us.
ok beck deraadt

Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.

resolve conflicts

resolve conflicts, fix local changes

resolve conflicts

resolve conflicts

resolve conflicts

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

OpenSSL 0.9.7 stable 2002 05 08 merge

openssl-engine-0.9.6 merge

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

OpenSSL 0.9.4 merge

branches: 1.1.1;
Initial revision

Unifdef OPENSSL_NO_ENGINE in libcrypto

This is mechanical apart from a few manual edits to avoid doubled empty
lines.

ok jsing

Drop DSO and define OPENSSL_NO_DSO

DSO and in particular dlopen() was used for dynamic engines, which we
removed a long time ago and for dynamic conf modules, which we removed
only very recently. Now remove this dangerous interface.

ok jsing

Remove ECDH errors

Much like the ECDSA errors, the ECDH errors have been unused for a
while. Garbage collect them.

ok jsing

Remove ecs_err.c

These error codes have been unused for a while, so the public API loading
them is pointless.

ok jsing

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

(part 2 of commit)

ok jsing@

Unifdef ZLIB

This has long been unused code and compilation with -DZLIB was broken
for a long time after BIO was made opaque.

ok jsing

Sort alphabetically so that future omissions will be easier to spot.

discussed with jsing

Add missing ERR_load_{COMP,CT,KDF}_strings()

ok beck

Load CMS error strings.

Bring in compatibility for OpenSSL 1.1 style init functions.

This adds OPENSSL_init_crypto and OPENSSL_init_ssl, as well
thread safety modifications for the existing LibreSSL init
functions. The initialization routines are called automatically
by the normal entry points into the library, as in newer OpenSSL

ok jsing@, nits by tb@ and deraadt@

unifdef OPENSSL_NO_CMS

Guenther has plans for OPENSSL_NO_CMS, so revert this for the moment.

get rid of OPENSSL_NO_CMS code we do not use.
ok miod@

get rid of OPENSSL_NO_COMP code we don't use.
jajaja miod@

GOST crypto algorithms (well, most of them), ported from the removed GOST
engine to regular EVP citizens, contributed by Dmitry Eremin-Solenikov;
libcrypto bits only for now.

This is a verbatim import of Dmitry's work, and does not compile in this
state; the forthcoming commits will address these issues.

None of the GOST code is enabled in libcrypto yet, for it still gets
compiled with OPENSSL_NO_GOST defined. However, the public header gost.h
will be installed.

Sort/group includes.

Remove JPAKE remnants - there is no jpake.h, so if OPENSSL_NO_JPAKE was
removed from opensslconf.h, this would no longer compile.

Explicitly include <openssl/opensslconf.h> in every file that references
an OPENSSL_NO_* define. This avoids relying on something else pulling it
in for us, plus it fixes several cases where the #ifndef OPENSSL_NO_XYZ is
never going to do anything, since OPENSSL_NO_XYZ will never defined, due
to the fact that opensslconf.h has not been included.

This also includes some miscellaneous sorting/tidying of headers.

tags as requested by miod and tedu

KNF.

remove FIPS mode support. people who require FIPS can buy something that
meets their needs, but dumping it in here only penalizes the rest of us.
ok beck deraadt

Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.

resolve conflicts

resolve conflicts, fix local changes

resolve conflicts

resolve conflicts

resolve conflicts

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

OpenSSL 0.9.7 stable 2002 05 08 merge

openssl-engine-0.9.6 merge

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

OpenSSL 0.9.4 merge

branches: 1.1.1;
Initial revision

Drop DSO and define OPENSSL_NO_DSO

DSO and in particular dlopen() was used for dynamic engines, which we
removed a long time ago and for dynamic conf modules, which we removed
only very recently. Now remove this dangerous interface.

ok jsing

Remove ECDH errors

Much like the ECDSA errors, the ECDH errors have been unused for a
while. Garbage collect them.

ok jsing

Remove ecs_err.c

These error codes have been unused for a while, so the public API loading
them is pointless.

ok jsing

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

(part 2 of commit)

ok jsing@

Unifdef ZLIB

This has long been unused code and compilation with -DZLIB was broken
for a long time after BIO was made opaque.

ok jsing

Sort alphabetically so that future omissions will be easier to spot.

discussed with jsing

Add missing ERR_load_{COMP,CT,KDF}_strings()

ok beck

Load CMS error strings.

Bring in compatibility for OpenSSL 1.1 style init functions.

This adds OPENSSL_init_crypto and OPENSSL_init_ssl, as well
thread safety modifications for the existing LibreSSL init
functions. The initialization routines are called automatically
by the normal entry points into the library, as in newer OpenSSL

ok jsing@, nits by tb@ and deraadt@

unifdef OPENSSL_NO_CMS

Guenther has plans for OPENSSL_NO_CMS, so revert this for the moment.

get rid of OPENSSL_NO_CMS code we do not use.
ok miod@

get rid of OPENSSL_NO_COMP code we don't use.
jajaja miod@

GOST crypto algorithms (well, most of them), ported from the removed GOST
engine to regular EVP citizens, contributed by Dmitry Eremin-Solenikov;
libcrypto bits only for now.

This is a verbatim import of Dmitry's work, and does not compile in this
state; the forthcoming commits will address these issues.

None of the GOST code is enabled in libcrypto yet, for it still gets
compiled with OPENSSL_NO_GOST defined. However, the public header gost.h
will be installed.

Sort/group includes.

Remove JPAKE remnants - there is no jpake.h, so if OPENSSL_NO_JPAKE was
removed from opensslconf.h, this would no longer compile.

Explicitly include <openssl/opensslconf.h> in every file that references
an OPENSSL_NO_* define. This avoids relying on something else pulling it
in for us, plus it fixes several cases where the #ifndef OPENSSL_NO_XYZ is
never going to do anything, since OPENSSL_NO_XYZ will never defined, due
to the fact that opensslconf.h has not been included.

This also includes some miscellaneous sorting/tidying of headers.

tags as requested by miod and tedu

KNF.

remove FIPS mode support. people who require FIPS can buy something that
meets their needs, but dumping it in here only penalizes the rest of us.
ok beck deraadt

Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.

resolve conflicts

resolve conflicts, fix local changes

resolve conflicts

resolve conflicts

resolve conflicts

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

OpenSSL 0.9.7 stable 2002 05 08 merge

openssl-engine-0.9.6 merge

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

OpenSSL 0.9.4 merge

branches: 1.1.1;
Initial revision

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

(part 2 of commit)

ok jsing@

Unifdef ZLIB

This has long been unused code and compilation with -DZLIB was broken
for a long time after BIO was made opaque.

ok jsing

Sort alphabetically so that future omissions will be easier to spot.

discussed with jsing

Add missing ERR_load_{COMP,CT,KDF}_strings()

ok beck

Load CMS error strings.

Bring in compatibility for OpenSSL 1.1 style init functions.

This adds OPENSSL_init_crypto and OPENSSL_init_ssl, as well
thread safety modifications for the existing LibreSSL init
functions. The initialization routines are called automatically
by the normal entry points into the library, as in newer OpenSSL

ok jsing@, nits by tb@ and deraadt@

unifdef OPENSSL_NO_CMS

Guenther has plans for OPENSSL_NO_CMS, so revert this for the moment.

get rid of OPENSSL_NO_CMS code we do not use.
ok miod@

get rid of OPENSSL_NO_COMP code we don't use.
jajaja miod@

GOST crypto algorithms (well, most of them), ported from the removed GOST
engine to regular EVP citizens, contributed by Dmitry Eremin-Solenikov;
libcrypto bits only for now.

This is a verbatim import of Dmitry's work, and does not compile in this
state; the forthcoming commits will address these issues.

None of the GOST code is enabled in libcrypto yet, for it still gets
compiled with OPENSSL_NO_GOST defined. However, the public header gost.h
will be installed.

Sort/group includes.

Remove JPAKE remnants - there is no jpake.h, so if OPENSSL_NO_JPAKE was
removed from opensslconf.h, this would no longer compile.

Explicitly include <openssl/opensslconf.h> in every file that references
an OPENSSL_NO_* define. This avoids relying on something else pulling it
in for us, plus it fixes several cases where the #ifndef OPENSSL_NO_XYZ is
never going to do anything, since OPENSSL_NO_XYZ will never defined, due
to the fact that opensslconf.h has not been included.

This also includes some miscellaneous sorting/tidying of headers.

tags as requested by miod and tedu

KNF.

remove FIPS mode support. people who require FIPS can buy something that
meets their needs, but dumping it in here only penalizes the rest of us.
ok beck deraadt

Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.

resolve conflicts

resolve conflicts, fix local changes

resolve conflicts

resolve conflicts

resolve conflicts

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

OpenSSL 0.9.7 stable 2002 05 08 merge

openssl-engine-0.9.6 merge

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

OpenSSL 0.9.4 merge

branches: 1.1.1;
Initial revision

Unifdef ZLIB

This has long been unused code and compilation with -DZLIB was broken
for a long time after BIO was made opaque.

ok jsing

Sort alphabetically so that future omissions will be easier to spot.

discussed with jsing

Add missing ERR_load_{COMP,CT,KDF}_strings()

ok beck

Load CMS error strings.

Bring in compatibility for OpenSSL 1.1 style init functions.

This adds OPENSSL_init_crypto and OPENSSL_init_ssl, as well
thread safety modifications for the existing LibreSSL init
functions. The initialization routines are called automatically
by the normal entry points into the library, as in newer OpenSSL

ok jsing@, nits by tb@ and deraadt@

unifdef OPENSSL_NO_CMS

Guenther has plans for OPENSSL_NO_CMS, so revert this for the moment.

get rid of OPENSSL_NO_CMS code we do not use.
ok miod@

get rid of OPENSSL_NO_COMP code we don't use.
jajaja miod@

GOST crypto algorithms (well, most of them), ported from the removed GOST
engine to regular EVP citizens, contributed by Dmitry Eremin-Solenikov;
libcrypto bits only for now.

This is a verbatim import of Dmitry's work, and does not compile in this
state; the forthcoming commits will address these issues.

None of the GOST code is enabled in libcrypto yet, for it still gets
compiled with OPENSSL_NO_GOST defined. However, the public header gost.h
will be installed.

Sort/group includes.

Remove JPAKE remnants - there is no jpake.h, so if OPENSSL_NO_JPAKE was
removed from opensslconf.h, this would no longer compile.

Explicitly include <openssl/opensslconf.h> in every file that references
an OPENSSL_NO_* define. This avoids relying on something else pulling it
in for us, plus it fixes several cases where the #ifndef OPENSSL_NO_XYZ is
never going to do anything, since OPENSSL_NO_XYZ will never defined, due
to the fact that opensslconf.h has not been included.

This also includes some miscellaneous sorting/tidying of headers.

tags as requested by miod and tedu

KNF.

remove FIPS mode support. people who require FIPS can buy something that
meets their needs, but dumping it in here only penalizes the rest of us.
ok beck deraadt

Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.

resolve conflicts

resolve conflicts, fix local changes

resolve conflicts

resolve conflicts

resolve conflicts

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

OpenSSL 0.9.7 stable 2002 05 08 merge

openssl-engine-0.9.6 merge

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

OpenSSL 0.9.4 merge

branches: 1.1.1;
Initial revision

Sort alphabetically so that future omissions will be easier to spot.

discussed with jsing

Add missing ERR_load_{COMP,CT,KDF}_strings()

ok beck

Load CMS error strings.

Bring in compatibility for OpenSSL 1.1 style init functions.

This adds OPENSSL_init_crypto and OPENSSL_init_ssl, as well
thread safety modifications for the existing LibreSSL init
functions. The initialization routines are called automatically
by the normal entry points into the library, as in newer OpenSSL

ok jsing@, nits by tb@ and deraadt@

unifdef OPENSSL_NO_CMS

Guenther has plans for OPENSSL_NO_CMS, so revert this for the moment.

get rid of OPENSSL_NO_CMS code we do not use.
ok miod@

get rid of OPENSSL_NO_COMP code we don't use.
jajaja miod@

GOST crypto algorithms (well, most of them), ported from the removed GOST
engine to regular EVP citizens, contributed by Dmitry Eremin-Solenikov;
libcrypto bits only for now.

This is a verbatim import of Dmitry's work, and does not compile in this
state; the forthcoming commits will address these issues.

None of the GOST code is enabled in libcrypto yet, for it still gets
compiled with OPENSSL_NO_GOST defined. However, the public header gost.h
will be installed.

Sort/group includes.

Remove JPAKE remnants - there is no jpake.h, so if OPENSSL_NO_JPAKE was
removed from opensslconf.h, this would no longer compile.

Explicitly include <openssl/opensslconf.h> in every file that references
an OPENSSL_NO_* define. This avoids relying on something else pulling it
in for us, plus it fixes several cases where the #ifndef OPENSSL_NO_XYZ is
never going to do anything, since OPENSSL_NO_XYZ will never defined, due
to the fact that opensslconf.h has not been included.

This also includes some miscellaneous sorting/tidying of headers.

tags as requested by miod and tedu

KNF.

remove FIPS mode support. people who require FIPS can buy something that
meets their needs, but dumping it in here only penalizes the rest of us.
ok beck deraadt

Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.

resolve conflicts

resolve conflicts, fix local changes

resolve conflicts

resolve conflicts

resolve conflicts

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

OpenSSL 0.9.7 stable 2002 05 08 merge

openssl-engine-0.9.6 merge

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

OpenSSL 0.9.4 merge

branches: 1.1.1;
Initial revision

Add missing ERR_load_{COMP,CT,KDF}_strings()

ok beck

Load CMS error strings.

Bring in compatibility for OpenSSL 1.1 style init functions.

This adds OPENSSL_init_crypto and OPENSSL_init_ssl, as well
thread safety modifications for the existing LibreSSL init
functions. The initialization routines are called automatically
by the normal entry points into the library, as in newer OpenSSL

ok jsing@, nits by tb@ and deraadt@

unifdef OPENSSL_NO_CMS

Guenther has plans for OPENSSL_NO_CMS, so revert this for the moment.

get rid of OPENSSL_NO_CMS code we do not use.
ok miod@

get rid of OPENSSL_NO_COMP code we don't use.
jajaja miod@

GOST crypto algorithms (well, most of them), ported from the removed GOST
engine to regular EVP citizens, contributed by Dmitry Eremin-Solenikov;
libcrypto bits only for now.

This is a verbatim import of Dmitry's work, and does not compile in this
state; the forthcoming commits will address these issues.

None of the GOST code is enabled in libcrypto yet, for it still gets
compiled with OPENSSL_NO_GOST defined. However, the public header gost.h
will be installed.

Sort/group includes.

Remove JPAKE remnants - there is no jpake.h, so if OPENSSL_NO_JPAKE was
removed from opensslconf.h, this would no longer compile.

Explicitly include <openssl/opensslconf.h> in every file that references
an OPENSSL_NO_* define. This avoids relying on something else pulling it
in for us, plus it fixes several cases where the #ifndef OPENSSL_NO_XYZ is
never going to do anything, since OPENSSL_NO_XYZ will never defined, due
to the fact that opensslconf.h has not been included.

This also includes some miscellaneous sorting/tidying of headers.

tags as requested by miod and tedu

KNF.

remove FIPS mode support. people who require FIPS can buy something that
meets their needs, but dumping it in here only penalizes the rest of us.
ok beck deraadt

Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.

resolve conflicts

resolve conflicts, fix local changes

resolve conflicts

resolve conflicts

resolve conflicts

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

OpenSSL 0.9.7 stable 2002 05 08 merge

openssl-engine-0.9.6 merge

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

OpenSSL 0.9.4 merge

branches: 1.1.1;
Initial revision

Load CMS error strings.

Bring in compatibility for OpenSSL 1.1 style init functions.

This adds OPENSSL_init_crypto and OPENSSL_init_ssl, as well
thread safety modifications for the existing LibreSSL init
functions. The initialization routines are called automatically
by the normal entry points into the library, as in newer OpenSSL

ok jsing@, nits by tb@ and deraadt@

unifdef OPENSSL_NO_CMS

Guenther has plans for OPENSSL_NO_CMS, so revert this for the moment.

get rid of OPENSSL_NO_CMS code we do not use.
ok miod@

get rid of OPENSSL_NO_COMP code we don't use.
jajaja miod@

GOST crypto algorithms (well, most of them), ported from the removed GOST
engine to regular EVP citizens, contributed by Dmitry Eremin-Solenikov;
libcrypto bits only for now.

This is a verbatim import of Dmitry's work, and does not compile in this
state; the forthcoming commits will address these issues.

None of the GOST code is enabled in libcrypto yet, for it still gets
compiled with OPENSSL_NO_GOST defined. However, the public header gost.h
will be installed.

Sort/group includes.

Remove JPAKE remnants - there is no jpake.h, so if OPENSSL_NO_JPAKE was
removed from opensslconf.h, this would no longer compile.

Explicitly include <openssl/opensslconf.h> in every file that references
an OPENSSL_NO_* define. This avoids relying on something else pulling it
in for us, plus it fixes several cases where the #ifndef OPENSSL_NO_XYZ is
never going to do anything, since OPENSSL_NO_XYZ will never defined, due
to the fact that opensslconf.h has not been included.

This also includes some miscellaneous sorting/tidying of headers.

tags as requested by miod and tedu

KNF.

remove FIPS mode support. people who require FIPS can buy something that
meets their needs, but dumping it in here only penalizes the rest of us.
ok beck deraadt

Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.

resolve conflicts

resolve conflicts, fix local changes

resolve conflicts

resolve conflicts

resolve conflicts

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

OpenSSL 0.9.7 stable 2002 05 08 merge

openssl-engine-0.9.6 merge

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

OpenSSL 0.9.4 merge

branches: 1.1.1;
Initial revision

Bring in compatibility for OpenSSL 1.1 style init functions.

This adds OPENSSL_init_crypto and OPENSSL_init_ssl, as well
thread safety modifications for the existing LibreSSL init
functions. The initialization routines are called automatically
by the normal entry points into the library, as in newer OpenSSL

ok jsing@, nits by tb@ and deraadt@

unifdef OPENSSL_NO_CMS

Guenther has plans for OPENSSL_NO_CMS, so revert this for the moment.

get rid of OPENSSL_NO_CMS code we do not use.
ok miod@

get rid of OPENSSL_NO_COMP code we don't use.
jajaja miod@

GOST crypto algorithms (well, most of them), ported from the removed GOST
engine to regular EVP citizens, contributed by Dmitry Eremin-Solenikov;
libcrypto bits only for now.

This is a verbatim import of Dmitry's work, and does not compile in this
state; the forthcoming commits will address these issues.

None of the GOST code is enabled in libcrypto yet, for it still gets
compiled with OPENSSL_NO_GOST defined. However, the public header gost.h
will be installed.

Sort/group includes.

Remove JPAKE remnants - there is no jpake.h, so if OPENSSL_NO_JPAKE was
removed from opensslconf.h, this would no longer compile.

Explicitly include <openssl/opensslconf.h> in every file that references
an OPENSSL_NO_* define. This avoids relying on something else pulling it
in for us, plus it fixes several cases where the #ifndef OPENSSL_NO_XYZ is
never going to do anything, since OPENSSL_NO_XYZ will never defined, due
to the fact that opensslconf.h has not been included.

This also includes some miscellaneous sorting/tidying of headers.

tags as requested by miod and tedu

KNF.

remove FIPS mode support. people who require FIPS can buy something that
meets their needs, but dumping it in here only penalizes the rest of us.
ok beck deraadt

Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.

resolve conflicts

resolve conflicts, fix local changes

resolve conflicts

resolve conflicts

resolve conflicts

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

OpenSSL 0.9.7 stable 2002 05 08 merge

openssl-engine-0.9.6 merge

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

OpenSSL 0.9.4 merge

branches: 1.1.1;
Initial revision

unifdef OPENSSL_NO_CMS

Guenther has plans for OPENSSL_NO_CMS, so revert this for the moment.

get rid of OPENSSL_NO_CMS code we do not use.
ok miod@

get rid of OPENSSL_NO_COMP code we don't use.
jajaja miod@

GOST crypto algorithms (well, most of them), ported from the removed GOST
engine to regular EVP citizens, contributed by Dmitry Eremin-Solenikov;
libcrypto bits only for now.

This is a verbatim import of Dmitry's work, and does not compile in this
state; the forthcoming commits will address these issues.

None of the GOST code is enabled in libcrypto yet, for it still gets
compiled with OPENSSL_NO_GOST defined. However, the public header gost.h
will be installed.

Sort/group includes.

Remove JPAKE remnants - there is no jpake.h, so if OPENSSL_NO_JPAKE was
removed from opensslconf.h, this would no longer compile.

Explicitly include <openssl/opensslconf.h> in every file that references
an OPENSSL_NO_* define. This avoids relying on something else pulling it
in for us, plus it fixes several cases where the #ifndef OPENSSL_NO_XYZ is
never going to do anything, since OPENSSL_NO_XYZ will never defined, due
to the fact that opensslconf.h has not been included.

This also includes some miscellaneous sorting/tidying of headers.

tags as requested by miod and tedu

KNF.

remove FIPS mode support. people who require FIPS can buy something that
meets their needs, but dumping it in here only penalizes the rest of us.
ok beck deraadt

Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.

resolve conflicts

resolve conflicts, fix local changes

resolve conflicts

resolve conflicts

resolve conflicts

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

OpenSSL 0.9.7 stable 2002 05 08 merge

openssl-engine-0.9.6 merge

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

OpenSSL 0.9.4 merge

branches: 1.1.1;
Initial revision