Commit Graph

11 Commits

Author SHA1 Message Date
lha 4d21efe5f7 Merge changes between heimdal-0.6 and heimdal-0.6.1 2004-04-02 14:59:46 +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
lha b224fef26e Fix up rcsid lossage 2003-05-15 21:36:30 +00:00
lha 28d69ea823 merge in heimdal 0.6 2003-05-15 20:44:06 +00:00
joda da086653ff resolve import conflicts 2002-09-12 13:18:49 +00:00
assar 5b9616a3e3 merge heimdal 0.4e 2001-09-17 12:32:33 +00:00
assar df54fb31c9 merge in conflicts after 0.3f import 2001-06-19 22:39:52 +00:00
assar be890e9bcf fix merge conflicts 2001-02-11 14:13:07 +00:00
assar 9949e16264 merge back some hacks 2000-08-03 03:38:25 +00:00
assar 7f5f475a8b import of heimdal 0.3a 2000-08-02 19:57:59 +00:00
thorpej 1af8b95994 Import Heimdal Kerberos 5 from cryptosrc-intl. 2000-06-16 18:31:35 +00:00