10 Commits

Author	SHA1	Message	Date
christos	ed56312e8a	resolve conflicts.	2006-06-03 01:50:19 +00:00
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	31ed567522	resolve conflicts.	2005-04-23 19:31:14 +00:00
groo	4b32eb44a7	Resolve conflicts. In particular, prefer OpenSSL's BIO_strl* and ... BIO_strncpy over ours.	2004-03-20 04:32:34 +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	182c0b6e08	sync with 0.9.6f. prevents DoS attack and regen of manpages.	2002-08-08 23:47:34 +00:00
itojun	e9316c8858	apply patch supplied with OpenSSL Security Advisory [30 July 2002] ... advisory 1: four potentially remotely-exploitable vulnerability in SSL2/SSL3 code advisory 2: ASN1 parser vulnerability (all SSL/TLS apps affected)	2002-07-30 12:55:08 +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