From: Sascha Wildner <saw@online.de>
Date: Sun, 25 Jan 2015 19:03:55 +0000 (+0100)
Subject: libssh: Fix a remaining warning and raise WARNS to 2.
X-Git-Tag: v4.2.0rc~1001
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/9be608cb62307f2d282421fd95f1c0cb5dacca57

libssh: Fix a remaining warning and raise WARNS to 2.
---

diff --git a/crypto/openssh/cipher-ctr-mt.c b/crypto/openssh/cipher-ctr-mt.c
index c13ddf0a7f..238b53c132 100644
--- a/crypto/openssh/cipher-ctr-mt.c
+++ b/crypto/openssh/cipher-ctr-mt.c
@@ -285,7 +285,7 @@ thread_loop(void *x)
 
 static int
 ssh_aes_ctr(EVP_CIPHER_CTX *ctx, u_char *dest, const u_char *src,
-    u_int len)
+    LIBCRYPTO_EVP_INL_TYPE len)
 {
 	struct ssh_aes_ctr_ctx *c;
 	struct kq *q, *oldq;
diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index 57c1a48ae9..6bd31884d6 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -27,7 +27,7 @@ SRCS+=	bcrypt_pbkdf.c blowfish.c bsd-misc.c explicit_bzero.c \
 
 MAN=	moduli.5
 
-WARNS?=	0
+WARNS?=	2
 
 .include "../../Makefile.ssh.common"
 .include <bsd.lib.mk>