Jacques Vidrine
def0b8c9c5
Resolve conflicts after import of OpenSSL 0.9.7a.
2003-02-19 23:24:16 +00:00
Mark Murray
bff3688511
Merge conflicts.
...
This is cunning doublespeak for "use vendor code".
2003-01-28 22:34:21 +00:00
Jacques Vidrine
b325c11869
Resolve conflicts after import of OpenSSL 0.9.6d.
2002-07-30 12:46:49 +00:00
Kris Kennaway
37b8c2dbf3
Resolve conflicts
2001-07-19 20:05:28 +00:00
Kris Kennaway
f06df90bde
Resolve conflicts
2001-05-20 03:17:35 +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
Peter Wemm
9fa5f5fd96
Merge from internat.freebsd.org repo, minus change to rsa_eay.c (missing)
...
Reorganize and unify libcrypto's interface so that the RSA implementation
is chosen at runtime via dlopen().
This is a checkpoint and may require more tweaks still.
2000-02-26 13:13:03 +00:00
Kris Kennaway
d9d4eec9ea
Fix for missing symbol in -DRSAref case.
2000-01-16 04:45:18 +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