Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Remove the "sureware" engine: | reyk | 2014-04-13 | 3 | -5/+0 | |
| | | | | | | | | | | | | The vendor_defns/sureware.h file by Baltimore Technologies Ltd. has a copyright that does not grant rights! Vendor files should either include a compatible license in the copyright statement or use OpenSSL's defaults, but adding a copyright statement without any terms is not acceptable. It should not have been included in the first place. ok deraadt@ | |||||
* | Remove the Broadcom ubsec engine: | reyk | 2014-04-13 | 4 | -6/+0 | |
| | | | | | | | | | | | | | The vendor_defns/hw_ubsec.h file has a copyright that does not grant rights! Vendor files should either include a compatible license in the copyright statement or use OpenSSL's defaults, but adding a copyright statement without any terms is not acceptable. It should not have been included in the first place. (The ubsec(4) kernel driver is not affected by this change) ok deraadt@ | |||||
* | Remove the IBM 4758 engine: we don't have this hardware and it is an | reyk | 2014-04-13 | 4 | -6/+0 | |
| | | | | | | old PCI accelerator that was EOL'ed in 2005. ok deraadt@ | |||||
* | Don't edit on cvs. 23.1 as intended. | miod | 2014-04-13 | 2 | -4/+4 | |
| | ||||||
* | Do not install e_os.h, it is not an external header and should not be used | miod | 2014-04-13 | 1 | -2/+1 | |
| | | | | by anything in userland. | |||||
* | Move undocumented internal OPENSSL_DIR interface from libcrypto to libssl, | miod | 2014-04-13 | 9 | -727/+2 | |
| | | | | | | so that libssl no longer need to access the non-external headers of libcrypto to build. No library bump, riding upon the recent update. | |||||
* | Crank libcrypto minor (addition of BN_consttime_swap and CRYPTO_memcmp) | miod | 2014-04-13 | 2 | -2/+2 | |
| | | | | and libssl major (ssl_check_clienthello_tlsext split into two functions) | |||||
* | No longer define OPENSSL_NO_EC_NISTP_64_GCC_128 on amd64; requested by djm | miod | 2014-04-13 | 2 | -6/+0 | |
| | ||||||
* | Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery. | miod | 2014-04-13 | 105 | -3260/+788 | |
| | ||||||
* | This commit was generated by cvs2git to track changes on a CVS vendor | miod | 2014-04-13 | 67 | -276/+632 | |
|\ | | | | | branch. | |||||
| * | Import OpenSSL 1.0.1g | miod | 2014-04-13 | 148 | -568/+1532 | |
| | | ||||||
* | | This commit was generated by cvs2git to track changes on a CVS vendor | miod | 2014-04-13 | 12 | -418/+1346 | |
|\ \ | | | | | | | branch. | |||||
| * | | Import OpenSSL 1.0.1g | miod | 2014-04-13 | 15 | -431/+1355 | |
| | | | ||||||
* | | | This commit was generated by cvs2git to track changes on a CVS vendor | miod | 2014-04-13 | 2 | -2/+8 | |
|\ \ \ | | | | | | | | | branch. | |||||
| * | | | Import OpenSSL 1.0.1g | miod | 2014-04-13 | 15 | -153/+507 | |
| | | | | ||||||
* | | | | Move build machinery for libcrypto from libssl/crypto to libcrypto, as well | miod | 2014-04-11 | 37 | -0/+13153 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as configuration files; split manpages and .pc files between libcrypto and libssl. No functional change, only there to make engineering easier, and libcrypto sources are still found in libssl/src/crypto at the moment. ok reyk@, also discussed with deraadt@ beck@ and the usual crypto suspects. | |||||
* | | | | prepare manpages for new perl. | espie | 2014-03-18 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that I missed two of these in the diff shown initially, thx to the atrocious Makefile rule... okay millert@, sthen@, basically | |||||
* | | | | Reliability fix for SHA384 SSL/TLS ciphers on strict alignment | jca | 2013-12-19 | 1 | -1/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | architectures. ok miod@ djm@ Upstream patch: commit cdd1acd788020d2c525331da1712ada778f1373c Author: Andy Polyakov <appro@openssl.org> Date: Wed Dec 18 21:27:35 2013 +0100 | |||||
* | | | | Switch to using unhyphenated VIA padlock mnemonics. VIA abandoned the | matthew | 2013-05-30 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hyphen in their official programming guide sometime between 2003 and 2005, and Clang's integrated assembler does not support hyphenated mnemonics. ok jsg, deraadt | |||||
* | | | | cherry pick bugfixes for http://www.openssl.org/news/secadv_20130205.txt | markus | 2013-02-14 | 5 | -42/+216 | |
| | | | | | | | | | | | | | | | | | | | | from the openssl git (changes between openssl 1.0.1c and 1.0.1d). ok djm@ | |||||
* | | | | remove ACSS, crank libcrypto major; ok markus@ deraadt@ | djm | 2013-01-26 | 5 | -402/+0 | |
| | | | | ||||||
* | | | | On amd64 OPENSSL_cpuid_setup and OPENSSL_ia32cap_P are now hidden so we don't | kettenis | 2012-10-31 | 4 | -9/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | have to go through the PLT/GOT to get at them anymore. In fact going through the GOT now fails since we no longer have a GOT entry for OPENSSL_ia32cap_P. Fixes the problem spotted by jasper@ and sthen@. Based on a diff from mikeb@ who did most of the actual work of tracking down the issue. ok millert@, mikeb@ | |||||
* | | | | Restore r1.10, lost during last update: | miod | 2012-10-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Disable use of dladdr() on a.out arches, they do not provide it (yet); | |||||
* | | | | import files that CVS missed; sigh | djm | 2012-10-13 | 5 | -0/+749 | |
| | | | | ||||||
* | | | | resolve conflicts | djm | 2012-10-13 | 195 | -2795/+10581 | |
| | | | | ||||||
* | | | | This commit was generated by cvs2git to track changes on a CVS vendor | djm | 2012-10-13 | 14 | -37/+149 | |
|\| | | | | | | | | | | | branch. | |||||
| * | | | import OpenSSL-1.0.1c | djm | 2012-10-13 | 49 | -363/+1531 | |
| | | | | ||||||
| * | | | OpenSSL 1.0.0f: import upstream source | djm | 2012-01-05 | 1 | -34/+74 | |
| | | | | ||||||
* | | | | This commit was generated by cvs2git to track changes on a CVS vendor | djm | 2012-10-13 | 26 | -28/+3761 | |
|\ \ \ \ | | |/ / | |/| | | branch. | |||||
| * | | | import OpenSSL-1.0.1c | djm | 2012-10-13 | 30 | -51/+3915 | |
| | | | | ||||||
* | | | | This commit was generated by cvs2git to track changes on a CVS vendor | djm | 2012-10-13 | 151 | -1402/+47784 | |
|\ \ \ \ | | |_|/ | |/| | | branch. | |||||
| * | | | import OpenSSL-1.0.1c | djm | 2012-10-13 | 317 | -3954/+57335 | |
| | | | | ||||||
* | | | | When deciding whether we're PIC in a (generated) asm file, check for both PIC | pascal | 2012-08-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | and __PIC__ defines. Makes things easier for PIE. ok djm@ | |||||
* | | | | cherrypick fix for CVE-2012-2110: libcrypto ASN.1 parsing heap overflow | djm | 2012-04-19 | 3 | -14/+61 | |
| | | | | | | | | | | | | | | | | ok miod@ deraadt@ | |||||
* | | | | OpenSSL 1.0.0f: merge | djm | 2012-01-05 | 10 | -130/+256 | |
| | | | | ||||||
* | | | | This commit was generated by cvs2git to track changes on a CVS vendor | djm | 2012-01-05 | 2 | -2/+4 | |
|\| | | | | | | | | | | | branch. | |||||
| * | | | OpenSSL 1.0.0f: import upstream source | djm | 2012-01-05 | 10 | -58/+101 | |
| | | | | ||||||
* | | | | This commit was generated by cvs2git to track changes on a CVS vendor | djm | 2012-01-05 | 1 | -7/+78 | |
|\ \ \ \ | | |/ / | |/| | | branch. | |||||
| * | | | OpenSSL 1.0.0f: import upstream source | djm | 2012-01-05 | 2 | -47/+163 | |
| | | | | ||||||
* | | | | openssl-1.0.0e: resolve conflicts | djm | 2011-11-03 | 75 | -461/+822 | |
| | | | | ||||||
* | | | | This commit was generated by cvs2git to track changes on a CVS vendor | djm | 2011-11-03 | 2 | -2/+198 | |
|\ \ \ \ | | |_|/ | |/| | | branch. | |||||
| * | | | import OpenSSL 1.0.0e | djm | 2011-11-03 | 13 | -179/+627 | |
| | | | | ||||||
* | | | | This commit was generated by cvs2git to track changes on a CVS vendor | djm | 2011-11-03 | 29 | -370/+682 | |
|\ \ \ \ | | |_|/ | |/| | | branch. | |||||
| * | | | import OpenSSL 1.0.0e | djm | 2011-11-03 | 91 | -637/+1053 | |
| | | | | ||||||
* | | | | This commit was generated by cvs2git to track changes on a CVS vendor | djm | 2011-11-03 | 8 | -30/+119 | |
|\ \ \ \ | | |_|/ | |/| | | branch. | |||||
| * | | | import OpenSSL 1.0.0e | djm | 2011-11-03 | 10 | -46/+140 | |
| | | | | ||||||
* | | | | move CRYPTO_VIAC3_MAX out of cryptodev.h and into the only | jsg | 2010-12-16 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | file it will be used from. requested by/ok mikeb@ | |||||
* | | | | The VIA ciphers are added to an array of CRYPTO_ALGORITHM_MAX length | jsg | 2010-12-16 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | which should have been declared as CRYPTO_ALGORITHM_MAX + 1, fix this and reserve enough space for the VIA additions as well. ok/comments from mikeb & deraadt | |||||
* | | | | Disable use of dladdr() on a.out arches, they do not provide it (yet); ok djm@ | miod | 2010-10-18 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | More OpenSSL fixes: | djm | 2010-10-06 | 3 | -12/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update local engines for the EVP API change (len u_int => size_t) - Use hw_cryptodev.c instead of eng_cryptodev.c - Make x86_64-xlate.pl always write to the output file and not stdout, fixing "make -j" builds (spotted by naddy@) ok naddy@ |