diff options
| author | des <des@FreeBSD.org> | 2016-01-24 22:28:18 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-01-24 22:28:18 +0000 |
| commit | fb40ebd67a2ae7631091b91a90bb80648527fc71 (patch) | |
| tree | d4f854ab42c1798125818fb8fdcbb89a07f5db96 /secure | |
| parent | 55146b62a12461f40c96f1aea09d60a020b63c22 (diff) | |
| download | FreeBSD-src-fb40ebd67a2ae7631091b91a90bb80648527fc71.zip FreeBSD-src-fb40ebd67a2ae7631091b91a90bb80648527fc71.tar.gz | |
MFH (r291198, r291260, r291261, r291375, r294325, r294335, r294563)
Remove the HPN and None cipher patches.
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/lib/libssh/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.bin/ssh/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.sbin/sshd/Makefile | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 9fd0871..2f73b4c 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -49,10 +49,6 @@ DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${ 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} ${LIBZ} diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index be5861f..a019ec1 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -35,10 +35,6 @@ DPADD+= ${LIBGSSAPI} LDADD+= -lgssapi .endif -.if ${MK_OPENSSH_NONE_CIPHER} != "no" -CFLAGS+= -DNONE_CIPHER_ENABLED -.endif - DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD+= -lcrypt -lcrypto -lz diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index 04da063..7e7143a 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -52,10 +52,6 @@ LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lhx509 -lasn1 \ -lcom_err -lroken -lwind -lheimbase -lheimipcc .endif -.if ${MK_OPENSSH_NONE_CIPHER} != "no" -CFLAGS+= -DNONE_CIPHER_ENABLED -.endif - DPADD+= ${LIBCRYPT} ${LIBCRYPTO} ${LIBZ} LDADD+= -lcrypt -lcrypto -lz |
