History log of /openbsd-current/lib/libcrypto/ocsp/ocsp_lib.c
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
# 1.26 08-Jul-2023 beck

Hide symbols in cast, idea, and ocsp

ok tb@


Revision tags: OPENBSD_7_1_BASE OPENBSD_7_2_BASE OPENBSD_7_3_BASE
# 1.25 22-Jan-2022 inoguchi

X509_GET_PUBKEY(3) return value check in libcrypto

ok beck@ tb@


# 1.24 07-Jan-2022 tb

Add an essentially empty ocsp_local.h and include it in the files
that will need it in the upcoming bump.

discussed with jsing


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.23 24-Aug-2018 tb

Add const to two arguments of OCSP_cert_to_id()

tested in a bulk by sthen
ok jsing


# 1.22 13-May-2018 tb

Add const qualifier to the path and url{,s} parameters of
OCSP_crlID_new(3), OCSP_parse_url(3), OCSP_sendreq_bio(3),
OCSP_sendreq_new(3), and OCSP_url_svcloc_new(3).

tested in a bulk build by sthen
ok jsing (as part of a larger diff)


# 1.21 13-May-2018 tb

Add const qualifier to the X509_NAME *, ASN1_BIT_STRING *, and
ASN1_INTEGER * arguments of OCSP_cert_id_new(3).

tested in a bulk build by sthen
ok jsing (as part of a larger diff)


Revision tags: OPENBSD_6_1_BASE OPENBSD_6_2_BASE OPENBSD_6_3_BASE
# 1.20 29-Jan-2017 beck

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@


# 1.19 21-Dec-2016 beck

rewrite OCSP_parse_url to be sligthly less nasty and not have one byte buffer overreads
helpful nitpicking and ok tb@ miod@


# 1.18 10-Feb-2015 jsing

Manually expand ASN1_ITEM_rptr macros that should have been expanded with
the IMPLEMENT_ASN1_DUP_FUNCTION macro.


# 1.17 10-Feb-2015 jsing

Expand the IMPLEMENT_ASN1_DUP_FUNCTION macro so that the code is visible
and functions can be readily located.

Change has been scripted and the generated assembly only differs by changes
to line numbers.

Discussed with beck@ miod@ tedu@


# 1.16 18-Oct-2014 jsing

None of these need to include <openssl/rand.h>


# 1.15 13-Jul-2014 beck

The bell tolls for BUF_strdup - Start the migration to using
intrinsics. This is the easy ones, a few left to check one at
a time.
ok miod@ deraadt@


# 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 10-Jul-2014 jsing

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.


# 1.12 10-Jul-2014 jsing

Stop including standard headers via cryptlib.h - pull in the headers that
are needed in the source files that actually require them.

ok beck@ miod@


# 1.11 09-Jul-2014 tedu

reset host, port, path to null after freeing so the caller doesn't
accidentally free them again. actually a bug in the caller and (hey hey)
apps/ocsp.c has exactly that bug, but it's easier/safer to fix here.


# 1.10 12-Jun-2014 deraadt

tags as requested by miod and tedu


# 1.9 18-May-2014 jsing

More KNF.


# 1.8 17-May-2014 miod

KNF


# 1.7 17-Apr-2014 beck

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


# 1.6 13-Oct-2012 djm

resolve conflicts


# 1.5 03-Nov-2011 djm

openssl-1.0.0e: resolve conflicts


# 1.4 01-Oct-2010 djm

resolve conflicts, fix local changes


# 1.3 06-Sep-2008 djm

resolve conflicts


# 1.2 08-Apr-2004 markus

merge 0.9.7d


# 1.1 15-May-2002 beck

branches: 1.1.1;
OpenSSL 0.9.7 stable 2002 05 08 merge


# 1.25 22-Jan-2022 inoguchi

X509_GET_PUBKEY(3) return value check in libcrypto

ok beck@ tb@


# 1.24 07-Jan-2022 tb

Add an essentially empty ocsp_local.h and include it in the files
that will need it in the upcoming bump.

discussed with jsing


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.23 24-Aug-2018 tb

Add const to two arguments of OCSP_cert_to_id()

tested in a bulk by sthen
ok jsing


# 1.22 13-May-2018 tb

Add const qualifier to the path and url{,s} parameters of
OCSP_crlID_new(3), OCSP_parse_url(3), OCSP_sendreq_bio(3),
OCSP_sendreq_new(3), and OCSP_url_svcloc_new(3).

tested in a bulk build by sthen
ok jsing (as part of a larger diff)


# 1.21 13-May-2018 tb

Add const qualifier to the X509_NAME *, ASN1_BIT_STRING *, and
ASN1_INTEGER * arguments of OCSP_cert_id_new(3).

tested in a bulk build by sthen
ok jsing (as part of a larger diff)


Revision tags: OPENBSD_6_1_BASE OPENBSD_6_2_BASE OPENBSD_6_3_BASE
# 1.20 29-Jan-2017 beck

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@


# 1.19 21-Dec-2016 beck

rewrite OCSP_parse_url to be sligthly less nasty and not have one byte buffer overreads
helpful nitpicking and ok tb@ miod@


# 1.18 10-Feb-2015 jsing

Manually expand ASN1_ITEM_rptr macros that should have been expanded with
the IMPLEMENT_ASN1_DUP_FUNCTION macro.


# 1.17 10-Feb-2015 jsing

Expand the IMPLEMENT_ASN1_DUP_FUNCTION macro so that the code is visible
and functions can be readily located.

Change has been scripted and the generated assembly only differs by changes
to line numbers.

Discussed with beck@ miod@ tedu@


# 1.16 18-Oct-2014 jsing

None of these need to include <openssl/rand.h>


# 1.15 13-Jul-2014 beck

The bell tolls for BUF_strdup - Start the migration to using
intrinsics. This is the easy ones, a few left to check one at
a time.
ok miod@ deraadt@


# 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 10-Jul-2014 jsing

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.


# 1.12 10-Jul-2014 jsing

Stop including standard headers via cryptlib.h - pull in the headers that
are needed in the source files that actually require them.

ok beck@ miod@


# 1.11 09-Jul-2014 tedu

reset host, port, path to null after freeing so the caller doesn't
accidentally free them again. actually a bug in the caller and (hey hey)
apps/ocsp.c has exactly that bug, but it's easier/safer to fix here.


# 1.10 12-Jun-2014 deraadt

tags as requested by miod and tedu


# 1.9 18-May-2014 jsing

More KNF.


# 1.8 17-May-2014 miod

KNF


# 1.7 17-Apr-2014 beck

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


# 1.6 13-Oct-2012 djm

resolve conflicts


# 1.5 03-Nov-2011 djm

openssl-1.0.0e: resolve conflicts


# 1.4 01-Oct-2010 djm

resolve conflicts, fix local changes


# 1.3 06-Sep-2008 djm

resolve conflicts


# 1.2 08-Apr-2004 markus

merge 0.9.7d


# 1.1 15-May-2002 beck

branches: 1.1.1;
OpenSSL 0.9.7 stable 2002 05 08 merge


# 1.24 07-Jan-2022 tb

Add an essentially empty ocsp_local.h and include it in the files
that will need it in the upcoming bump.

discussed with jsing


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.23 24-Aug-2018 tb

Add const to two arguments of OCSP_cert_to_id()

tested in a bulk by sthen
ok jsing


# 1.22 13-May-2018 tb

Add const qualifier to the path and url{,s} parameters of
OCSP_crlID_new(3), OCSP_parse_url(3), OCSP_sendreq_bio(3),
OCSP_sendreq_new(3), and OCSP_url_svcloc_new(3).

tested in a bulk build by sthen
ok jsing (as part of a larger diff)


# 1.21 13-May-2018 tb

Add const qualifier to the X509_NAME *, ASN1_BIT_STRING *, and
ASN1_INTEGER * arguments of OCSP_cert_id_new(3).

tested in a bulk build by sthen
ok jsing (as part of a larger diff)


Revision tags: OPENBSD_6_1_BASE OPENBSD_6_2_BASE OPENBSD_6_3_BASE
# 1.20 29-Jan-2017 beck

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@


# 1.19 21-Dec-2016 beck

rewrite OCSP_parse_url to be sligthly less nasty and not have one byte buffer overreads
helpful nitpicking and ok tb@ miod@


# 1.18 10-Feb-2015 jsing

Manually expand ASN1_ITEM_rptr macros that should have been expanded with
the IMPLEMENT_ASN1_DUP_FUNCTION macro.


# 1.17 10-Feb-2015 jsing

Expand the IMPLEMENT_ASN1_DUP_FUNCTION macro so that the code is visible
and functions can be readily located.

Change has been scripted and the generated assembly only differs by changes
to line numbers.

Discussed with beck@ miod@ tedu@


# 1.16 18-Oct-2014 jsing

None of these need to include <openssl/rand.h>


# 1.15 13-Jul-2014 beck

The bell tolls for BUF_strdup - Start the migration to using
intrinsics. This is the easy ones, a few left to check one at
a time.
ok miod@ deraadt@


# 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 10-Jul-2014 jsing

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.


# 1.12 10-Jul-2014 jsing

Stop including standard headers via cryptlib.h - pull in the headers that
are needed in the source files that actually require them.

ok beck@ miod@


# 1.11 09-Jul-2014 tedu

reset host, port, path to null after freeing so the caller doesn't
accidentally free them again. actually a bug in the caller and (hey hey)
apps/ocsp.c has exactly that bug, but it's easier/safer to fix here.


# 1.10 12-Jun-2014 deraadt

tags as requested by miod and tedu


# 1.9 18-May-2014 jsing

More KNF.


# 1.8 17-May-2014 miod

KNF


# 1.7 17-Apr-2014 beck

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


# 1.6 13-Oct-2012 djm

resolve conflicts


# 1.5 03-Nov-2011 djm

openssl-1.0.0e: resolve conflicts


# 1.4 01-Oct-2010 djm

resolve conflicts, fix local changes


# 1.3 06-Sep-2008 djm

resolve conflicts


# 1.2 08-Apr-2004 markus

merge 0.9.7d


# 1.1 15-May-2002 beck

branches: 1.1.1;
OpenSSL 0.9.7 stable 2002 05 08 merge


# 1.23 24-Aug-2018 tb

Add const to two arguments of OCSP_cert_to_id()

tested in a bulk by sthen
ok jsing


# 1.22 13-May-2018 tb

Add const qualifier to the path and url{,s} parameters of
OCSP_crlID_new(3), OCSP_parse_url(3), OCSP_sendreq_bio(3),
OCSP_sendreq_new(3), and OCSP_url_svcloc_new(3).

tested in a bulk build by sthen
ok jsing (as part of a larger diff)


# 1.21 13-May-2018 tb

Add const qualifier to the X509_NAME *, ASN1_BIT_STRING *, and
ASN1_INTEGER * arguments of OCSP_cert_id_new(3).

tested in a bulk build by sthen
ok jsing (as part of a larger diff)


Revision tags: OPENBSD_6_1_BASE OPENBSD_6_2_BASE OPENBSD_6_3_BASE
# 1.20 29-Jan-2017 beck

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@


# 1.19 21-Dec-2016 beck

rewrite OCSP_parse_url to be sligthly less nasty and not have one byte buffer overreads
helpful nitpicking and ok tb@ miod@


# 1.18 10-Feb-2015 jsing

Manually expand ASN1_ITEM_rptr macros that should have been expanded with
the IMPLEMENT_ASN1_DUP_FUNCTION macro.


# 1.17 10-Feb-2015 jsing

Expand the IMPLEMENT_ASN1_DUP_FUNCTION macro so that the code is visible
and functions can be readily located.

Change has been scripted and the generated assembly only differs by changes
to line numbers.

Discussed with beck@ miod@ tedu@


# 1.16 18-Oct-2014 jsing

None of these need to include <openssl/rand.h>


# 1.15 13-Jul-2014 beck

The bell tolls for BUF_strdup - Start the migration to using
intrinsics. This is the easy ones, a few left to check one at
a time.
ok miod@ deraadt@


# 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 10-Jul-2014 jsing

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.


# 1.12 10-Jul-2014 jsing

Stop including standard headers via cryptlib.h - pull in the headers that
are needed in the source files that actually require them.

ok beck@ miod@


# 1.11 09-Jul-2014 tedu

reset host, port, path to null after freeing so the caller doesn't
accidentally free them again. actually a bug in the caller and (hey hey)
apps/ocsp.c has exactly that bug, but it's easier/safer to fix here.


# 1.10 12-Jun-2014 deraadt

tags as requested by miod and tedu


# 1.9 18-May-2014 jsing

More KNF.


# 1.8 17-May-2014 miod

KNF


# 1.7 17-Apr-2014 beck

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


# 1.6 13-Oct-2012 djm

resolve conflicts


# 1.5 03-Nov-2011 djm

openssl-1.0.0e: resolve conflicts


# 1.4 01-Oct-2010 djm

resolve conflicts, fix local changes


# 1.3 06-Sep-2008 djm

resolve conflicts


# 1.2 08-Apr-2004 markus

merge 0.9.7d


# 1.1 15-May-2002 beck

branches: 1.1.1;
OpenSSL 0.9.7 stable 2002 05 08 merge


# 1.22 13-May-2018 tb

Add const qualifier to the path and url{,s} parameters of
OCSP_crlID_new(3), OCSP_parse_url(3), OCSP_sendreq_bio(3),
OCSP_sendreq_new(3), and OCSP_url_svcloc_new(3).

tested in a bulk build by sthen
ok jsing (as part of a larger diff)


# 1.21 13-May-2018 tb

Add const qualifier to the X509_NAME *, ASN1_BIT_STRING *, and
ASN1_INTEGER * arguments of OCSP_cert_id_new(3).

tested in a bulk build by sthen
ok jsing (as part of a larger diff)


Revision tags: OPENBSD_6_1_BASE OPENBSD_6_2_BASE OPENBSD_6_3_BASE
# 1.20 29-Jan-2017 beck

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@


# 1.19 21-Dec-2016 beck

rewrite OCSP_parse_url to be sligthly less nasty and not have one byte buffer overreads
helpful nitpicking and ok tb@ miod@


# 1.18 10-Feb-2015 jsing

Manually expand ASN1_ITEM_rptr macros that should have been expanded with
the IMPLEMENT_ASN1_DUP_FUNCTION macro.


# 1.17 10-Feb-2015 jsing

Expand the IMPLEMENT_ASN1_DUP_FUNCTION macro so that the code is visible
and functions can be readily located.

Change has been scripted and the generated assembly only differs by changes
to line numbers.

Discussed with beck@ miod@ tedu@


# 1.16 18-Oct-2014 jsing

None of these need to include <openssl/rand.h>


# 1.15 13-Jul-2014 beck

The bell tolls for BUF_strdup - Start the migration to using
intrinsics. This is the easy ones, a few left to check one at
a time.
ok miod@ deraadt@


# 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 10-Jul-2014 jsing

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.


# 1.12 10-Jul-2014 jsing

Stop including standard headers via cryptlib.h - pull in the headers that
are needed in the source files that actually require them.

ok beck@ miod@


# 1.11 09-Jul-2014 tedu

reset host, port, path to null after freeing so the caller doesn't
accidentally free them again. actually a bug in the caller and (hey hey)
apps/ocsp.c has exactly that bug, but it's easier/safer to fix here.


# 1.10 12-Jun-2014 deraadt

tags as requested by miod and tedu


# 1.9 18-May-2014 jsing

More KNF.


# 1.8 17-May-2014 miod

KNF


# 1.7 17-Apr-2014 beck

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


# 1.6 13-Oct-2012 djm

resolve conflicts


# 1.5 03-Nov-2011 djm

openssl-1.0.0e: resolve conflicts


# 1.4 01-Oct-2010 djm

resolve conflicts, fix local changes


# 1.3 06-Sep-2008 djm

resolve conflicts


# 1.2 08-Apr-2004 markus

merge 0.9.7d


# 1.1 15-May-2002 beck

branches: 1.1.1;
OpenSSL 0.9.7 stable 2002 05 08 merge


Revision tags: OPENBSD_6_1_BASE OPENBSD_6_2_BASE
# 1.20 29-Jan-2017 beck

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@


# 1.19 21-Dec-2016 beck

rewrite OCSP_parse_url to be sligthly less nasty and not have one byte buffer overreads
helpful nitpicking and ok tb@ miod@


# 1.18 10-Feb-2015 jsing

Manually expand ASN1_ITEM_rptr macros that should have been expanded with
the IMPLEMENT_ASN1_DUP_FUNCTION macro.


# 1.17 10-Feb-2015 jsing

Expand the IMPLEMENT_ASN1_DUP_FUNCTION macro so that the code is visible
and functions can be readily located.

Change has been scripted and the generated assembly only differs by changes
to line numbers.

Discussed with beck@ miod@ tedu@


# 1.16 18-Oct-2014 jsing

None of these need to include <openssl/rand.h>


# 1.15 13-Jul-2014 beck

The bell tolls for BUF_strdup - Start the migration to using
intrinsics. This is the easy ones, a few left to check one at
a time.
ok miod@ deraadt@


# 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 10-Jul-2014 jsing

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.


# 1.12 10-Jul-2014 jsing

Stop including standard headers via cryptlib.h - pull in the headers that
are needed in the source files that actually require them.

ok beck@ miod@


# 1.11 09-Jul-2014 tedu

reset host, port, path to null after freeing so the caller doesn't
accidentally free them again. actually a bug in the caller and (hey hey)
apps/ocsp.c has exactly that bug, but it's easier/safer to fix here.


# 1.10 12-Jun-2014 deraadt

tags as requested by miod and tedu


# 1.9 18-May-2014 jsing

More KNF.


# 1.8 17-May-2014 miod

KNF


# 1.7 17-Apr-2014 beck

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


# 1.6 13-Oct-2012 djm

resolve conflicts


# 1.5 03-Nov-2011 djm

openssl-1.0.0e: resolve conflicts


# 1.4 01-Oct-2010 djm

resolve conflicts, fix local changes


# 1.3 06-Sep-2008 djm

resolve conflicts


# 1.2 08-Apr-2004 markus

merge 0.9.7d


# 1.1 15-May-2002 beck

branches: 1.1.1;
OpenSSL 0.9.7 stable 2002 05 08 merge