Commit Graph

9 Commits

Author SHA1 Message Date
christos 50a9cbc98b Resolve conflicts:
1. Instead of trying to cleanup the ugly ifdefs, we leave them alone so that
   there are going to be fewer conflicts in the future.
2. Where we make changes to override things #ifdef __NetBSD__ around them
   so that it is clear what we are changing. This is still missing in some
   places, notably in opensslconf.h because it would make things messier.
2005-11-25 19:14:11 +00:00
christos 684dfceb07 Resolve conflicts. 2005-03-25 20:14:24 +00:00
itojun f4401cd869 upgrade openssl to 0.9.7b. (AES is now supported)
alter des.h to be friendly with openssl/des.h (you can include both in the
same file)
make libkrb to depend on libdes.  bump major.
massage various portioin of heimdal to be friendly with openssl 0.9.7b.
2003-07-24 14:16:30 +00:00
itojun 2836295a36 OpenSSL 0.9.7b, major API changes included 2003-07-24 08:25:41 +00:00
itojun ef920a0913 sync with 0.9.6e. 2002-07-31 01:29:37 +00:00
itojun 25e766824a OpenSSL 0.9.6e. includes major security fixes (already applied) 2002-07-30 23:57:34 +00:00
itojun 7720435b28 openssl 0.9.6d 2002-06-09 15:21:32 +00:00
mrg 2429f6a29f OpenSSL 0.9.5a import. 2000-07-16 05:03:53 +00:00
thorpej 1dc0dc5fb1 Import OpenSSL 0.9.4 from netbsd-cryptosrc-intl. 2000-06-14 22:44:19 +00:00