Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge conflicts. | markm | 2003-01-28 | 1 | -9/+11 |
| | | | | This is cunning doublespeak for "use vendor code". | ||||
* | Resolve conflicts. | nectar | 2002-08-10 | 1 | -1/+2 |
| | |||||
* | Resolve conflicts. | kris | 2002-01-27 | 1 | -2/+2 |
| | |||||
* | Resolve conflicts, and garbage collect some local changes that are no | kris | 2000-11-13 | 1 | -2/+2 |
| | | | | longer required | ||||
* | Resolve conflicts. | kris | 2000-04-13 | 1 | -2/+6 |
| | |||||
* | Fix breakage when NO_RSA specified. | kris | 2000-01-14 | 1 | -0/+5 |
| | | | | Reviewed by: Ben Laurie <ben@openssl.org> | ||||
* | Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patent | kris | 2000-01-10 | 1 | -0/+180 |
infringement reasons. |