Commit Graph

15 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
8dc8acfeef from http://www.openssl.org/source 2005-11-25 03:02:45 +00:00
christos
ed314b4eb0 from www.openssl.org 2005-04-23 19:10:56 +00:00
christos
684dfceb07 Resolve conflicts. 2005-03-25 20:14:24 +00:00
christos
e72fb54032 import openssl-0.9.7f from ftp.openssl.org 2005-03-25 19:05:51 +00:00
groo
5a374ad0ce Import OpenSSL 0.9.7d to address:
1. Null-pointer assignment during SSL handshake
	2. Out-of-bounds read affects Kerberos ciphersuites
2004-03-20 04:22:06 +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
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
itojun
0eb42056bd OpenSSL 0.9.6b 2001-07-11 03:54:20 +00:00
itojun
974c617dfe sync better with 0.9.6a. 2001-04-12 07:57:56 +00:00
itojun
75902e8d9b OpenSSL 0.9.6a 2001-04-12 03:10:36 +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