summaryrefslogtreecommitdiffstats
path: root/crypto
Commit message (Collapse)AuthorAgeFilesLines
* Merge OpenSSL 1.0.1h.jkim2014-06-0966-141/+824
|\ | | | | | | Approved by: so (delphij)
| * Import OpenSSL 1.0.1h.jkim2014-06-0622-39/+81
| | | | | | | | Approved by: so (delphij)
| * Import OpenSSL 1.0.1g.jkim2014-04-0816-28/+189
| | | | | | | | Approved by: benl (maintainer)
| * Import OpenSSL 1.0.1f.jkim2014-01-2255-613/+847
| | | | | | | | Approved by: so (delphij), benl (silence)
* | Fix OpenSSL multiple vulnerabilities.delphij2014-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
* | Change comment about HPNDisabled to match the style of other options tosmh2014-05-201-1/+1
| | | | | | | | | | | | avoid confusion. Sponsored by: Multiplay
* | Fix OpenSSL NULL pointer deference vulnerability.delphij2014-05-131-0/+4
| | | | | | | | | | | | Obtained from: OpenBSD Security: FreeBSD-SA-14:09.openssl Security: CVE-2014-0198
* | Fix OpenSSL use-after-free vulnerability.delphij2014-04-301-1/+1
| | | | | | | | | | | | Obtained from: OpenBSD Security: FreeBSD-SA-14:09.openssl Security: CVE-2010-5298
* | Apply upstream patch for EC calculation bug and bump version addendum.des2014-04-2010-9/+35
| |
* | NO_MAN= has been deprecated in favor of MAN= for some time, go aheadimp2014-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.
* | Restore the pX part to the version number printed in debugging mode.des2014-04-091-1/+1
| |
* | Merge OpenSSL 1.0.1g.jkim2014-04-0854-81/+311
| | | | | | | | Approved by: benl (maintainer)
* | Fix NFS deadlock vulnerability. [SA-14:05]delphij2014-04-085-24/+106
| | | | | | | | | | Fix "Heartbleed" vulnerability and ECDSA Cache Side-channel Attack in OpenSSL. [SA-14:06]
* | Upgrade to OpenSSH 6.6p1.des2014-03-25123-2462/+1520
|\ \
* | | Add a pre-merge script which reverts mechanical changes such as addeddes2014-03-2433-63/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $FreeBSD$ tags and man page dates. Add a post-merge script which reapplies these changes. Run both scripts to normalize the existing code base. As a result, many files which should have had $FreeBSD$ tags but didn't now have them. Partly rewrite the upgrade instructions and remove the now outdated list of tricks.
* | | Update most userspace consumers of capability.h to use capsicum.h instead.rwatson2014-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | auditdistd is not updated as I will make the change upstream and then do a vendor import sometime in the next week or two. MFC after: 3 weeks
* | | Fix installations that use kernels without CAPABILITIES support.pjd2014-02-041-2/+4
| | | | | | | | | | | | Approved by: des
* | | Turn sandboxing on by default.des2014-02-013-3/+3
| | |
* | | Upgrade to OpenSSH 6.5p1.des2014-01-31204-4432/+13542
|\ \ \ | |/ /
* | | Merge OpenSSL 1.0.1f.jkim2014-01-22109-849/+1485
| | | | | | | | | | | | Approved by: so (delphij), benl (silence)
* | | MFV r260399:delphij2014-01-075-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply vendor commits: 197e0ea Fix for TLS record tampering bug. (CVE-2013-4353). 3462896 For DTLS we might need to retransmit messages from the previous session so keep a copy of write context in DTLS retransmission buffers instead of replacing it after sending CCS. (CVE-2013-6450). ca98926 When deciding whether to use TLS 1.2 PRF and record hash algorithms use the version number in the corresponding SSL_METHOD structure instead of the SSL structure. The SSL structure version is sometimes inaccurate. Note: OpenSSL 1.0.2 and later effectively do this already. (CVE-2013-6449). Security: CVE-2013-4353 Security: CVE-2013-6449 Security: CVE-2013-6450
* | | Apply patch from upstream Heimdal for encoding fixbjk2013-12-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RFC 4402 specifies the implementation of the gss_pseudo_random() function for the krb5 mechanism (and the C bindings therein). The implementation uses a PRF+ function that concatenates the output of individual krb5 pseudo-random operations produced with a counter and seed. The original implementation of this function in Heimdal incorrectly encoded the counter as a little-endian integer, but the RFC specifies the counter encoding as big-endian. The implementation initializes the counter to zero, so the first block of output (16 octets, for the modern AES enctypes 17 and 18) is unchanged. (RFC 4402 specifies that the counter should begin at 1, but both existing implementations begin with zero and it looks like the standard will be re-issued, with test vectors, to begin at zero.) This is upstream's commit f85652af868e64811f2b32b815d4198e7f9017f6, from 13 October, 2013: % Fix krb5's gss_pseudo_random() (n is big-endian) % % The first enctype RFC3961 prf output length's bytes are correct because % the little- and big-endian representations of unsigned zero are the % same. The second block of output was wrong because the counter was not % being encoded as big-endian. % % This change could break applications. But those applications would not % have been interoperating with other implementations anyways (in % particular: MIT's). Approved by: hrs (mentor, src committer) MFC after: 3 days
* | | MFV r257952:delphij2013-11-1126-54/+70
| | | | | | | | | | | | | | | | | | | | | | | | Upgrade to OpenSSH 6.4p1. Bump VersionAddendum. Approved by: des
* | | Unbreak the WITHOUT_KERBEROS build and try to reduce the odds of ades2013-09-236-17/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | repeat performance by introducing a script that runs configure with and without Kerberos, diffs the result and generates krb5_config.h, which contains the preprocessor macros that need to be defined in the Kerberos case and undefined otherwise. Approved by: re (marius)
* | | Pull in all the OpenSSH bits that we'd previously left out because wedes2013-09-21146-0/+43001
|\ \ \ | |/ / | | | | | | | | | | | | | | | didn't use them. This will make future merges from the vendor tree much easier. Approved by: re (gjb)
* | | Upgrade to 6.3p1.des2013-09-21154-2393/+4264
|\ \ \ | |/ / | | | | | | Approved by: re (gjb)
* | | Change the default value of VerifyHostKeyDNS to "yes" if compiled withdes2013-09-103-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | LDNS. With that setting, OpenSSH will silently accept host keys that match verified SSHFP records. If an SSHFP record exists but could not be verified, OpenSSH will print a message and prompt the user as usual. Approved by: re (blanket)
* | | These three files appeared in 6.0p1, which was imported into the vendordes2013-09-093-0/+558
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | branch but never merged to head. They were inadvertantly left out when 6.1p1 was merged to head. It didn't make any difference at the time, because they were unused, but one of them is required for DNS-based host key verification. Approved by: re (blanket)
* | | Apply upstream revision 1.151 (fix relative symlinks)des2013-08-131-1/+2
| | | | | | | | | | | | MFC after: 3 days
* | | MFV r254106 (OpenSSL bugfix for RT #2984):delphij2013-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check DTLS_BAD_VER for version number. The version check for DTLS1_VERSION was redundant as DTLS1_VERSION > TLS1_1_VERSION, however we do need to check for DTLS1_BAD_VER for compatibility. Requested by: zi Approved by: benl
* | | Fix gssapi/gssapi_krb5.h after Heimdal 1.5.1 import.hrs2013-06-301-1/+1
| | | | | | | | | | | | Reviewed by: dfr
* | | r251088 reverted the default value for UsePrivilegeSeparation fromdes2013-06-282-2/+2
| | | | | | | | | | | | "sandbox" to "yes", but did not update the documentation to match.
* | | Revert a local change that sets the default for UsePrivilegeSeparation todes2013-05-291-1/+1
| | | | | | | | | | | | | | | | | | "sandbox" instead of "yes". In sandbox mode, the privsep child is unable to load additional libraries and will therefore crash when trying to take advantage of crypto offloading on CPUs that support it.
* | | Have the ipropd-master listen on an IPv6 socket in addition to an IPv4bz2013-05-181-6/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | socket to allow propagation of changes to a Heimdal Kerberos database from the KDC master to the slave(s) work on IPv6 as well. Update the stats logging to also handle IPv6 addresses. Reported by: peter (found on FreeBSD cluster) X-to-be-tested-by: peter MFC after: 3 weeks
* | | Upgrade to OpenSSH 6.2p2. Mostly a no-op since I had already patcheddes2013-05-1712-30/+65
| | | | | | | | | | | | the issues that affected us.
* | | The HPN patch added a new BUG bit for SSH_BUG_LARGEWINDOWbdrewery2013-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and the update to 6.1 added SSH_BUG_DYNAMIC_RPORT with the same value. Fix the HPN SSH_BUG_LARGEWINDOW bit so it is unique. Approved by: des MFC after: 2 weeks
* | | Merge updated "no such identity file" patch.des2013-04-243-34/+29
| | | | | | | | | | | | PR: bin/178060
* | | Silence "received disconnect" in the common case.des2013-04-141-2/+6
| | |
* | | Merge upstream patch to silence spurious "no such identity file" warnings.des2013-04-024-14/+29
| | |
* | | Silence printf format warnings.des2013-04-021-5/+10
| | |
* | | Silence warnings about redefined macros.des2013-04-011-0/+4
| | |
* | | Revert r247892 now that this has been fixed upstream.des2013-03-231-1/+0
| | |
* | | Upgrade to OpenSSH 6.2p1. The most important new features are supportdes2013-03-2294-1239/+4986
|\ \ \ | |/ / | | | | | | for a key revocation list and more fine-grained authentication control.
* | | Keep the default AuthorizedKeysFile setting. Although authorized_keys2des2013-03-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | has been deprecated for a while, some people still use it and were unpleasantly surprised by this change. I may revert this commit at a later date if I can come up with a way to give users who still have authorized_keys2 files sufficient advance warning. MFC after: ASAP
* | | Unlike OpenBSD's, our setusercontext() will intentionally ignore the user'sdes2013-03-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | own umask setting (from ~/.login.conf) unless running with the user's UID. Therefore, we need to call it again with LOGIN_SETUMASK after changing UID. PR: bin/176740 Submitted by: John Marshall <john.marshall@riverwillow.com.au> MFC after: 1 week
* | | Partially revert r247892 and r247904 since our strnvis() does notdes2013-03-072-2/+5
| | | | | | | | | | | | behave the way OpenSSH expects.
* | | Remove strnvis(), strvis(), strvisx().des2013-03-061-3/+0
| | |
* | | Explicitly disable lastlog, utmp and wtmp.des2013-03-062-8/+44
| | |
* | | Import change 6d783560e4aad1e680097d11e89755647a5aba87 from upstreamdim2013-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | heimdal: fix sizeof(uuid) Found by: clang ToT Reviewed by: stas
* | | Merge OpenSSL 1.0.1e.jkim2013-02-13174-871/+2669
|\ \ \ | | |/ | |/| | | | Approved by: secteam (simon), benl (silence)
OpenPOWER on IntegriCloud