summaryrefslogtreecommitdiff
path: root/crypto
Commit message (Collapse)AuthorAgeFilesLines
* Incorrect length in calloc() call, already fixed upstream.Dag-Erling Smørgrav2015-12-171-1/+1
| | | | | | | | | PR: 204769 Submitted by: David Binderman <dcb314@hotmail.com> MFC after: 1 week Notes: svn path=/head/; revision=292408
* Merge OpenSSL 1.0.2e.Jung-uk Kim2015-12-03204-2375/+2568
|\ | | | | | | Notes: svn path=/head/; revision=291719
| * Import OpenSSL 1.0.2e.vendor/openssl/1.0.2eJung-uk Kim2015-12-03118-611/+1098
| | | | | | | | | | Notes: svn path=/vendor-crypto/openssl/dist/; revision=291707 svn path=/vendor-crypto/openssl/1.0.2e/; revision=291708; tag=vendor/openssl/1.0.2e
* | r291198 inadvertantly reverted a local patch for the default locationDag-Erling Smørgrav2015-11-261-2/+3
| | | | | | | | | | | | | | of ssh-askpass and xauth, breaking X11 forwarding. Notes: svn path=/head/; revision=291375
* | Revert inadvertent commit of an incorrect patchDag-Erling Smørgrav2015-11-241-2/+1
| | | | | | | | Notes: svn path=/head/; revision=291261
* | Remove description of the now-defunct NoneEnabled option.Dag-Erling Smørgrav2015-11-242-4/+2
| | | | | | | | Notes: svn path=/head/; revision=291260
* | Retire the NONE cipher option.Dag-Erling Smørgrav2015-11-2316-225/+4
| | | | | | | | Notes: svn path=/head/; revision=291198
* | Remove duplicate manual pages.Jung-uk Kim2015-11-162-5/+3
| | | | | | | | | | | | | | Reported by: brd Notes: svn path=/head/; revision=290947
* | Remove dead code.Dag-Erling Smørgrav2015-11-111-672/+0
| | | | | | | | Notes: svn path=/head/; revision=290674
* | One more $Mdocdate$Dag-Erling Smørgrav2015-11-111-1/+1
| | | | | | | | Notes: svn path=/head/; revision=290673
* | Remove /* $FreeBSD$ */ from files that already have __RCSID("$FreeBSD$").Dag-Erling Smørgrav2015-11-1125-25/+0
| | | | | | | | Notes: svn path=/head/; revision=290672
* | Now that we have mandoc, we can leave $Mdocdate$ tags as-is. Unfortunately,Dag-Erling Smørgrav2015-11-1113-22/+13
| | | | | | | | | | | | | | | | there is (currently) no way to make Subversion generate correct $Mdocdate$ tags, but perhas we can teach mandoc to read Subversion's %d format. Notes: svn path=/head/; revision=290671
* | Merge OpenSSL 1.0.2d.Jung-uk Kim2015-10-30488-13176/+94364
|\| | | | | | | Notes: svn path=/head/; revision=290207
| * Import OpenSSL 1.0.2d.vendor/openssl/1.0.2dJung-uk Kim2015-10-23299-8500/+77947
| | | | | | | | | | Notes: svn path=/vendor-crypto/openssl/dist/; revision=289848 svn path=/vendor-crypto/openssl/1.0.2d/; revision=289849; tag=vendor/openssl/1.0.2d
* | Fix OpenSSH multiple vulnerabilities by backporting three changesXin LI2015-08-253-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | from OpenSSH-portable master. Git revisions: 45b0eb752c94954a6de046bfaaf129e518ad4b5b 5e75f5198769056089fb06c4d738ab0e5abc66f7 d4697fe9a28dab7255c60433e4dd23cf7fce8a8b Reviewed by: des Security: FreeBSD-SA-15:22.openssh Notes: svn path=/head/; revision=287143
* | Fix multiple OpenSSH vulnerabilities.Xin LI2015-07-282-18/+33
| | | | | | | | | | | | | | | | | | Security: CVE-2014-2653 Security: CVE-2015-5600 Security: FreeBSD-SA-15:16.openssh Notes: svn path=/head/; revision=285975
* | ssh: canonicize the host name before looking it up in the host fileEric van Gyzen2015-07-161-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-apply r99054 by des in 2002. This was accidentally dropped by the update to OpenSSH 6.5p1 (r261320). This change is actually taken from r387082 of ports/security/openssh-portable/files/patch-ssh.c PR: 198043 Differential Revision: https://reviews.freebsd.org/D3103 Reviewed by: des Approved by: kib (mentor) MFC after: 3 days Relnotes: yes Sponsored by: Dell Inc. Notes: svn path=/head/; revision=285642
* | Merge OpenSSL 1.0.1p.Jung-uk Kim2015-07-0921-233/+475
|\| | | | | | | Notes: svn path=/head/; revision=285329
| * Import OpenSSL 1.0.1p.vendor/openssl/1.0.1pJung-uk Kim2015-07-0911-201/+420
| | | | | | | | | | Notes: svn path=/vendor-crypto/openssl/dist/; revision=285327 svn path=/vendor-crypto/openssl/1.0.1p/; revision=285328; tag=vendor/openssl/1.0.1p
* | Merge OpenSSL 1.0.1o.Jung-uk Kim2015-06-129-25/+34
|\| | | | | | | Notes: svn path=/head/; revision=284329
| * Import OpenSSL 1.0.1o.vendor/openssl/1.0.1oJung-uk Kim2015-06-124-17/+16
| | | | | | | | | | Notes: svn path=/vendor-crypto/openssl/dist/; revision=284327 svn path=/vendor-crypto/openssl/1.0.1o/; revision=284328; tag=vendor/openssl/1.0.1o
* | Merge OpenSSL 1.0.1n.Jung-uk Kim2015-06-11204-903/+2348
|\| | | | | | | Notes: svn path=/head/; revision=284283
| * Import OpenSSL 1.0.1n.vendor/openssl/1.0.1nJung-uk Kim2015-06-11131-268/+797
| | | | | | | | | | Notes: svn path=/vendor-crypto/openssl/dist/; revision=284278 svn path=/vendor-crypto/openssl/1.0.1n/; revision=284279; tag=vendor/openssl/1.0.1n
* | Import new moduli from OpenBSD. Although there is no reason to distrustDag-Erling Smørgrav2015-05-261-261/+275
| | | | | | | | | | | | | | | | | | the current set, it is good hygiene to change them once in a while. MFC after: 1 week Notes: svn path=/head/; revision=283578
* | Use proper CHAN_TCP_PACKET_DEFAULT for agent forwarding when HPN disabled.Bryan Drewery2015-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of CHAN_TCP_WINDOW_DEFAULT here was fixed in upstream OpenSSH in CVS 1.4810, git 5baa170d771de9e95cf30b4c469ece684244cf3e: - dtucker@cvs.openbsd.org 2007/12/28 22:34:47 [clientloop.c] Use the correct packet maximum sizes for remote port and agent forwarding. Prevents the server from killing the connection if too much data is queued and an excessively large packet gets sent. bz #1360, ok djm@. The change was lost due to the the way the original upstream HPN patch modified this code. It was re-adding the original OpenSSH code and never was properly fixed to use the new value. MFC after: 2 weeks Notes: svn path=/head/; revision=280999
* | Document "none" for VersionAddendum.Bryan Drewery2015-03-232-2/+8
| | | | | | | | | | | | | | | | PR: 193127 MFC after: 2 weeks Notes: svn path=/head/; revision=280360
* | Merge OpenSSL 1.0.1m.Jung-uk Kim2015-03-201009-268251/+272049
|\| | | | | | | Notes: svn path=/head/; revision=280297
| * Import OpenSSL 1.0.1m.vendor/openssl/1.0.1mJung-uk Kim2015-03-20804-170246/+173958
| | | | | | | | | | Notes: svn path=/vendor-crypto/openssl/dist/; revision=280288 svn path=/vendor-crypto/openssl/1.0.1m/; revision=280289; tag=vendor/openssl/1.0.1m
* | Merge OpenSSL 1.0.1l.Jung-uk Kim2015-01-1611-17/+27
|\| | | | | | | | | | | | | | | MFC after: 1 week Relnotes: yes Notes: svn path=/head/; revision=277270
| * Import OpenSSL 1.0.1l.vendor/openssl/1.0.1lJung-uk Kim2015-01-165-13/+12
| | | | | | | | | | Notes: svn path=/vendor-crypto/openssl/dist/; revision=277266 svn path=/vendor-crypto/openssl/1.0.1l/; revision=277267; tag=vendor/openssl/1.0.1l
* | MFV: r276862Jung-uk Kim2015-01-092-2/+2
|\| | | | | | | | | | | | | Fix build. Notes: svn path=/head/; revision=276863
| * Fix build failure on Windows due to undefined cflags identifier.Jung-uk Kim2015-01-091-1/+1
| | | | | | | | | | | | | | https://github.com/openssl/openssl/commit/5c5e7e1a7eb114cf136e1ae4b6a413bc48ba41eb Notes: svn path=/vendor-crypto/openssl/dist/; revision=276862
* | Merge OpenSSL 1.0.1k.Jung-uk Kim2015-01-08108-3630/+1760
|\| | | | | | | Notes: svn path=/head/; revision=276861
| * Import OpenSSL 1.0.1k.vendor/openssl/1.0.1kJung-uk Kim2015-01-0846-2888/+616
| | | | | | | | | | Notes: svn path=/vendor-crypto/openssl/dist/; revision=276856 svn path=/vendor-crypto/openssl/1.0.1k/; revision=276858; tag=vendor/openssl/1.0.1k
* | Merge OpenSSL 1.0.1j.Jung-uk Kim2014-10-1579-613/+1824
|\| | | | | | | Notes: svn path=/head/; revision=273144
| * Import OpenSSL 1.0.1j.vendor/openssl/1.0.1jJung-uk Kim2014-10-1537-205/+981
| | | | | | | | | | Notes: svn path=/vendor-crypto/openssl/dist/; revision=273138 svn path=/vendor-crypto/openssl/1.0.1j/; revision=273139; tag=vendor/openssl/1.0.1j
* | Include the gssapi_krb5 library in KRB5_LDFLAGS.Glen Barber2014-09-081-1/+1
| | | | | | | | | | | | | | | | | | PR: 156245 MFC after: 3 days Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=271284
* | Merge OpenSSL 1.0.1i.Jung-uk Kim2014-08-07158-4989/+3288
|\| | | | | | | Notes: svn path=/head/; revision=269682
| * Import OpenSSL 1.0.1i.vendor/openssl/1.0.1iJung-uk Kim2014-08-0773-4763/+2063
| | | | | | | | | | Notes: svn path=/vendor-crypto/openssl/dist/; revision=269670 svn path=/vendor-crypto/openssl/1.0.1i/; revision=269671; tag=vendor/openssl/1.0.1i
* | Merge OpenSSL 1.0.1h.Jung-uk Kim2014-06-0966-141/+824
|\| | | | | | | | | | | | | Approved by: so (delphij) Notes: svn path=/head/; revision=267256
| * Import OpenSSL 1.0.1h.vendor/openssl/1.0.1hJung-uk Kim2014-06-0622-39/+81
| | | | | | | | | | | | | | | | Approved by: so (delphij) Notes: svn path=/vendor-crypto/openssl/dist/; revision=267188 svn path=/vendor-crypto/openssl/1.0.1h/; revision=267189; tag=vendor/openssl/1.0.1h
* | Fix OpenSSL multiple vulnerabilities.Xin LI2014-06-055-3/+36
| | | | | | | | | | | | | | | | | | | | Security: CVE-2014-0195, CVE-2014-0221, CVE-2014-0224, CVE-2014-3470 Security: SA-14:14.openssl Approved by: so Notes: svn path=/head/; revision=267102
* | Change comment about HPNDisabled to match the style of other options toSteven Hartland2014-05-201-1/+1
| | | | | | | | | | | | | | | | | | avoid confusion. Sponsored by: Multiplay Notes: svn path=/head/; revision=266465
* | Fix OpenSSL NULL pointer deference vulnerability.Xin LI2014-05-131-0/+4
| | | | | | | | | | | | | | | | | | Obtained from: OpenBSD Security: FreeBSD-SA-14:09.openssl Security: CVE-2014-0198 Notes: svn path=/head/; revision=265985
* | Fix OpenSSL use-after-free vulnerability.Xin LI2014-04-301-1/+1
| | | | | | | | | | | | | | | | | | Obtained from: OpenBSD Security: FreeBSD-SA-14:09.openssl Security: CVE-2010-5298 Notes: svn path=/head/; revision=265120
* | Apply upstream patch for EC calculation bug and bump version addendum.Dag-Erling Smørgrav2014-04-2010-9/+35
|\ \ | | | | | | | | | Notes: svn path=/head/; revision=264691
* | | NO_MAN= has been deprecated in favor of MAN= for some time, go aheadWarner Losh2014-04-135-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | and finish the job. ncurses is now the only Makefile in the tree that uses it since it wasn't a simple mechanical change, and will be addressed in a future commit. Notes: svn path=/head/; revision=264400
* | | Restore the pX part to the version number printed in debugging mode.Dag-Erling Smørgrav2014-04-091-1/+1
| | | | | | | | | | | | Notes: svn path=/head/; revision=264308
* | | Merge OpenSSL 1.0.1g.Jung-uk Kim2014-04-0854-81/+311
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Approved by: benl (maintainer) Notes: svn path=/head/; revision=264278
| * | Import OpenSSL 1.0.1g.vendor/openssl/1.0.1gJung-uk Kim2014-04-0816-28/+189
| | | | | | | | | | | | | | | | | | | | | | | | Approved by: benl (maintainer) Notes: svn path=/vendor-crypto/openssl/dist/; revision=264271 svn path=/vendor-crypto/openssl/1.0.1g/; revision=264272; tag=vendor/openssl/1.0.1g