Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery. | miod | 2014-04-13 | 1 | -1516/+0 |
| | |||||
* | resolve conflicts | djm | 2012-10-13 | 1 | -14/+23 |
| | |||||
* | openssl-1.0.0e: resolve conflicts | djm | 2011-11-03 | 1 | -84/+255 |
| | |||||
* | resolve conflicts, fix local changes | djm | 2010-10-01 | 1 | -84/+100 |
| | |||||
* | AES-NI engine support for OpenSSL. | thib | 2010-07-01 | 1 | -1/+2 |
| | | | | | | | | | | This is code mostly picked up from upstream OpenSSL, or to be more exact a diff from David Woodhouse <dwmw2 at infradead dot org>. Remember to make includes before doing a build! no objections from djm@ OK deraadt@, reyk@ (AES is about 4.25x faster on his x201 now) | ||||
* | resolve conflicts | djm | 2009-04-06 | 1 | -4/+4 |
| | |||||
* | resolve conflicts | djm | 2009-01-09 | 1 | -12/+14 |
| | |||||
* | resolve conflicts | djm | 2008-09-06 | 1 | -25/+43 |
| | |||||
* | resolve conflicts | djm | 2006-06-27 | 1 | -4/+19 |
| | |||||
* | resolve conflicts | djm | 2005-04-29 | 1 | -4/+4 |
| | |||||
* | merge 0.9.7b with local changes; crank majors for libssl/libcrypto | markus | 2003-05-12 | 1 | -286/+58 |
| | |||||
* | merge with openssl-0.9.7-stable-SNAP-20020911, | markus | 2002-09-14 | 1 | -5/+5 |
| | | | | | new minor for libcrypto (_X509_REQ_print_ex) tested by miod@, pb@ | ||||
* | Merge OpenSSL 0.9.7-stable-20020605, | beck | 2002-06-07 | 1 | -5/+35 |
| | | | | correctly autogenerate obj_mac.h | ||||
* | OpenSSL 0.9.7 stable 2002 05 08 merge | beck | 2002-05-15 | 1 | -61/+54 |
| | |||||
* | openssl-engine-0.9.6a merge | beck | 2001-06-22 | 1 | -1/+1 |
| | |||||
* | openssl-engine-0.9.6 merge | beck | 2000-12-15 | 1 | -29/+34 |
| | |||||
* | OpenSSL 0.9.5a merge | beck | 2000-04-15 | 1 | -3/+4 |
| | |||||
* | OpenSSL 0.9.5 merge | beck | 2000-03-19 | 1 | -87/+352 |
| | | | | | | *warning* this bumps shared lib minors for libssl and libcrypto from 2.1 to 2.2 if you are using the ssl26 packages for ssh and other things to work you will need to get new ones (see ~beck/libsslsnap/<arch>) on cvs or ~beck/src-patent.tar.gz on cvs | ||||
* | OpenSSL 0.9.4 merge | beck | 1999-09-29 | 1 | -0/+1218 |