Date: Fri, 1 Mar 2013 01:02:26 +0000 (UTC) From: Dag-Erling Smørgrav <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r247515 - in stable/9: secure/lib/libssh secure/usr.bin/ssh secure/usr.sbin/sshd share/mk tools/build/options Message-ID: <201303010102.r2112QFI022491@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Fri Mar 1 01:02:26 2013 New Revision: 247515 URL: http://svnweb.freebsd.org/changeset/base/247515 Log: MFH (r245527): add OPENSSH_NONE_CIPHER build option Added: stable/9/tools/build/options/WITH_OPENSSH_NONE_CIPHER - copied unchanged from r245527, head/tools/build/options/WITH_OPENSSH_NONE_CIPHER Modified: stable/9/secure/lib/libssh/Makefile stable/9/secure/usr.bin/ssh/Makefile stable/9/secure/usr.sbin/sshd/Makefile stable/9/share/mk/bsd.own.mk Directory Properties: stable/9/secure/lib/libssh/ (props changed) stable/9/secure/usr.bin/ssh/ (props changed) stable/9/secure/usr.sbin/sshd/ (props changed) stable/9/share/mk/ (props changed) stable/9/tools/build/options/ (props changed) Modified: stable/9/secure/lib/libssh/Makefile ============================================================================== --- stable/9/secure/lib/libssh/Makefile Fri Mar 1 00:58:44 2013 (r247514) +++ stable/9/secure/lib/libssh/Makefile Fri Mar 1 01:02:26 2013 (r247515) @@ -38,6 +38,10 @@ DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX5 LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcom_err -lmd -lroken .endif +.if ${MK_OPENSSH_NONE_CIPHER} != "no" +CFLAGS+= -DNONE_CIPHER_ENABLED +.endif + NO_LINT= DPADD+= ${LIBCRYPTO} ${LIBCRYPT} Modified: stable/9/secure/usr.bin/ssh/Makefile ============================================================================== --- stable/9/secure/usr.bin/ssh/Makefile Fri Mar 1 00:58:44 2013 (r247514) +++ stable/9/secure/usr.bin/ssh/Makefile Fri Mar 1 01:02:26 2013 (r247515) @@ -25,6 +25,10 @@ DPADD+= ${LIBGSSAPI} LDADD+= -lgssapi .endif +.if ${MK_OPENSSH_NONE_CIPHER} != "no" +CFLAGS+= -DNONE_CIPHER_ENABLED +.endif + DPADD+= ${LIBCRYPT} ${LIBCRYPTO} LDADD+= -lcrypt -lcrypto Modified: stable/9/secure/usr.sbin/sshd/Makefile ============================================================================== --- stable/9/secure/usr.sbin/sshd/Makefile Fri Mar 1 00:58:44 2013 (r247514) +++ stable/9/secure/usr.sbin/sshd/Makefile Fri Mar 1 01:02:26 2013 (r247515) @@ -40,6 +40,10 @@ DPADD+= ${LIBGSSAPI_KRB5} ${LIBGSSAPI} LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lasn1 .endif +.if ${MK_OPENSSH_NONE_CIPHER} != "no" +CFLAGS+= -DNONE_CIPHER_ENABLED +.endif + DPADD+= ${LIBCRYPTO} ${LIBCRYPT} LDADD+= -lcrypto -lcrypt Modified: stable/9/share/mk/bsd.own.mk ============================================================================== --- stable/9/share/mk/bsd.own.mk Fri Mar 1 00:58:44 2013 (r247514) +++ stable/9/share/mk/bsd.own.mk Fri Mar 1 01:02:26 2013 (r247515) @@ -431,6 +431,7 @@ __DEFAULT_NO_OPTIONS = \ LIBCPLUSPLUS \ NMTREE \ OFED \ + OPENSSH_NONE_CIPHER \ SHARED_TOOLCHAIN # Copied: stable/9/tools/build/options/WITH_OPENSSH_NONE_CIPHER (from r245527, head/tools/build/options/WITH_OPENSSH_NONE_CIPHER) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/tools/build/options/WITH_OPENSSH_NONE_CIPHER Fri Mar 1 01:02:26 2013 (r247515, copy of r245527, head/tools/build/options/WITH_OPENSSH_NONE_CIPHER) @@ -0,0 +1,9 @@ +.\" $FreeBSD$ +Set to include the "None" cipher support in OpenSSH and its libraries. +Additional adjustments may need to be done to system configuration +files, such as +.Xr sshd_config 5 , +to enable this cipher. +Please see +.Pa /usr/src/crypto/openssh/README.hpn +for full details.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303010102.r2112QFI022491>