Attachment #120312 for bug #163095

View | Details | Raw Unified | Return to bug 163095
Collapse All | Expand All

Lines 39-44 Link Here

(-)src/secure/lib/libssh/Makefile (+4 lines)
39	LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcom_err -lmd -lroken	39	LDADD+= -lgssapi -lkrb5 -lhx509 -lasn1 -lcom_err -lmd -lroken
40	.endif	40	.endif
41		41
		42	.if ${MK_OPENSSH_NONE_CIPHER} != "no"
		43	CFLAGS+= -DNONE_CIPHER_ENABLED
		44	.endif
		45
42	NO_LINT=	46	NO_LINT=
43		47
44	DPADD+= ${LIBCRYPTO} ${LIBCRYPT}	48	DPADD+= ${LIBCRYPTO} ${LIBCRYPT}

Lines 25-30 Link Here

(-)src/secure/usr.bin/ssh/Makefile (+4 lines)
25	LDADD+= -lgssapi	25	LDADD+= -lgssapi
26	.endif	26	.endif
27		27
		28	.if ${MK_OPENSSH_NONE_CIPHER} != "no"
		29	CFLAGS+= -DNONE_CIPHER_ENABLED
		30	.endif
		31
28	.if defined(X11BASE) \|\| defined(LOCALBASE)	32	.if defined(X11BASE) \|\| defined(LOCALBASE)
29	# Recommended /etc/make.conf setting is X11BASE=${LOCALBASE} for x.org	33	# Recommended /etc/make.conf setting is X11BASE=${LOCALBASE} for x.org
30	# 7.x upgrade on <= 6.2, but LOCALBASE has moved out of scope of src/	34	# 7.x upgrade on <= 6.2, but LOCALBASE has moved out of scope of src/

Lines 38-43 Link Here

(-)src/secure/usr.sbin/sshd/Makefile (+4 lines)
38	LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lasn1	38	LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lasn1
39	.endif	39	.endif
40		40
		41	.if ${MK_OPENSSH_NONE_CIPHER} != "no"
		42	CFLAGS+= -DNONE_CIPHER_ENABLED
		43	.endif
		44
41	.if defined(X11BASE)	45	.if defined(X11BASE)
42	# Recommended /etc/make.conf setting is X11BASE=${LOCALBASE} for x.org	46	# Recommended /etc/make.conf setting is X11BASE=${LOCALBASE} for x.org
43	# 7.x upgrade on <= 6.2, but LOCALBASE has moved out of scope of src/	47	# 7.x upgrade on <= 6.2, but LOCALBASE has moved out of scope of src/

Lines 408-414 Link Here

(-)src/share/mk/bsd.own.mk (-1 / +2 lines)
408	BIND_SIGCHASE \	408	BIND_SIGCHASE \
409	BIND_XML \	409	BIND_XML \
410	HESIOD \	410	HESIOD \
411	IDEA	411	IDEA \
		412	OPENSSH_NONE_CIPHER
412	.if defined(WITH_${var}) && defined(WITHOUT_${var})	413	.if defined(WITH_${var}) && defined(WITHOUT_${var})
413	.error WITH_${var} and WITHOUT_${var} can't both be set.	414	.error WITH_${var} and WITHOUT_${var} can't both be set.
414	.endif	415	.endif

Line 0 Link Here

(-)src/tools/build/options/WITH_OPENSSH_NONE_CIPHER (+8 lines)
	1	.\" $FreeBSD: $
	2	Set to include the "None" cipher into OpenSSH and its libraries.
	3	Additional adjustments may need to be done to system configuration
	4	files, such as
	5	.Xr sshd_config 5 ,
	6	to enable this cipher. Please see
	7	.Pa /usr/src/crypto/openssh/README.hpn
	8	for full details.

Return to bug 163095