diff options
| author | obrien <obrien@FreeBSD.org> | 2013-02-08 16:10:16 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2013-02-08 16:10:16 +0000 |
| commit | 3028e3f8aba938dfd0bf9fda987b8a72140b8027 (patch) | |
| tree | b2f038222ff8a70f687652441df00d2b564c8abe /secure | |
| parent | 952a6d5a7cd3d3f9007acfa06805262fc04a105f (diff) | |
| parent | 1d08d5f677c1dfa810e381073590adbae19cc69f (diff) | |
| download | FreeBSD-src-3028e3f8aba938dfd0bf9fda987b8a72140b8027.zip FreeBSD-src-3028e3f8aba938dfd0bf9fda987b8a72140b8027.tar.gz | |
Sync with HEAD.
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/lib/libssh/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.bin/bdes/bdes.1 | 2 | ||||
| -rw-r--r-- | secure/usr.bin/ssh/Makefile | 4 | ||||
| -rw-r--r-- | secure/usr.sbin/sshd/Makefile | 4 |
4 files changed, 13 insertions, 1 deletions
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 7224823..937fa24 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -38,6 +38,10 @@ 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} diff --git a/secure/usr.bin/bdes/bdes.1 b/secure/usr.bin/bdes/bdes.1 index 367d32d..8863a84 100644 --- a/secure/usr.bin/bdes/bdes.1 +++ b/secure/usr.bin/bdes/bdes.1 @@ -141,7 +141,7 @@ or in CFB mode. .It Fl o Ar N Use .Ar N Ns \-bit -ouput feedback (OFB) mode. +output feedback (OFB) mode. Currently .Ar N must be a multiple of 8 between 8 and 64 inclusive (this does not conform diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 9304fd5..0bee10c 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -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 diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index cc914c4..3fb0708 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -40,6 +40,10 @@ DPADD+= ${LIBGSSAPI_KRB5} ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} LDADD+= -lgssapi_krb5 -lgssapi -lkrb5 -lasn1 .endif +.if ${MK_OPENSSH_NONE_CIPHER} != "no" +CFLAGS+= -DNONE_CIPHER_ENABLED +.endif + DPADD+= ${LIBCRYPTO} ${LIBCRYPT} LDADD+= -lcrypto -lcrypt |
