Commit Graph

366 Commits

Author SHA1 Message Date
des
629436fac8 MFH (r296633): upgrade to 7.2p2 (fixes xauth command injection bug)
MFH (r296634): re-add aes-cbc to server-side default cipher list
MFH (r296651, r296657): fix gcc build of pam_ssh

PR:		207679
Security:       CVE-2016-3115
2016-03-12 23:53:20 +00:00
jkim
86f5b30ace Re-enable SSLv2 support to restore ABI.
Excerpt from CHANGES:

    Even if "enable-ssl2" is used, users who want to negotiate SSLv2 via
    the version-flexible SSLv23_method() will need to explicitly call
    either of:

	SSL_CTX_clear_options(ctx, SSL_OP_NO_SSLv2);
    or
	SSL_clear_options(ssl, SSL_OP_NO_SSLv2);

    as appropriate.  Even if either of those is used, or the application
    explicitly uses the version-specific SSLv2_method() or its client and
    server variants, SSLv2 ciphers vulnerable to exhaustive search key
    recovery have been removed.  Specifically, the SSLv2 40-bit EXPORT
    ciphers, and SSLv2 56-bit DES are no longer available.

Approved by:	re (marius, gjb), so (delphij)
2016-03-04 00:40:15 +00:00
delphij
73af9669cd Merge OpenSSL 1.0.1s. This is a security update.
Relnotes:	yes
Approved by:	re (so@ implicit)
2016-03-02 15:43:01 +00:00
des
5a18868b2d MFH (r265214, r294333, r294407, r294467): misc prop fixes
MFH (r285975, r287143): register mergeinfo for security fixes
MFH (r294497, r294498, r295139): internal documentation
MFH (r294328): upgrade to openssh 6.7p1, re-add libwrap
MFH (r294332): upgrade to openssh 6.8p1
MFH (r294367): update pam_ssh for api changes
MFH (r294909): switch usedns back on
MFH (r294336): upgrade to openssh 6.9p1
MFH (r294495): re-enable dsa keys
MFH (r294464): upgrade to openssh 7.0p1
MFH (r294496): upgrade to openssh 7.1p2

Approved by:	re (gjb)
Relnotes:	yes
2016-02-07 11:38:54 +00:00
jkim
a81734f931 Merge OpenSSL 1.0.1r.
Relnotes:	yes
2016-01-28 21:42:10 +00:00
des
fb40ebd67a MFH (r291198, r291260, r291261, r291375, r294325, r294335, r294563)
Remove the HPN and None cipher patches.
2016-01-24 22:28:18 +00:00
bdrewery
012c5f2da9 MFC r291941:
Replace unneeded manual dependency on header by adding it to SRCS.
2016-01-07 23:26:16 +00:00
jkim
fdc1215ebe Merge OpenSSL 1.0.1q. 2015-12-03 21:18:48 +00:00
ngie
1180ac6b71 MFC r290178:
Fix GOST engine cipher linkage by adding e_gost_err.c to SRCS so it
picks up undefined symbols, like "ERR_load_GOST_strings"

PR: 184805
Submitted by: Ivan IvanZhdanov <ivan.zhdanov@gmail.com>
Sponsored by: EMC / Isilon Storage Division
2015-11-09 06:55:04 +00:00
jkim
99e14b36bd MFC: r290121
Define endianness for non-x86 platforms.
2015-11-02 17:41:15 +00:00
bdrewery
77f7f98e06 MFC r287981:
Replace afterinstall: hack from r111083 with 'make delete-old' functionality.
2015-10-03 16:24:20 +00:00
jkim
d7beffb2a7 MFC: r285329
Merge OpenSSL 1.0.1p.

Approved by:	re (gjb)
Relnotes:	yes
2015-07-09 17:17:22 +00:00
jkim
11074f6b1e MFC: r284329
Merge OpenSSL 1.0.1o.

Note it is instantly merged because it restores ABI compatibility broken by
the previous OpenSSL 1.0.1n.

Relnotes:	yes
2015-06-12 17:10:19 +00:00
jkim
5c266cb7c9 MFC: r284283
Merge OpenSSL 1.0.1n.
2015-06-11 19:07:45 +00:00
jkim
fe7bfd6646 MFC: r280297
Merge OpenSSL 1.0.1m.

Relnotes:	yes
2015-03-20 21:54:45 +00:00
delphij
fc2b8b3929 Fix multiple OpenSSL vulnerabilities.
Security:	FreeBSD-SA-15:06.openssl
Security:	CVE-2015-0209
Security:	CVE-2015-0286
Security:	CVE-2015-0287
Security:	CVE-2015-0288
Security:	CVE-2015-0289
Security:	CVE-2015-0293
2015-03-19 17:40:43 +00:00
jkim
702b057a66 MFC: r277274
Update buildinf.h to make SSLeay_version(3) little bit more useful.
2015-01-23 19:17:04 +00:00
jkim
2a0385d554 MFC: r277270
Merge OpenSSL 1.0.1l.

Relnotes:	yes
2015-01-23 19:14:36 +00:00
jkim
27e2f26e15 MFC: r276861, r276863
Merge OpenSSL 1.0.1k.
2015-01-09 00:58:20 +00:00
ngie
d4c625976a MFC r264400,r265836:
r264400:

  NO_MAN= has been deprecated in favor of MAN= for some time, go ahead
  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.

r265836:

  Remove last two NO_MAN= in the tree. In both of these cases, MAN= is
  what is needed.
2014-12-31 23:25:37 +00:00
jkim
0b5b22505e MFC: r273144, r273146
Merge OpenSSL 1.0.1j.

Relnotes:	yes
2014-10-15 19:59:43 +00:00
jkim
2bfd700741 MFC: r269682
Merge OpenSSL 1.0.1i.
2014-08-07 21:04:42 +00:00
jkim
309e057bcf MFC: r267256
Merge OpenSSL 1.0.1h.

Approved by:	so (delphij)
2014-06-09 06:00:28 +00:00
delphij
fd2ac9967d MFC r265995:
Switch using the new $2b$ format by default, when bcrypt is used.

Relnotes:	default Blowfish crypt(3) format have been changed to $2b$.
2014-05-28 18:51:49 +00:00
jmmv
797209d767 MFC r264741: Add placeholder Kyuafiles for various top-level hierarchies.
This is "make tinderbox" clean.
2014-04-28 04:20:14 +00:00
des
faff1e38d2 MFH (r263712): upgrade openssh to 6.6p1
MFH (r264308): restore p level in debugging output
2014-04-12 20:22:59 +00:00
jkim
aeb5a4ff70 MFC: r261037, r264278
Merge OpenSSL 1.0.1f and 1.0.1g.
2014-04-10 22:39:22 +00:00
delphij
800e1a055e MFC r262501:
Refresh our implementation of OpenBSD's Blowfish password format.

Notable changes:

 - Support of $2b$ password format to address a problem where very
   long passwords (more than 256 characters, when an integer
   overflow would happen and cause the length to wrap at 256).
 - Updated pseudo code in comments to reflect the reality.
 - Removed our local shortcut of processing magic string and rely
   on the centralized and tigntened validation.
 - Diff reduction from upstream.

For now we are still generating the older $2a$ format of password
but we will migrate to the new format once the format is formally
finalized.
2014-03-27 00:23:44 +00:00
des
255d8413da MFH (r261320): upgrade openssh to 6.5p1
MFH (r261340): enable sandboxing by default
2014-02-27 17:29:02 +00:00
des
476b7e3d43 Unbreak the WITHOUT_KERBEROS build and try to reduce the odds of a
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)
2013-09-23 20:35:54 +00:00
des
2a9ec0fc3e Clean up the OpenSSH build. It is now possible to build most components
as static binaries, if desired.  The one exception is sshd, which runs
into trouble due to libpam.a's includion of pam_ssh.

Make OpenSSH use LDNS if available.  This allows it to verify signed
SSHFP records.

Approved by:	re (blanket)
2013-09-10 22:26:11 +00:00
des
aba57138f9 Make libldns and libssh private.
Approved by:	re (blanket)
2013-09-08 10:04:26 +00:00
ed
8ac6e32cdd Remove references to MK_IDEA.
As of r249959, we want to build with IDEA support enabled
unconditionally. As this change removed the MK_IDEA flag, update these
Makefiles accordingly.
2013-04-27 05:44:39 +00:00
des
b291eafe8d Upgrade to OpenSSH 6.2p1. The most important new features are support
for a key revocation list and more fine-grained authentication control.
2013-03-22 17:55:38 +00:00
jkim
754bee5776 Merge OpenSSL 1.0.1e.
Approved by:	secteam (simon), benl (silence)
2013-02-13 23:07:20 +00:00
bz
a3df209122 Add a src.conf(5) option to allow users to compile in the "NONE cipher",
which, only after authentication, disables crypto, and only for sessions
without a terminal.

Submitted by:	Jeremy Chadwick (freebsd jdc.parodius.com)
PR:		bin/163095
MFC after:	10 days
2013-01-17 01:51:04 +00:00
des
00f3582ac6 Upgrade OpenSSH to 6.1p1. 2012-09-03 16:51:41 +00:00
jkim
d3ee564849 Sort ASM definitions by crypto module for slightly easier maintenance.
Specifically, GHASH_ASM belongs to crypto/modes.
2012-07-12 21:31:53 +00:00
jkim
e393e47b1e Merge OpenSSL 1.0.1c.
Approved by:	benl (maintainer)
2012-07-12 19:30:53 +00:00
jkim
299ab12592 Merge OpenSSL 0.9.8x.
Reviewed by:	stas
Approved by:	benl (maintainer)
MFC after:	3 days
2012-06-27 18:44:36 +00:00
bz
d2e144fbe8 Update the previous openssl fix. [12:01]
Fix a bug in crypt(3) ignoring characters of a passphrase. [12:02]

Security:	FreeBSD-SA-12:01.openssl (revised)
Security:	FreeBSD-SA-12:02.crypt
Approved by:	so (bz, simon)
2012-05-30 12:01:28 +00:00
kevlo
cf70964fbe Return NULL on error rather than ":", per the crypt(3) man page.
Discussed in: http://www.openwall.com/lists/oss-security/2011/11/15/3
2012-02-22 01:23:14 +00:00
kib
a56c72dcf2 Force linker error when created shared library contains a relocation
against text. Provide the override switch to turn off the strict
behaviour. Apparently, openssl libcrypto needs it due to assembler
code not being PIC.

Discussed with:	bf
MFC after:	2 weeks
2011-12-06 11:28:17 +00:00
eadler
9d7884364e - change "is is" to "is" or "it is"
- change "the the" to "the"

Approved by:	lstewart
Approved by:	sahil (mentor)
MFC after:	3 days
2011-10-16 14:30:28 +00:00
des
ee2afa8165 Upgrade to OpenSSH 5.8p2. 2011-05-04 07:34:44 +00:00
dim
f58eeaae2e Fix some leftover binaries and shared libraries in the system that still
have an executable stack, due to linking in hand-assembled .S or .s
files, that have no .GNU-stack sections:

RWX --- ---  /lib/libcrypto.so.6
RWX --- ---  /lib/libmd.so.5
RWX --- ---  /lib/libz.so.6
RWX --- ---  /lib/libzpool.so.2
RWX --- ---  /usr/lib/liblzma.so.5

These were found using scanelf, from the sysutils/pax-utils port.

Reviewed by:	kib
2011-02-15 22:03:09 +00:00
simon
9fbb25bbe9 Regenerate manual pages for OpenSSL 0.9.8q. 2010-12-03 23:07:45 +00:00
simon
baef745205 Regenerate manual pages for OpenSSL 0.9.8p. 2010-11-22 18:29:00 +00:00
brucec
7adc5f91cf Revert changes of 'assure' to 'ensure' made in r211936.
Approved by: rrs (mentor)
2010-09-11 10:49:56 +00:00
brucec
76d7244728 Fix incorrect usage of 'assure' and 'insure'.
Approved by: rrs (mentor)
2010-08-28 16:32:01 +00:00