333 Commits

Author SHA1 Message Date
Richard Levitte
0f4d260782 Recent changes from 0.9.6-stable 2003-09-29 15:14:23 +00:00
Richard Levitte
db0edbb745 Recent changes from 0.9.6-stable 2003-09-08 16:57:29 +00:00
Richard Levitte
3ef63bcc6b Recent changes from 0.9.6-stable 2003-08-14 06:33:04 +00:00
Richard Levitte
980645e55e Recent changes from 0.9.6-stable. 2003-08-09 09:35:57 +00:00
Richard Levitte
c4157adf1e Recent changes from 0.9.6-stable. 2003-03-27 20:06:29 +00:00
Richard Levitte
8aac6ad0f2 Recent changes from 0.9.6-stable. 2003-03-25 01:26:54 +00:00
Richard Levitte
2e824f0444 All kinds of changes from 0.9.6-stable. 2003-02-19 12:32:21 +00:00
Richard Levitte
2b4a238b5b Recent changes from 0.9.6-stable. 2002-12-28 02:01:45 +00:00
Richard Levitte
22b3a95d5c Recent changes from 0.9.6-stable. 2002-12-02 03:01:52 +00:00
Richard Levitte
63e86149c1 Recent changes from 0.9.6-stable. 2002-11-28 12:26:05 +00:00
Richard Levitte
6ceffdd121 Recent changes from 0.9.6-stable. 2002-11-15 13:57:00 +00:00
Richard Levitte
3ba2b94a6b Recent changes from 0.9.6-stable. 2002-11-06 17:45:24 +00:00
Richard Levitte
7fff663991 Recent changes from 0.9.6-stable. 2002-10-30 12:15:30 +00:00
Geoff Thorpe
7c99da56cf Correct and enhance the behaviour of "internal" session caching as it
relates to SSL_CTX flags and the use of "external" session caching. The
existing flag, "SSL_SESS_CACHE_NO_INTERNAL_LOOKUP" remains but is
supplemented with a complimentary flag, "SSL_SESS_CACHE_NO_INTERNAL_STORE".
The bitwise OR of the two flags is also defined as
"SSL_SESS_CACHE_NO_INTERNAL" and is the flag that should be used by most
applications wanting to implement session caching *entirely* by its own
provided callbacks. As the documented behaviour contradicted actual
behaviour up until recently, and since that point behaviour has itself been
inconsistent anyway, this change should not introduce any compatibility
problems. I've adjusted the relevant documentation to elaborate about how
this works.

Kudos to "Nadav Har'El" <nyh@math.technion.ac.il> for diagnosing these
anomalies and testing this patch for correctness.

PR: 311
2002-10-29 00:16:56 +00:00
Richard Levitte
8fd54b07a8 Merge in latest changes from 0.9.6-stable. 2002-10-11 20:54:03 +00:00
Richard Levitte
c4a24b13f3 Merge in recent changes from 0.9.6-stable. 2002-09-25 15:12:13 +00:00
Richard Levitte
c3bfe3f4cb Recent changes from 0.9.6-stable. 2002-08-14 14:46:03 +00:00
Bodo Möller
1ce60f02d3 merge in changes in OpenSSL_0_9_6-stable (conflicts resolved) 2002-08-02 11:38:07 +00:00
Lutz Jänicke
cfebe39d42 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.
Submitted by:
Reviewed by:
PR:
2002-07-30 10:26:28 +00:00
Lutz Jänicke
eb80f91278 "make update"
Submitted by:
Reviewed by:
PR:
2002-07-30 09:41:07 +00:00
Richard Levitte
b5b000d77e Merge in recent changes from OpenSSL_0_9_6-stable. 2002-07-23 14:49:57 +00:00
Richard Levitte
8b98de6653 Merge in the latest chanegs from 0.9.6-stable. 2002-07-18 14:19:26 +00:00
Richard Levitte
49b10f72ec Recent changes from 0.9.6-stable. 2002-06-25 11:20:49 +00:00
Richard Levitte
71aa7c586b Merge in all recent changes from 0.9.6-stable. 2002-05-29 11:29:40 +00:00
Richard Levitte
e27fd320fc Apply all the recent changes from 0.9.6-stable. 2002-05-08 15:54:01 +00:00
Richard Levitte
c1fb6557e5 Merge in the latest changes from 0.9.6d-stable. 2002-04-17 07:02:47 +00:00
Richard Levitte
c14688ec73 Merge in changes from 0.9.6-stable. This should definitely be done a
little more often.
2002-03-30 23:36:17 +00:00
Richard Levitte
b98a984294 Merge in changes from the 0.9.6-stable branch. 2002-02-28 14:47:33 +00:00
Richard Levitte
56cf45f968 make update 2002-02-26 14:25:39 +00:00
Richard Levitte
30b5ce14d8 Merge in recent changes from 0.9.6-stable. 2002-02-14 14:15:45 +00:00
Richard Levitte
b860878edc Add missing declaration of ERR_load_SSL_strings(). 2002-01-30 16:45:22 +00:00
Richard Levitte
41aad62a78 Merge in the latest changes from the 0.9.6-stable branch. 2002-01-26 01:18:50 +00:00
Richard Levitte
47892635ad make update 2001-12-20 22:41:45 +00:00
Richard Levitte
be29c93cf4 Another merge from the 0.9.6 branch. 2001-12-20 10:17:22 +00:00
Richard Levitte
edcace97a8 Merge in latest changes from 0.9.6-stable.
make update
perl util/mkerr.pl -recurse -write -rebuild

(now, just look at the effect that last thing had on the ENGINE error
strings!  How did that unbalance between macros and strings happen?)
2001-11-15 13:33:08 +00:00
Richard Levitte
8d5c834b34 Merg in latest changes from 0.9.6-stable. 2001-11-15 08:15:05 +00:00
Bodo Möller
da904c9cef synchronise with main 0.9.6 stable branch 2001-11-12 22:42:40 +00:00
Richard Levitte
393a9b68cf Merge from 0.9.6-stable branch. No conflicts. 2001-07-05 13:56:50 +00:00
Richard Levitte
4ae5099856 Add changes from the 0.9.6-stable branch. 2001-06-05 05:08:26 +00:00
Richard Levitte
9aef355cf0 Merge in changes from the 0.9.6-stable branch. 2001-04-04 16:34:38 +00:00
Richard Levitte
0294674b44 Merge in recent changes from OpenSSL_0_9_6-stable. 2001-03-26 17:09:15 +00:00
Richard Levitte
b4ac8b1e0a Merge in recent changes from OpenSSL-0_9_6-stable 2001-03-13 15:51:51 +00:00
Richard Levitte
3d4bb90138 Merge in the 0.9.6-stable branch once more and hope for better
results.
2001-03-13 06:49:18 +00:00
Richard Levitte
3476515195 Merge from main trunk. 2000-09-24 09:50:31 +00:00
Richard Levitte
a9c33b529e Merge from main trunk. No conflicts. 2000-09-21 07:38:47 +00:00
Richard Levitte
ce6990739e The rest of the merge in of the main trunk, a few conflicts resolved. 2000-09-17 20:37:33 +00:00
Richard Levitte
0dcf7fd543 Merge of main trunk, conflicts resolved. 2000-09-13 21:20:49 +00:00
Richard Levitte
192295a094 Merge main trunk to engine branch, all conflicts resolved. 2000-09-07 10:59:04 +00:00
Richard Levitte
1ba5b1b530 Merge from main trunk, conflicts resolved 2000-08-01 12:21:46 +00:00
Richard Levitte
cb9c5dc571 Merge from main, all conflicts resolved.
(I do this far too seldom...)
2000-07-12 16:34:34 +00:00