aboutsummaryrefslogtreecommitdiff
path: root/crypto/openssl/ssl/s2_enc.c
Commit message (Expand)AuthorAgeFilesLines
* Resolve conflicts after import of OpenSSL 0.9.8e.Simon L. B. Nielsen2007-03-151-3/+6
* Resolve conflicts after import of OpenSSL 0.9.8b.Simon L. B. Nielsen2006-07-291-1/+1
* Resolve conflicts after import of OpenSSL 0.9.7d.Jacques Vidrine2004-03-171-1/+0
* Merge conflicts.Mark Murray2003-01-281-9/+11
* Resolve conflicts.Jacques Vidrine2002-08-101-1/+2
* Resolve conflicts.Kris Kennaway2002-01-271-2/+2
* Resolve conflicts, and garbage collect some local changes that are noKris Kennaway2000-11-131-2/+2
* Resolve conflicts.Kris Kennaway2000-04-131-2/+6
* Fix breakage when NO_RSA specified.Kris Kennaway2000-01-141-0/+5
* Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patentKris Kennaway2000-01-101-0/+180