summaryrefslogtreecommitdiff
path: root/lib/libcrypto/evp/p5_crpt2.c
AgeCommit message (Expand)Author
2014-04-13Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.Miod Vallat
2012-10-13resolve conflictsDamien Miller
2010-10-01resolve conflicts, fix local changesDamien Miller
2009-01-09resolve conflictsDamien Miller
2008-09-06resolve conflictsDamien Miller
2006-06-27resolve conflictsDamien Miller
2003-05-12merge 0.9.7b with local changes; crank majors for libssl/libcryptoMarkus Friedl
2002-09-10merge openssl-0.9.7-beta3, tested on vax by miod@Markus Friedl
2002-05-15OpenSSL 0.9.7 stable 2002 05 08 mergeBob Beck
2000-12-15openssl-engine-0.9.6 mergeBob Beck
1999-09-29import openssl-0.9.7-beta1Bob Beck