Mark Murray
|
bff3688511
|
Merge conflicts.
This is cunning doublespeak for "use vendor code".
|
2003-01-28 22:34:21 +00:00 |
|
Jacques Vidrine
|
fd35706acb
|
Resolve conflicts.
|
2002-08-10 01:50:50 +00:00 |
|
Jacques Vidrine
|
d57327ee50
|
Resolve conflicts after import of OpenSSL 0.9.6e.
|
2002-07-30 13:58:53 +00:00 |
|
Kris Kennaway
|
c21ce79893
|
Resolve conflicts.
|
2002-01-27 03:17:13 +00:00 |
|
Kris Kennaway
|
37b8c2dbf3
|
Resolve conflicts
|
2001-07-19 20:05:28 +00:00 |
|
Kris Kennaway
|
ae152dd3aa
|
Resolve conflicts, and garbage collect some local changes that are no
longer required
|
2000-11-13 02:20:29 +00:00 |
|
Kris Kennaway
|
7e7159cbdc
|
Resolve conflicts.
|
2000-04-13 07:15:03 +00:00 |
|
Kris Kennaway
|
ce600b6ae6
|
Fix breakage when NO_RSA specified.
Reviewed by: Ben Laurie <ben@openssl.org>
|
2000-01-14 05:24:08 +00:00 |
|
Kris Kennaway
|
7466462628
|
Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patent
infringement reasons.
|
2000-01-10 06:22:05 +00:00 |
|