oweals/openssl.git
22 years agoIt makes more sense to refer to specific function manuals than the concept
Richard Levitte [Wed, 25 Sep 2002 13:11:16 +0000 (13:11 +0000)]
It makes more sense to refer to specific function manuals than the concept
manual when the specific function is refered to in the current manual text.
This correction was originally introduced in OpenBSD's tracking of OpenSSL.

22 years agoIncorrect argument order to memset()
Richard Levitte [Wed, 25 Sep 2002 12:52:23 +0000 (12:52 +0000)]
Incorrect argument order to memset()

22 years agoMissing ;
Richard Levitte [Wed, 25 Sep 2002 12:49:45 +0000 (12:49 +0000)]
Missing ;

22 years ago-elapsed is also useful when using gettimeofday
Richard Levitte [Wed, 25 Sep 2002 12:42:04 +0000 (12:42 +0000)]
-elapsed is also useful when using gettimeofday

22 years agoreally fix race condition
Bodo Möller [Mon, 23 Sep 2002 14:28:12 +0000 (14:28 +0000)]
really fix race condition

PR: 262

22 years agoas in head
Ulf Möller [Sun, 22 Sep 2002 08:51:33 +0000 (08:51 +0000)]
as in head

22 years agoas in main
Ulf Möller [Sun, 22 Sep 2002 08:45:22 +0000 (08:45 +0000)]
as in main

22 years agoThis commit was manufactured by cvs2svn to create branch
cvs2svn [Sun, 22 Sep 2002 08:44:06 +0000 (08:44 +0000)]
This commit was manufactured by cvs2svn to create branch
'OpenSSL_0_9_7-stable'.

22 years agomake files didn't work on case insensitive filesystems
Ulf Möller [Sun, 22 Sep 2002 08:44:03 +0000 (08:44 +0000)]
make files didn't work on case insensitive filesystems

22 years agothere is no minimum length for session IDs
Bodo Möller [Fri, 20 Sep 2002 08:37:13 +0000 (08:37 +0000)]
there is no minimum length for session IDs
PR: 274

fix race condition
PR: 262

22 years agothere is no minimum length for session IDs
Bodo Möller [Thu, 19 Sep 2002 11:44:07 +0000 (11:44 +0000)]
there is no minimum length for session IDs

PR: 274

22 years agofix race condition
Bodo Möller [Thu, 19 Sep 2002 11:26:45 +0000 (11:26 +0000)]
fix race condition

PR: 262

22 years agomake sure 'neg' flag (which does not really matter for GF(2^m), but
Bodo Möller [Mon, 16 Sep 2002 13:52:48 +0000 (13:52 +0000)]
make sure 'neg' flag (which does not really matter for GF(2^m), but
could cause confusion for ECDSA) is set to zero

Submitted by: Sheueling Chang

22 years agoadd URL for Internet Draft
Bodo Möller [Mon, 16 Sep 2002 13:45:14 +0000 (13:45 +0000)]
add URL for Internet Draft

22 years ago1. switch from "-newkey ecdsa:..." to "-newkey ec:..."
Bodo Möller [Tue, 10 Sep 2002 07:36:52 +0000 (07:36 +0000)]
1. switch from "-newkey ecdsa:..." to "-newkey ec:..."
2. automatically create required sub-directories

Submitted by: Vipul Gupta <Vipul.Gupta@sun.com>

22 years agoLet 'openssl req' fail if an argument to '-newkey' is not
Bodo Möller [Tue, 10 Sep 2002 07:34:45 +0000 (07:34 +0000)]
Let 'openssl req' fail if an argument to '-newkey' is not
recognized instead of using RSA as a default.

22 years agoReally fix PKCS7_set_detached this time...
Dr. Stephen Henson [Sun, 8 Sep 2002 16:25:55 +0000 (16:25 +0000)]
Really fix PKCS7_set_detached this time...

22 years agoReally fix PKCS7_set_detached this time...
Dr. Stephen Henson [Sun, 8 Sep 2002 16:25:03 +0000 (16:25 +0000)]
Really fix PKCS7_set_detached this time...

22 years agoFix typos in PKCS#12 ASN1 code.
Dr. Stephen Henson [Sat, 7 Sep 2002 22:59:34 +0000 (22:59 +0000)]
Fix typos in PKCS#12 ASN1 code.

Make PKCS7_set_detached work again.

22 years agoFix typos in PKCS#12 ASN1 code.
Dr. Stephen Henson [Sat, 7 Sep 2002 22:57:49 +0000 (22:57 +0000)]
Fix typos in PKCS#12 ASN1 code.

Make PKCS7_set_detached work again.

22 years agoConsequently use term URI instead of URL
Lutz Jänicke [Thu, 5 Sep 2002 07:52:05 +0000 (07:52 +0000)]
Consequently use term URI instead of URL
Submitted by: TJ Saunders <tj@castaglia.org>
Reviewed by:
PR: 268

22 years agoConsequently use term URI instead of URL
Lutz Jänicke [Thu, 5 Sep 2002 07:51:23 +0000 (07:51 +0000)]
Consequently use term URI instead of URL
Submitted by: TJ Saunders <tj@castaglia.org>
Reviewed by:
PR: 268

22 years agomake update
Dr. Stephen Henson [Tue, 3 Sep 2002 00:09:45 +0000 (00:09 +0000)]
make update

22 years ago-nameopt fix has been moved to 0.9.7
Bodo Möller [Mon, 2 Sep 2002 14:22:51 +0000 (14:22 +0000)]
-nameopt fix has been moved to 0.9.7

22 years agomention EC_get_builtin_curves()
Bodo Möller [Mon, 2 Sep 2002 07:12:08 +0000 (07:12 +0000)]
mention EC_get_builtin_curves()

22 years agochange API for looking at the internal curve list
Bodo Möller [Mon, 2 Sep 2002 07:08:33 +0000 (07:08 +0000)]
change API for looking at the internal curve list

Submitted by: Nils Larsch

22 years agoApply -nameopt patches to 0.9.7
Dr. Stephen Henson [Fri, 30 Aug 2002 18:26:26 +0000 (18:26 +0000)]
Apply -nameopt patches to 0.9.7

22 years agoFix ASN1_STRING_to_UTF8: remove non sensical !*out test.
Dr. Stephen Henson [Fri, 30 Aug 2002 17:18:22 +0000 (17:18 +0000)]
Fix ASN1_STRING_to_UTF8: remove non sensical !*out test.

22 years agoFix ASN1_STRING_to_UTF8: remove non sensical !*out test.
Dr. Stephen Henson [Fri, 30 Aug 2002 17:17:45 +0000 (17:17 +0000)]
Fix ASN1_STRING_to_UTF8: remove non sensical !*out test.

22 years agodon't memset(data,0,...) if data is NULL
Bodo Möller [Thu, 29 Aug 2002 11:45:40 +0000 (11:45 +0000)]
don't memset(data,0,...) if data is NULL

Submitted by: anonymous
PR: 254

22 years agodon't memset(data,0,...) if data is NULL
Bodo Möller [Thu, 29 Aug 2002 11:35:42 +0000 (11:35 +0000)]
don't memset(data,0,...) if data is NULL

Submitted by: anonymous
PR: 254

22 years agoFix a bug to allow the 4758 ENGINE to build as a DSO.
Geoff Thorpe [Wed, 28 Aug 2002 19:11:59 +0000 (19:11 +0000)]
Fix a bug to allow the 4758 ENGINE to build as a DSO.

22 years agoFix a bug to allow the 4758 ENGINE to build as a DSO.
Geoff Thorpe [Wed, 28 Aug 2002 19:11:08 +0000 (19:11 +0000)]
Fix a bug to allow the 4758 ENGINE to build as a DSO.

22 years agodon't write beyond buffer
Bodo Möller [Tue, 27 Aug 2002 13:32:35 +0000 (13:32 +0000)]
don't write beyond buffer

Submitted by: Nils Larsch

22 years agochange 'usage' formatting
Bodo Möller [Tue, 27 Aug 2002 10:38:09 +0000 (10:38 +0000)]
change 'usage' formatting

22 years agoless specific interface for EC_GROUP_get_basis_type
Bodo Möller [Mon, 26 Aug 2002 18:08:53 +0000 (18:08 +0000)]
less specific interface for EC_GROUP_get_basis_type

Submitted by: Nils Larsch, Bodo Moeller

22 years agofix spacing
Bodo Möller [Mon, 26 Aug 2002 14:50:52 +0000 (14:50 +0000)]
fix spacing

22 years agomove EC_GROUP_get_basis_type() from ec_lib.c to ec_asn1.c
Bodo Möller [Mon, 26 Aug 2002 11:33:13 +0000 (11:33 +0000)]
move EC_GROUP_get_basis_type() from ec_lib.c to ec_asn1.c

22 years agoASN1 for binary curves
Bodo Möller [Mon, 26 Aug 2002 11:25:54 +0000 (11:25 +0000)]
ASN1 for binary curves

Submitted by: Nils Larsch

22 years agofix offsets
Bodo Möller [Mon, 26 Aug 2002 11:25:14 +0000 (11:25 +0000)]
fix offsets

Submitted by: Nils Larsch

22 years agoecdsa => ec
Bodo Möller [Mon, 26 Aug 2002 11:20:50 +0000 (11:20 +0000)]
ecdsa => ec

Submitted by: Nils Larsch

22 years agoReinstate the check for invalid length BIT STRINGS,
Dr. Stephen Henson [Fri, 23 Aug 2002 00:02:11 +0000 (00:02 +0000)]
Reinstate the check for invalid length BIT STRINGS,
which was effectively bypassed in the ASN1 changed.

22 years agoReinstate the check for invalid length BIT STRINGS,
Dr. Stephen Henson [Fri, 23 Aug 2002 00:00:54 +0000 (00:00 +0000)]
Reinstate the check for invalid length BIT STRINGS,
which was effectively bypassed in the ASN1 changed.

22 years agoMake -nameopt work in req and add support for -reqopt
Dr. Stephen Henson [Thu, 22 Aug 2002 23:43:48 +0000 (23:43 +0000)]
Make -nameopt work in req and add support for -reqopt

22 years agoChange C++ style comments
Dr. Stephen Henson [Thu, 22 Aug 2002 23:03:04 +0000 (23:03 +0000)]
Change C++ style comments

22 years ago#if out unused function to shut the compiler up.
Dr. Stephen Henson [Thu, 22 Aug 2002 23:00:54 +0000 (23:00 +0000)]
#if out unused function to shut the compiler up.

22 years agoFix C++ style comments.
Dr. Stephen Henson [Thu, 22 Aug 2002 23:00:05 +0000 (23:00 +0000)]
Fix C++ style comments.

22 years agoFix crahses and leaks in pkcs12 utility -chain option
Dr. Stephen Henson [Thu, 22 Aug 2002 21:54:51 +0000 (21:54 +0000)]
Fix crahses and leaks in pkcs12 utility -chain option

22 years agoFix crahses and leaks in pkcs12 utility -chain option
Dr. Stephen Henson [Thu, 22 Aug 2002 21:54:24 +0000 (21:54 +0000)]
Fix crahses and leaks in pkcs12 utility -chain option

22 years agoTypo, I assigned the variable ld instead of my_ld...
Richard Levitte [Sun, 18 Aug 2002 21:33:02 +0000 (21:33 +0000)]
Typo, I assigned the variable ld instead of my_ld...

22 years agoTypo, I assigned the variable ld instead of my_ld...
Richard Levitte [Sun, 18 Aug 2002 21:32:19 +0000 (21:32 +0000)]
Typo, I assigned the variable ld instead of my_ld...

22 years agoSo, I discovered that if you have your $PATH set so a ld different from
Richard Levitte [Sat, 17 Aug 2002 13:46:52 +0000 (13:46 +0000)]
So, I discovered that if you have your $PATH set so a ld different from
GNU ld comes first, checking the usage of collect2 gives that instead of
GNU ld, even if GNU ld would be the one that would get used if we link using
gcc.  It's much better, apparently, to ask gcc directly what the path to
GNU ld is (provided it's there at all and gcc knows about it), and ask
the result if it's a GNU or not.  The bonus is that our GNU ld detection
mechanism got shorter and easier to understand...

22 years agoSo, I discovered that if you have your $PATH set so a ld different from
Richard Levitte [Sat, 17 Aug 2002 13:46:42 +0000 (13:46 +0000)]
So, I discovered that if you have your $PATH set so a ld different from
GNU ld comes first, checking the usage of collect2 gives that instead of
GNU ld, even if GNU ld would be the one that would get used if we link using
gcc.  It's much better, apparently, to ask gcc directly what the path to
GNU ld is (provided it's there at all and gcc knows about it), and ask
the result if it's a GNU or not.  The bonus is that our GNU ld detection
mechanism got shorter and easier to understand...

22 years agoReorder cleanup sequence in SSL_CTX_free() to leave ex_data for remove_cb().
Lutz Jänicke [Fri, 16 Aug 2002 17:04:04 +0000 (17:04 +0000)]
Reorder cleanup sequence in SSL_CTX_free() to leave ex_data for remove_cb().
Submitted by:
Reviewed by:
PR: 212

22 years agoReorder cleanup sequence in SSL_CTX_free() to leave ex_data for remove_cb().
Lutz Jänicke [Fri, 16 Aug 2002 17:02:30 +0000 (17:02 +0000)]
Reorder cleanup sequence in SSL_CTX_free() to leave ex_data for remove_cb().
Submitted by:
Reviewed by:
PR: 212

22 years agoFix wrong URI.
Lutz Jänicke [Fri, 16 Aug 2002 16:44:54 +0000 (16:44 +0000)]
Fix wrong URI.
Submitted by: Mike Castle <dalgoda@ix.netcom.com>
Reviewed by:
PR: 200

22 years agotypo
Bodo Möller [Fri, 16 Aug 2002 11:19:59 +0000 (11:19 +0000)]
typo

Submitted by: Nils Larsch

22 years ago'EC' vs. 'ECDSA'
Bodo Möller [Fri, 16 Aug 2002 11:19:07 +0000 (11:19 +0000)]
'EC' vs. 'ECDSA'

Submitted by: Nils Larsch

22 years agoisalist was less trustable than I thought (or rather, one can trust it to
Richard Levitte [Fri, 16 Aug 2002 09:41:35 +0000 (09:41 +0000)]
isalist was less trustable than I thought (or rather, one can trust it to
come up with all kinds of names we don't have in our targets).
Besides, our sparcv9 targets currently generate sparcv8 code, I'm told.

22 years agoisalist was less trustable than I thought (or rather, one can trust it to
Richard Levitte [Fri, 16 Aug 2002 09:41:14 +0000 (09:41 +0000)]
isalist was less trustable than I thought (or rather, one can trust it to
come up with all kinds of names we don't have in our targets).
Besides, our sparcv9 targets currently generate sparcv8 code, I'm told.

22 years agoAdd -lz to the ld flags when the user has chosen to link in zlib *statically*.
Richard Levitte [Fri, 16 Aug 2002 06:15:58 +0000 (06:15 +0000)]
Add -lz to the ld flags when the user has chosen to link in zlib *statically*.
Notified by Doug Kaufman <dkaufman@rahul.net>

22 years agoAdd -lz to the ld flags when the user has chosen to link in zlib *statically*.
Richard Levitte [Fri, 16 Aug 2002 06:15:41 +0000 (06:15 +0000)]
Add -lz to the ld flags when the user has chosen to link in zlib *statically*.
Notified by Doug Kaufman <dkaufman@rahul.net>

22 years agoFix block_size field for CFB and OFB modes: it should be 1.
Dr. Stephen Henson [Fri, 16 Aug 2002 01:53:24 +0000 (01:53 +0000)]
Fix block_size field for CFB and OFB modes: it should be 1.

22 years agoFix block_size field for CFB and OFB modes: it should be 1.
Dr. Stephen Henson [Fri, 16 Aug 2002 01:38:34 +0000 (01:38 +0000)]
Fix block_size field for CFB and OFB modes: it should be 1.

22 years agoq may be used uninitialised
Richard Levitte [Thu, 15 Aug 2002 22:06:14 +0000 (22:06 +0000)]
q may be used uninitialised

22 years agoq may be used uninitialised
Richard Levitte [Thu, 15 Aug 2002 22:06:00 +0000 (22:06 +0000)]
q may be used uninitialised

22 years agouse correct function code in error message
Bodo Möller [Thu, 15 Aug 2002 16:17:20 +0000 (16:17 +0000)]
use correct function code in error message

22 years agouse correct function code in error message
Bodo Möller [Thu, 15 Aug 2002 16:17:02 +0000 (16:17 +0000)]
use correct function code in error message

22 years agoIt seems like sun4u doesn't always have a sparcv9 inside. Trust isalist.
Richard Levitte [Thu, 15 Aug 2002 15:21:00 +0000 (15:21 +0000)]
It seems like sun4u doesn't always have a sparcv9 inside.  Trust isalist.
PR: 220

22 years agoIt seems like sun4u doesn't always have a sparcv9 inside. Trust isalist.
Richard Levitte [Thu, 15 Aug 2002 15:20:48 +0000 (15:20 +0000)]
It seems like sun4u doesn't always have a sparcv9 inside.  Trust isalist.
PR: 220

22 years agofix warnings (CHARSET_EBCDIC)
Bodo Möller [Thu, 15 Aug 2002 14:52:54 +0000 (14:52 +0000)]
fix warnings (CHARSET_EBCDIC)

Submitted by: Lorinczy Zsigmond <lzsiga@mail.ahiv.hu>

22 years agofix warnings (CHARSET_EBCDIC)
Bodo Möller [Thu, 15 Aug 2002 14:52:22 +0000 (14:52 +0000)]
fix warnings (CHARSET_EBCDIC)

Submitted by: Lorinczy Zsigmond <lzsiga@mail.ahiv.hu>

22 years agofix manpage
Bodo Möller [Thu, 15 Aug 2002 14:23:23 +0000 (14:23 +0000)]
fix manpage

22 years agofix manpage
Bodo Möller [Thu, 15 Aug 2002 14:22:49 +0000 (14:22 +0000)]
fix manpage

22 years agoadd crypto/ecdh
Bodo Möller [Thu, 15 Aug 2002 14:17:19 +0000 (14:17 +0000)]
add crypto/ecdh

22 years agoI think that's the last forgotten compilation module.
Richard Levitte [Thu, 15 Aug 2002 11:48:58 +0000 (11:48 +0000)]
I think that's the last forgotten compilation module.

22 years agoMissing =back.
Richard Levitte [Thu, 15 Aug 2002 10:59:59 +0000 (10:59 +0000)]
Missing =back.
Part of PR 196

22 years agoMissing =back.
Richard Levitte [Thu, 15 Aug 2002 10:59:55 +0000 (10:59 +0000)]
Missing =back.
Part of PR 196

22 years agoAdd a FAQ entry for yet another bc failure.
Richard Levitte [Thu, 15 Aug 2002 10:50:42 +0000 (10:50 +0000)]
Add a FAQ entry for yet another bc failure.
PR: 199

22 years agoAdd a FAQ entry for yet another bc failure.
Richard Levitte [Thu, 15 Aug 2002 10:50:31 +0000 (10:50 +0000)]
Add a FAQ entry for yet another bc failure.
PR: 199

22 years agoYet a couple of modules forgotten. These weren't important for
Richard Levitte [Thu, 15 Aug 2002 09:40:08 +0000 (09:40 +0000)]
Yet a couple of modules forgotten.  These weren't important for
OpenSSL itself, since they aren't used there (yet).  It became quite
visible qhen building a shared library, however...

22 years agoYet a couple of modules forgotten. These weren't important for
Richard Levitte [Thu, 15 Aug 2002 09:39:01 +0000 (09:39 +0000)]
Yet a couple of modules forgotten.  These weren't important for
OpenSSL itself, since they aren't used there (yet).  It became quite
visible qhen building a shared library, however...

22 years agoSimplify handling of named curves: get rid of EC_GROUP_new_by_name(),
Bodo Möller [Thu, 15 Aug 2002 09:21:31 +0000 (09:21 +0000)]
Simplify handling of named curves: get rid of EC_GROUP_new_by_name(),
EC_GROUP_new_by_nid() should be enough.  This avoids a lot of
redundancy.

Submitted by: Nils Larsch

22 years agoSometimes, the value of the variable containing the compiler call can
Richard Levitte [Thu, 15 Aug 2002 08:29:26 +0000 (08:29 +0000)]
Sometimes, the value of the variable containing the compiler call can
become rather large.  This becomes a problem when the default 1024
character large buffer that WRITE uses isn't enough.  WRITE/SYMBOL
uses a 2048 byte large buffer instead.

22 years agoSometimes, the value of the variable containing the compiler call can
Richard Levitte [Thu, 15 Aug 2002 08:28:38 +0000 (08:28 +0000)]
Sometimes, the value of the variable containing the compiler call can
become rather large.  This becomes a problem when the default 1024
character large buffer that WRITE uses isn't enough.  WRITE/SYMBOL
uses a 2048 byte large buffer instead.

22 years agochange how pod2man is handled: explicitly invoke '$PERL' only when
Bodo Möller [Wed, 14 Aug 2002 14:06:11 +0000 (14:06 +0000)]
change how pod2man is handled: explicitly invoke '$PERL' only when
needed, call 'pod2man' directly if this works

PR: 217

22 years agochange how pod2man is handled: explicitly invoke '$PERL' only when
Bodo Möller [Wed, 14 Aug 2002 14:04:24 +0000 (14:04 +0000)]
change how pod2man is handled: explicitly invoke '$PERL' only when
needed, call 'pod2man' directly if this works

PR: 217

22 years agoInstead of returning errors when certain flags are unusable, just ignore them.
Richard Levitte [Wed, 14 Aug 2002 12:18:36 +0000 (12:18 +0000)]
Instead of returning errors when certain flags are unusable, just ignore them.
That will make the test go through even if DH (or in some cases ECDH) aren't
built into OpenSSL.
PR: 216, part 2

22 years agoInstead of returning errors when certain flags are unusable, just ignore them.
Richard Levitte [Wed, 14 Aug 2002 12:16:27 +0000 (12:16 +0000)]
Instead of returning errors when certain flags are unusable, just ignore them.
That will make the test go through even if DH (or in some cases ECDH) aren't
built into OpenSSL.
PR: 216, part 2

22 years agoThe applications 'ecdsa' and 'ecparam' were missing from the VMS
Richard Levitte [Wed, 14 Aug 2002 11:16:20 +0000 (11:16 +0000)]
The applications 'ecdsa' and 'ecparam' were missing from the VMS
build.

22 years agoMake sure that the test input file comes in the same record format as the
Richard Levitte [Wed, 14 Aug 2002 11:09:03 +0000 (11:09 +0000)]
Make sure that the test input file comes in the same record format as the
typical output from a program in C.
PR: 222

22 years agoMake sure that the test input file comes in the same record format as the
Richard Levitte [Wed, 14 Aug 2002 11:08:43 +0000 (11:08 +0000)]
Make sure that the test input file comes in the same record format as the
typical output from a program in C.
PR: 222

22 years agomove a TODO from CHANGES to STATUS
Bodo Möller [Wed, 14 Aug 2002 11:07:29 +0000 (11:07 +0000)]
move a TODO from CHANGES to STATUS

22 years agoadd 'TODO' items
Bodo Möller [Wed, 14 Aug 2002 10:49:29 +0000 (10:49 +0000)]
add 'TODO' items

22 years agoFix typo in OBJ_txt2obj which incorrectly passed the content
Dr. Stephen Henson [Wed, 14 Aug 2002 00:50:35 +0000 (00:50 +0000)]
Fix typo in OBJ_txt2obj which incorrectly passed the content
length, instead of the encoding length to d2i_ASN1_OBJECT.

This wasn't visible before becuse ASN1_get_object() used
to read past the length of the supplied buffer.

22 years agoFix typo in OBJ_txt2obj which incorrectly passed the content
Dr. Stephen Henson [Wed, 14 Aug 2002 00:48:02 +0000 (00:48 +0000)]
Fix typo in OBJ_txt2obj which incorrectly passed the content
length, instead of the encoding length to d2i_ASN1_OBJECT.

This wasn't visible before becuse ASN1_get_object() used
to read past the length of the supplied buffer.

22 years agoSome files deserve to be ignored
Richard Levitte [Tue, 13 Aug 2002 22:41:39 +0000 (22:41 +0000)]
Some files deserve to be ignored

22 years agoThis commit was manufactured by cvs2svn to create branch
cvs2svn [Tue, 13 Aug 2002 22:41:21 +0000 (22:41 +0000)]
This commit was manufactured by cvs2svn to create branch
'OpenSSL_0_9_7-stable'.

22 years agoSome files deserve to be ignored
Richard Levitte [Tue, 13 Aug 2002 22:41:18 +0000 (22:41 +0000)]
Some files deserve to be ignored

22 years agoMerge in demo engines from 0.9.7-stable.
Richard Levitte [Tue, 13 Aug 2002 12:30:27 +0000 (12:30 +0000)]
Merge in demo engines from 0.9.7-stable.