Dr. Stephen Henson
709a395d1c
PR: 2091
...
Submitted by: Martin Kaiser <lists@kaiser.cx>, Stephen Henson
Approved by: steve@openssl.org
If an OID has no short name or long name return the numerical representation.
2009-11-10 01:00:07 +00:00
Dr. Stephen Henson
cc7399e79c
Changes from 1.0.0-stable.
2009-04-07 16:33:26 +00:00
Ben Laurie
a79b668b8f
Autogeneration seems to have changed slightly.
2009-04-05 10:21:05 +00:00
Dr. Stephen Henson
06ddf8eb08
Updates from 1.0.0-stable
2009-04-04 19:54:06 +00:00
Dr. Stephen Henson
14023fe352
Merge from 1.0.0-stable branch.
2009-04-03 11:45:19 +00:00
Dr. Stephen Henson
ddcfc25a6d
Update from stable branch.
2009-03-25 19:02:22 +00:00
Dr. Stephen Henson
aaa29f9e83
Add error checking to obj_xref.pl and add command line support for data
...
file locations.
2009-02-10 13:03:31 +00:00
Geoff Thorpe
6343829a39
Revert the size_t modifications from HEAD that had led to more
...
knock-on work than expected - they've been extracted into a patch
series that can be completed elsewhere, or in a different branch,
before merging back to HEAD.
2008-11-12 03:58:08 +00:00
Dr. Stephen Henson
2e5975285e
Update obsolete email address...
2008-11-05 18:39:08 +00:00
Ben Laurie
5e4430e70d
More size_tification.
2008-11-01 16:40:37 +00:00
Ben Laurie
4d6e1e4f29
size_tification.
2008-11-01 14:37:00 +00:00
Dr. Stephen Henson
df0681e554
Add permanentIdentifier OID.
2008-10-22 18:48:11 +00:00
Dr. Stephen Henson
e19106f5fb
Create function of the form OBJ_bsearch_xxx() in bsearch typesafe macros
...
with the appropriate parameters which calls OBJ_bsearch(). A compiler will
typically inline this.
This avoids the need for cmp_xxx variables and fixes unchecked const issues
with CHECKED_PTR_OF()
2008-10-22 15:43:01 +00:00
Dr. Stephen Henson
dcf6b3e9b6
Reinstate obj_xref.h as it is not auto generated on all platforms.
2008-10-20 15:12:48 +00:00
Dr. Stephen Henson
606f6c477a
Fix a shed load or warnings:
...
Duplicate const.
Use of ; outside function.
2008-10-20 15:12:00 +00:00
Dr. Stephen Henson
111a6e2a23
Fix multiple ; warning.
2008-10-18 15:02:59 +00:00
Ben Laurie
d764e7edb8
Fix warning a different way.
2008-10-18 12:12:34 +00:00
Ben Laurie
1ea6472e60
Type-safe OBJ_bsearch_ex.
2008-10-14 08:10:52 +00:00
Ben Laurie
babb379849
Type-checked (and modern C compliant) OBJ_bsearch.
2008-10-12 14:32:47 +00:00
Dr. Stephen Henson
249a77f5fb
Add support for freshest CRL extension.
2008-08-27 15:52:05 +00:00
Dr. Stephen Henson
d4cdbab99b
Avoid warnings with -pedantic, specifically:
...
Conversion between void * and function pointer.
Value computed not used.
Signed/unsigned argument.
2008-07-04 23:12:52 +00:00
Dr. Stephen Henson
8528128b2a
Update from stable branch.
2008-06-26 23:27:31 +00:00
Ben Laurie
5ce278a77b
More type-checking.
2008-06-04 11:01:43 +00:00
Ben Laurie
3c1d6bbc92
LHASH revamp. make depend.
2008-05-26 11:24:29 +00:00
Dr. Stephen Henson
3247812e34
Since OID NIDs with 0.9.8.
2008-04-02 10:48:34 +00:00
Dr. Stephen Henson
fe591284be
Update dependencies.
2008-03-22 18:52:03 +00:00
Dr. Stephen Henson
054307e7ed
Allow alternate eContentType oids to be set in cms utility.
...
Add id-ct-asciiTextWithCRLF OID.
Give more meaninful error message is attempt to use key ID from a certificate
without a key ID.
2008-03-19 19:34:30 +00:00
Dr. Stephen Henson
16fe5f8b50
Produce meaningful error if sanity check fails.
...
Delete trailing whitespace from objects.txt
Delete duplicate NIDs.
2008-03-19 17:01:12 +00:00
Dr. Stephen Henson
041e7f2eee
Additional sanity check.
2008-03-19 14:18:36 +00:00
Dr. Stephen Henson
c36e936b60
Partial support for KEKRecipientInfo type.
2008-03-17 18:11:27 +00:00
Geoff Thorpe
1e26a8baed
Fix a variety of warnings generated by some elevated compiler-fascism,
...
OPENSSL_NO_DEPRECATED, etc. Steve, please double-check the CMS stuff...
2008-03-16 21:05:46 +00:00
Dr. Stephen Henson
b510d77535
We already have an object for "zlib compression" but it was a place
...
holder and its actual encoding never used.
Just as well because it's value looks like it was made up in the mists of
time...
Now there is a registered value for zlib compression (used in S/MIME
compressedData content type) use that instead.
2008-02-29 14:24:52 +00:00
Dr. Stephen Henson
400ca0e467
Add OIDs for compressedData content type and zlib compression.
2008-02-12 13:48:10 +00:00
Dr. Stephen Henson
1ad6a1b5e9
Rebuild OID database: duplicates got in there somehow??
2007-11-23 00:34:00 +00:00
Dr. Stephen Henson
6e150083bb
Fix from stable branch.
2007-11-23 00:19:24 +00:00
Dr. Stephen Henson
98d8baabbd
Add caRepository OID and sync object NIDs with OpenSSL 0.9.8.
2007-11-23 00:14:59 +00:00
Dr. Stephen Henson
f670738987
Rebuild object cross reference table.
2007-11-20 13:04:45 +00:00
Lutz Jänicke
86140095b5
Add OIDs by CMP (RFC 4210) and CRMF (RFC 4211)
...
Submitted by: Martin Peylo <martinmeis@googlemail.com>
2007-11-01 08:24:56 +00:00
Andy Polyakov
a005fb019f
Addenum to "Constify obj_dat.[ch]."
2007-09-18 22:15:31 +00:00
Andy Polyakov
26f0cf69d3
Constify obj_dat.[ch], as well as minimize linker relocations.
2007-09-18 21:05:21 +00:00
Dr. Stephen Henson
81025661a9
Update ssl code to support digests other than MD5+SHA1 in handshake.
...
Submitted by: Victor B. Wagner <vitus@cryptocom.ru>
2007-08-31 12:42:53 +00:00
Bodo Möller
96afc1cfd5
Add SEED encryption algorithm.
...
PR: 1503
Submitted by: KISA
Reviewed by: Bodo Moeller
2007-04-23 23:48:59 +00:00
Dr. Stephen Henson
74633553a9
Experimental HMAC support via EVP_PKEY_METHOD.
2007-04-11 12:33:06 +00:00
Dr. Stephen Henson
9981a51e42
Stage 1 GOST ciphersuite support.
...
Submitted by: ran@cryptocom.ru
Reviewed by: steve@openssl.org
2007-03-23 17:04:05 +00:00
Nils Larsch
357d5de5b9
add support for DSA with SHA2
2007-02-03 14:41:12 +00:00
Nils Larsch
c92da5a605
update
2006-12-21 19:48:47 +00:00
Nils Larsch
06e2dd037e
add support for ecdsa-with-sha256 etc.
2006-12-20 08:58:54 +00:00
Dr. Stephen Henson
5de3a0ff3d
Sync OID NIDs with OpenSSL 0.9.8.
2006-12-06 13:44:21 +00:00
Nils Larsch
b0eedd77f6
add "Certificate Issuer" and "Subject Directory Attributes" OIDs
...
PR: 1433
2006-12-04 18:51:06 +00:00
Dr. Stephen Henson
47a9d527ab
Update from 0.9.8 stable. Eliminate duplicate error codes.
2006-11-21 21:29:44 +00:00
Ben Laurie
777c47acbe
Make things static that should be. Declare stuff in headers that should be.
...
Fix warnings.
2006-08-28 17:01:04 +00:00
Dr. Stephen Henson
31780d0e26
Bugfix: don't look in internal table for signature if found in application
...
supplied list.
2006-07-12 16:30:40 +00:00
Dr. Stephen Henson
0ee2166cc5
New functions to add and free up application defined signature OIDs.
2006-07-09 16:05:43 +00:00
Bodo Möller
f3dea9a595
Camellia cipher, contributed by NTT
...
Submitted by: Masashi Fujita
Reviewed by: Bodo Moeller
2006-06-09 15:44:59 +00:00
Dr. Stephen Henson
1631d5f9b9
HMAC OIDs from RFC4231.
2006-05-17 12:27:45 +00:00
Dr. Stephen Henson
856640b54f
Extend PBE code to support non default PKCS#5 v2.0 PRFs.
2006-05-14 18:40:53 +00:00
Richard Levitte
98bf13c36b
make update
2006-05-12 15:31:28 +00:00
Dr. Stephen Henson
d202709808
Add OID cross reference table.
...
Fix some typos in GOST OIDs.
Update dependencies.
2006-04-18 23:36:07 +00:00
Dr. Stephen Henson
29da3ade3c
Rebuild mac table to avoid duplicates.
2006-04-05 12:09:09 +00:00
Dr. Stephen Henson
de908d6319
Typos in a few OID names.
2006-04-05 12:06:32 +00:00
Dr. Stephen Henson
5e0e9fce5d
Minor object name edit.
2006-04-05 11:29:31 +00:00
Dr. Stephen Henson
228b4e426b
Update and add last (?) set of GOST OIDs.
2006-04-04 15:53:21 +00:00
Dr. Stephen Henson
362ab3e4f9
More GOST OIDs
2006-04-02 13:22:39 +00:00
Dr. Stephen Henson
2aed84d16b
Add GOST parameter set OIDs.
2006-04-02 03:01:27 +00:00
Dr. Stephen Henson
5a47825ece
Fix gost OIDs.
2006-03-31 10:57:32 +00:00
Dr. Stephen Henson
531308d929
Fix typo.
2006-03-29 15:58:55 +00:00
Dr. Stephen Henson
74e564cd46
Add some GOST OIDs.
2006-03-29 13:02:21 +00:00
Dr. Stephen Henson
246e09319c
Fix bug where freed OIDs could be accessed in EVP_cleanup() by
...
defering freeing in OBJ_cleanup().
2006-03-28 17:23:48 +00:00
Dr. Stephen Henson
9c339a7227
Fix from stable branch.
2006-02-15 15:04:42 +00:00
Dr. Stephen Henson
15ac971681
Update filenames in makefiles.
2006-02-04 01:45:59 +00:00
Nils Larsch
8c5a2bd6bb
add additional checks + cleanup
...
Submitted by: David Hartman <david_hartman@symantec.com>
2006-01-29 23:12:22 +00:00
Andy Polyakov
f106fb85d4
Add Whirlpool OID.
2005-11-28 20:51:46 +00:00
Dr. Stephen Henson
452ae49db5
Extensive OID code enhancement and fixes.
2005-11-20 13:07:47 +00:00
Nils Larsch
5f10073c95
fix typo in sbgp names
...
PR: 1194
2005-09-02 21:23:25 +00:00
Nils Larsch
8215e7a938
fix warnings when building openssl with the following compiler options:
...
-Wmissing-prototypes -Wcomment -Wformat -Wimplicit -Wmain -Wmultichar
-Wswitch -Wshadow -Wtrigraphs -Werror -Wchar-subscripts
-Wstrict-prototypes -Wreturn-type -Wpointer-arith -W -Wunused
-Wno-unused-parameter -Wuninitialized
2005-08-28 22:49:57 +00:00
Dr. Stephen Henson
231493c93c
Initial print only support for IDP CRL extension.
2005-07-23 23:33:06 +00:00
Ben Laurie
45d8574b93
Fix warnings.
2005-06-29 10:25:06 +00:00
Andy Polyakov
ce92b6eb9c
Further BUILDENV refinement, further fool-proofing of Makefiles and
...
[most importantly] put back dependencies accidentaly eliminated in
check-in #13342 .
2005-05-16 16:55:47 +00:00
Andy Polyakov
81a86fcf17
Fool-proofing Makefiles
2005-05-15 22:23:26 +00:00
Dr. Stephen Henson
29dc350813
Rebuild error codes.
2005-04-12 16:15:22 +00:00
Richard Levitte
4bb61becbb
Add emacs cache files to .cvsignore.
2005-04-11 14:17:07 +00:00
Nils Larsch
f763e0b5ae
make sure error queue is totally emptied
...
PR: 359
2005-04-07 22:53:35 +00:00
Nils Larsch
70f34a5841
some const fixes and cleanup
2005-04-05 10:29:43 +00:00
Ben Laurie
42ba5d2329
Blow away Makefile.ssl.
2005-03-30 13:05:57 +00:00
Andy Polyakov
f7f2125522
Avoid re-build avalanches with HP-UX make.
2005-03-12 09:12:44 +00:00
Richard Levitte
6951c23afd
Add functionality needed to process proxy certificates.
2004-12-28 00:21:35 +00:00
Richard Levitte
3c97bd833b
Change libeay.num so it's synchronised with additions in 0.9.7-stable.
...
make update
2004-12-13 22:57:08 +00:00
Dr. Stephen Henson
a0e7c8eede
Add lots of checks for memory allocation failure, error codes to indicate
...
failure and freeing up memory if a failure occurs.
PR:620
2004-12-05 01:03:15 +00:00
Dr. Stephen Henson
8544a80776
Add couple of OIDs. Resync NIDs for consistency with 0.9.7.
2004-12-01 18:09:53 +00:00
Richard Levitte
a2ac429da2
Don't use $(EXHEADER) directly in for loops, as most shells will break
...
if $(EXHEADER) is empty.
Notified by many, solution suggested by Carson Gaspar <carson@taltos.org>
2004-11-02 23:55:01 +00:00
Richard Levitte
914d36ba19
make update
2004-05-31 13:16:08 +00:00
Andy Polyakov
6bca8e3886
objects.txt update for SHA-224/-256/-384/-512. SHA-224 ids still appear
...
"draft," but we have to start somewhere...
Submitted by: Nils Larsch <nlarsch@compuserve.de>
2004-05-31 13:07:19 +00:00
Geoff Thorpe
9c52d2cc75
After the latest round of header-hacking, regenerate the dependencies in
...
the Makefiles. NB: this commit is probably going to generate a huge posting
and it is highly uninteresting to read.
2004-05-17 19:26:06 +00:00
Richard Levitte
875a644a90
Constify d2i, s2i, c2i and r2i functions and other associated
...
functions and macros.
This change has associated tags: LEVITTE_before_const and
LEVITTE_after_const. Those will be removed when this change has been
properly reviewed.
2004-03-15 23:15:26 +00:00
Dr. Stephen Henson
edec614efd
Support for inhibitAnyPolicy extension.
2004-03-08 13:56:31 +00:00
Richard Levitte
8d1ebe0bd1
Add the missing parts for DES CFB1 and CFB8.
...
Add the corresponding AES parts while I'm at it.
make update
2004-01-28 19:05:35 +00:00
Richard Levitte
075521725d
Fix Perl problems on sparc64.
...
This is part of a large change submitted by Markus Friedl <markus@openbsd.org>
2003-12-27 16:13:18 +00:00
Richard Levitte
79b42e7654
Use sh explicitely to run point.sh
...
This is part of a large change submitted by Markus Friedl <markus@openbsd.org>
2003-12-27 14:59:07 +00:00
Richard Levitte
d420ac2c7d
Use BUF_strlcpy() instead of strcpy().
...
Use BUF_strlcat() instead of strcat().
Use BIO_snprintf() instead of sprintf().
In some cases, keep better track of buffer lengths.
This is part of a large change submitted by Markus Friedl <markus@openbsd.org>
2003-12-27 14:40:17 +00:00
Richard Levitte
0d78bc3356
Add IPSec/IKE/Oakley curves.
...
PR: 768
Submitted by: Vadim Fedukovich <vf@unity.net>
2003-11-29 09:25:59 +00:00
Bodo Möller
968766cad8
updates for draft-ietf-tls-ecc-03.txt
...
Submitted by: Douglas Stebila
Reviewed by: Bodo Moeller
2003-07-22 12:34:21 +00:00
Richard Levitte
f9d183c209
Replace CCITT with ITU-T. Keep CCITT around as an alias.
...
make update
PR: 80
2003-07-04 15:45:04 +00:00
Richard Levitte
c89f31def0
make update
2003-06-26 10:27:11 +00:00
Richard Levitte
54dbdd9837
Some variables were uninitialised...
2003-04-29 20:45:36 +00:00
Richard Levitte
ea5240a5ed
Add an extended variant of OBJ_bsearch() that can be given a few
...
flags.
2003-04-29 20:25:21 +00:00
Dr. Stephen Henson
1c2d141238
Name Constraints OID.
2003-03-24 00:56:09 +00:00
Dr. Stephen Henson
6f528cac5a
Typo: OID should be policyMappings
2003-03-20 17:14:27 +00:00
Dr. Stephen Henson
ba5df66a8b
Add some OIDs.
2003-03-13 23:37:55 +00:00
Bodo Möller
d745af4b0c
avoid potential confusion about curves (prime192v1 and prime256v1 are
...
also known as secp192r1 and secp256r1, respectively)
Submitted by: Nils Larsch, Bodo Moeller
2003-01-16 16:05:23 +00:00
Bodo Möller
b05645902a
"!Cname surname" has now become redundant ...
2003-01-13 15:57:33 +00:00
Bodo Möller
54d4f8c320
undo part of a recent change: it's "surname", not "surName"
...
(see X.520 aka ISO/IEC 9594-6)
2003-01-13 15:52:04 +00:00
Richard Levitte
c9ecb1edd8
Keep the internal lowercase 'surname', for programmer's sake.
2002-12-20 09:39:34 +00:00
Richard Levitte
8baf5fdca0
Be consistent with capitalisation of object names.
2002-12-20 09:24:17 +00:00
Richard Levitte
aafafa314d
Be consistent with capitalisation of object names.
2002-12-20 09:18:18 +00:00
Richard Levitte
6dc78bf7e8
make update
2002-11-15 11:20:43 +00:00
Richard Levitte
ce4f169ff9
A few more Microsoft OIDs added
2002-11-15 11:17:50 +00:00
Ben Laurie
54a656ef08
Security fixes brought forward from 0.9.7.
2002-11-13 15:43:43 +00:00
Richard Levitte
001ab3abad
Use double dashes so makedepend doesn't misunderstand the flags we
...
give it.
For 0.9.7 and up, that means util/domd needs to remove those double
dashes from the argument list when gcc is used to find the
dependencies.
2002-10-09 13:25:12 +00:00
Dr. Stephen Henson
2af52de7b5
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.
2002-08-14 00:48:02 +00:00
Bodo Möller
16dc1cfb5c
Add more WAP/WTLS elliptic curve OIDs.
...
Submitted by: Douglas Stebila <douglas.stebila@sun.com>
2002-08-02 12:28:34 +00:00
Lutz Jänicke
c046fffa16
OpenSSL Security Advisory [30 July 2002]
...
Changes marked "(CHATS)" were sponsored by the Defense Advanced
Research Projects Agency (DARPA) and Air Force Research Laboratory,
Air Force Materiel Command, USAF, under agreement number
F30602-01-2-0537.
2002-07-30 13:04:04 +00:00
Richard Levitte
17085b022c
Pass CFLAG to dependency makers, so non-standard system include paths are
...
handled properly.
Part of PR 75
2002-06-27 16:39:25 +00:00
Lutz Jänicke
82869b3c8d
Add OIDs for Secure Electronic Transactions (SET)
...
Submitted by: Vadim Fedukovich <vf@unity.net>
Reviewed by: Lutz Jaenicke
PR: 80
2002-06-13 11:52:56 +00:00
Lutz Jänicke
0f7b63c834
Make sure that settings are passed back and forth when walking around
...
in the tree during build.
Reinstall default PERL settings in Makefiles, as the real reason for the
failure was that the settings were not passed.
2002-06-06 10:16:59 +00:00
Lutz Jänicke
345731731a
New OID for X509 usage: pseudonym
...
Submitted by: Michael Bell <michael.bell@rz.hu-berlin.de>
Reviewed by: Lutz Jaenicke
PR: 83
2002-06-06 07:33:00 +00:00
Lutz Jänicke
bb0db9c491
The correct PERL interpreter is passed via commandline.
2002-06-05 07:03:17 +00:00
Richard Levitte
9cdf87f194
Check the return values where memory allocation failures may happen.
...
PR: 49
2002-05-30 16:47:45 +00:00
Lutz Jänicke
f1e6643751
Add generationQualifier OID (proposed by Fiel Cabral).
2002-04-25 18:03:13 +00:00
Lutz Jänicke
d5d007abe3
Optimize: better shortcut evaluation ("Howard Chu" <hyc@highlandsun.com>).
2002-04-18 11:54:06 +00:00
Lutz Jänicke
ea7fc0311c
Use the "mail" short name according to RFC2798 (Michael Bell
...
<michael.bell@rz.hu-berlin.de>).
2002-04-15 13:30:41 +00:00
Lutz Jänicke
30911232c1
Some more OID enhancements.
2002-04-15 10:41:38 +00:00
Richard Levitte
083100e2ab
Check error code from a2d_ASN1_OBJECT().
2002-04-11 22:13:58 +00:00
Lutz Jänicke
0ae1661ba2
Apply OID fixes for elliptic curves as supplied by
...
Nils Larsch <nlarsch@compuserve.de>.
2002-04-08 15:49:53 +00:00
Richard Levitte
a18894d159
make update (libeay.num has been edited to match 0.9.7-stable)
2002-04-06 19:16:12 +00:00
Lutz Jänicke
4825092bbe
Fix buggy object definitions (Svenning Sorensen <sss@sss.dnsalias.net>).
2002-04-04 17:48:37 +00:00
Lutz Jänicke
ffbe98b763
Make short names of objects RFC2256-compliant.
2002-03-26 17:18:48 +00:00
Bodo Möller
1d28453529
add OIDs for WAP/TLS curves
2002-03-14 13:18:57 +00:00
Bodo Möller
36c194638e
add SECG OIDs
...
Submitted by: Nils Larsch
2002-03-06 13:47:32 +00:00
Bodo Möller
2d9b1b3ffa
more X9.62 OIDs
...
Submitted by: Nils Larsch <nla@trustcenter.de>
2002-03-05 12:39:19 +00:00
Richard Levitte
ab1dee1efc
Adjust the NID names for the AES modes OFB and CFB to contain the number
...
of feedback bits
2002-02-16 12:15:30 +00:00
Bodo Möller
4d7072f4b5
remove redundant ERR_load_... declarations
2001-12-17 19:22:23 +00:00
Richard Levitte
d4704d5245
UID was never a lable for uniqueIdentifier. However, LDAP and certain
...
RFCs concerning X.500 directories use UID as a shorter name for the
attribute type userId, which is defined by CCITT and available through
RFCs 1274 and 2247.
Unfortunately, if some applications have used the name "UID" for the
uniqueIdentifier attribute type, they will produce incorrect results.
However, I found it better to follow the standards that are out there
rather than having our own incompatible one.
2001-12-04 11:01:17 +00:00
Bodo Möller
c3fbf5d9a8
Fix: 2.5.29 is "id-ce", not "ld-ce" (sort of a typo in objects.h).
...
Fix (?): Delete 'ip-pda 6' (id-pda-pseudonym) because it does not exist
in RFC 3039.
Also change Perl scripts to put auto-generation warning in the
first lines of the file.
2001-12-03 13:47:22 +00:00
Richard Levitte
b476df64a1
make update
...
perl util/mkerr.pl -recurse -write -rebuild
2001-11-15 12:25:14 +00:00
Richard Levitte
513d4b4c16
make update
2001-10-24 08:27:22 +00:00
Richard Levitte
7ef701519b
Correction of the id-pda OID's.
...
Submitted by Frederic.Giudicelli@INTRINsec.com
2001-10-23 14:30:57 +00:00
Richard Levitte
b8a61e7362
'make update'
2001-10-10 21:52:06 +00:00
Richard Levitte
dd5e774664
Add support for md4WithRSAEncryption.
2001-10-10 21:37:45 +00:00
Richard Levitte
b30245dae0
'make update'
2001-10-10 07:56:20 +00:00
Richard Levitte
4b12506891
A few more OIDs, contributed by Peter Sylvester <Peter.Sylvester@EdelWeb.fr>
2001-10-09 15:32:23 +00:00