nectar
|
2283471bb5
|
Resolve conflicts after import of OpenSSL 0.9.7d.
|
2004-03-17 17:44:39 +00:00 |
|
markm
|
3f245d6325
|
Merge conflicts.
This is cunning doublespeak for "use vendor code".
|
2003-01-28 22:34:21 +00:00 |
|
kris
|
7b695f1ddd
|
Resolve conflicts.
|
2002-01-27 03:17:13 +00:00 |
|
kris
|
445c7928a1
|
Resolve conflicts
|
2001-05-20 03:17:35 +00:00 |
|
kris
|
4fef76e966
|
Resolve conflicts
|
2001-02-18 03:23:30 +00:00 |
|
kris
|
6b5aa79169
|
Resolve conflicts.
|
2000-04-13 07:15:03 +00:00 |
|
kris
|
728ac76565
|
Fix breakage when NO_RSA specified.
Reviewed by: Ben Laurie <ben@openssl.org>
|
2000-01-14 05:24:08 +00:00 |
|
kris
|
2e467dc342
|
Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patent
infringement reasons.
|
2000-01-10 06:22:05 +00:00 |
|