Hi,
Please find enclosed an update for security/hydra.
Hydra version 8.1 license is GNU AFFERO GENERAL PUBLIC LICENSE Version
3, can anyone confirm the following Makefile declarations are correct in
this context:
###
PERMIT_PACKAGE_CDROM=Yes
PERMIT_PACKAGE_FTP=Yes
###
Comments ? OK ?
Thanks!
--
Sébastien
? hydra.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/hydra/Makefile,v
retrieving revision 1.54
diff -u -p -u -p -r1.54 Makefile
--- Makefile 17 Aug 2015 20:04:16 -0000 1.54
+++ Makefile 19 Nov 2015 16:29:14 -0000
@@ -1,19 +1,18 @@
# $OpenBSD: Makefile,v 1.54 2015/08/17 20:04:16 sthen Exp $
-COMMENT-main= parallelized login hacker
+COMMENT-main= parallelized network logon cracker
COMMENT-gui= GTK frontend for hydra
-VERSION= 7.1
-DISTNAME= hydra-${VERSION}-src
+VERSION= 8.1
+DISTNAME= hydra-${VERSION}
PKGNAME-main= hydra-${VERSION}
PKGNAME-gui= hydra-gui-${VERSION}
CATEGORIES= security
-REVISION-main= 4
HOMEPAGE= http://thc.org/thc-hydra/
-# GPLv3 + restrictions in LICENCE.HYDRA
-PERMIT_PACKAGE_CDROM= no charge
+#GNU AFFERO GENERAL PUBLIC LICENSE Version 3
+PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
WANTLIB= c m
@@ -56,7 +55,7 @@ LIB_DEPENDS-main= databases/mariadb,-mai
devel/pcre \
security/libssh
RUN_DEPENDS-main=
-WANTLIB-main= c crypto idn m mysqlclient pcre pq pthread ssh ssl
+WANTLIB-main= ${WANTLIB} crypto idn mysqlclient pcre pq pthread ssh ssl
LIB_DEPENDS-gui=x11/gtk+2 \
${MODGETTEXT_LIB_DEPENDS}
RUN_DEPENDS-gui=hydra-${VERSION}:security/hydra,-main \
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/hydra/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- distinfo 18 Jan 2015 03:15:02 -0000 1.13
+++ distinfo 19 Nov 2015 16:29:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (hydra-7.1-src.tar.gz) = VR7x9yhI2rGfah/5/jHwgUPIzvJvY42T5xELS85J0KQ=
-SIZE (hydra-7.1-src.tar.gz) = 664022
+SHA256 (hydra-8.1.tar.gz) = 5Lwv0R+XqNmFo4oxeFyG04zGA4Pkeo9KXENjUeUTXxk=
+SIZE (hydra-8.1.tar.gz) = 559031
Index: patches/patch-Makefile_am
===================================================================
RCS file: /cvs/ports/security/hydra/patches/patch-Makefile_am,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Makefile_am
--- patches/patch-Makefile_am 5 Nov 2011 15:24:39 -0000 1.2
+++ patches/patch-Makefile_am 19 Nov 2015 16:29:14 -0000
@@ -1,16 +1,16 @@
$OpenBSD: patch-Makefile_am,v 1.2 2011/11/05 15:24:39 nigel Exp $
---- Makefile.am.orig Sun Oct 2 09:06:16 2011
-+++ Makefile.am Wed Nov 2 22:11:22 2011
-@@ -2,7 +2,7 @@
- # Makefile for Hydra - (c) 2001-2011 by van Hauser / THC <[email protected]>
+--- Makefile.am.orig Sun Dec 7 15:50:20 2014
++++ Makefile.am Wed Nov 18 17:38:00 2015
+@@ -1,7 +1,7 @@
+ #
+ # Makefile for Hydra - (c) 2001-2014 by van Hauser / THC <[email protected]>
#
-
-OPTS=-I. -O3
-+OPTS=-I. $(CFLAGS)
- # -Wall -ggdb -pedantic
++OPTS=-I. $(CFLAGS)
+ # -Wall -g -pedantic
LIBS=-lm
DIR=/bin
-@@ -43,7 +43,7 @@ hydra: hydra.c $(OBJ)
+@@ -44,7 +44,7 @@ hydra: hydra.c $(OBJ)
@echo
xhydra:
@@ -18,15 +18,19 @@ $OpenBSD: patch-Makefile_am,v 1.2 2011/1
+ -cd hydra-gtk/src && $(MAKE)
pw-inspector: pw-inspector.c
- -$(CC) $(OPTS) -o pw-inspector $(PWI_LOGO) pw-inspector.c
-@@ -55,12 +55,11 @@ strip: hydra
+ -$(CC) $(OPTS) $(SEC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o pw-inspector $(PWI_LOGO) pw-inspector.c
+@@ -56,16 +56,11 @@ strip: all
strip $(BINS)
-echo OK > /dev/null && test -x xhydra && strip xhydra || echo OK > /dev/null
-install: strip
-- -mkdir -p $(PREFIX)$(DIR)
-- cp $(BINS) dpl4hydra* $(PREFIX)$(DIR) && cd $(PREFIX)$(DIR) && chmod 755 $(BINS)
+- -mkdir -p $(PREFIX)$(DIR)
+- cp -f hydra-wizard.sh $(BINS) $(PREFIX)$(DIR) && cd $(PREFIX)$(DIR) && chmod 755 hydra-wizard.sh $(BINS)
- -echo OK > /dev/null && test -x xhydra && cp xhydra $(PREFIX)$(DIR) && cd $(PREFIX)$(DIR) && chmod 755 xhydra || echo OK > /dev/null
+- -sed -e "s|^INSTALLDIR=.*|INSTALLDIR="$(PREFIX)"|" dpl4hydra.sh > $(PREFIX)/bin/dpl4hydra.sh
+- -chmod 755 $(PREFIX)/bin/dpl4hydra.sh
+- -mkdir -p $(PREFIX)/etc/
+- -cp -f *.csv $(PREFIX)/etc/
- -mkdir -p $(PREFIX)/man/man1
- -cp -f hydra.1 xhydra.1 pw-inspector.1 $(PREFIX)/man/man1
+install:
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/security/hydra/patches/patch-configure,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-configure
--- patches/patch-configure 5 Nov 2011 15:24:39 -0000 1.6
+++ patches/patch-configure 19 Nov 2015 16:29:14 -0000
@@ -2,14 +2,13 @@ $OpenBSD: patch-configure,v 1.6 2011/11/
Remove tests for include files and libraries there are no
configure options to disable support the build may fail or be altered
if added
---- configure.orig Sun Oct 2 09:06:15 2011
-+++ configure Tue Nov 1 20:03:28 2011
-@@ -246,44 +246,6 @@ if [ "X" = "X$POSTGRES_PATH" -o "X" = "X$POSTGRES_IPAT
- fi
+--- configure.orig Sun Dec 7 15:50:24 2014
++++ configure Wed Nov 18 16:55:18 2015
+@@ -306,71 +306,6 @@ echo "Checking for Postgres (libpq.so, libpq-fe.h) ...
+ #fi
echo "Checking for SVN (libsvn_client-1 libapr-1.so libaprutil-1.so) ..."
--for i in $LIBDIRS
--do
+-for i in $LIBDIRS ; do
- if [ "X" = "X$SVN_PATH" ]; then
- if [ -f "$i/libsvn_client-1.so" ]&&[ -f "$i/libapr-1.so" ]&&[ -f "$i/libaprutil-1.so" ]; then
- SVN_PATH="$i"
@@ -17,15 +16,43 @@ if added
- fi
- fi
- if [ "X" = "X$SVN_PATH" ]; then
-- TMP_LIB=`/bin/ls $i/libsvn_client*.so* 2> /dev/null | grep libsvn_client.`
-- if [ -n "$TMP_LIB" ]; then
+- if [ -f "$i/libsvn_client-1.dll.a" ]&&[ -f "$i/libapr-1.dll.a" ]&&[ -f "$i/libaprutil-1.dll.a" ]; then
+- SVN_PATH="$i"
+- APR_PATH="$i"
+- fi
+- fi
+- if [ "X" = "X$SVN_PATH" ]; then
+- if [ -f "$i/libsvn_client-1.dylib" ]&&[ -f "$i/libapr-1.dylib" ]&&[ -f "$i/libaprutil-1.dylib" ]; then
+- SVN_PATH="$i"
+- APR_PATH="$i"
+- fi
+- fi
+- if [ "X" = "X$SVN_PATH" ]; then
+- if [ -f "$i/libsvn_client-1.a" ]&&[ -f "$i/libapr-1.a" ]&&[ -f "$i/libaprutil-1.a" ]; then
+- SVN_PATH="$i"
+- APR_PATH="$i"
+- fi
+- fi
+- if [ "X" = "X$SVN_PATH" ]; then
+- TMP_LIB1=`/bin/ls $i/libsvn_client*.so* 2> /dev/null | grep libsvn_client.`
+- TMP_LIB2=`/bin/ls $i/libapr-1*.so* 2> /dev/null | grep libsvn_client.`
+- TMP_LIB3=`/bin/ls $i/libaprutil-1*.so* 2> /dev/null | grep libsvn_client.`
+- if [ -n "$TMP_LIB1" -a -n "$TMP_LIB2" -a -n "$TMP_LIB3" ]; then
+- SVN_PATH="$i"
+- APR_PATH="$i"
+- fi
+- fi
+- if [ "X" = "X$SVN_PATH" ]; then
+- TMP_LIB1=`/bin/ls $i/libsvn_client*.dll* 2> /dev/null | grep libsvn_client.`
+- TMP_LIB2=`/bin/ls $i/libapr-1*.dll* 2> /dev/null | grep libsvn_client.`
+- TMP_LIB3=`/bin/ls $i/libaprutil-1*.dll* 2> /dev/null | grep libsvn_client.`
+- if [ -n "$TMP_LIB1" -a -n "$TMP_LIB2" -a -n "$TMP_LIB3" ]; then
- SVN_PATH="$i"
- APR_PATH="$i"
- fi
- fi
-done
--for i in $INCDIRS
--do
+-for i in $INCDIRS ; do
- if [ "X" = "X$SVN_IPATH" ]; then
- if [ -d "$i/subversion-1" ]; then
- SVN_IPATH="$i/subversion-1"
@@ -49,14 +76,13 @@ if added
if [ "X" = "X$SVN_PATH" -o "X" = "X$SVN_IPATH" -o "X" = "X$APR_IPATH" ]; then
SVN_PATH=""
-@@ -305,28 +267,7 @@ if [ "X" = "X$SVN_PATH" -o "X" = "X$APR_PATH" ]; then
+@@ -392,32 +327,6 @@ if [ "X" = "X$SVN_PATH" -o "X" = "X$APR_PATH" ]; then
fi
echo "Checking for firebird (libfbclient.so) ..."
--for i in $LIBDIRS
--do
+-for i in $LIBDIRS ; do
- if [ "X" = "X$FIREBIRD_PATH" ]; then
-- if [ -f "$i/libfbclient.so" ]; then
+- if [ -f "$i/libfbclient.so" -o -f "$i/libfbclient.dylib" -o -f "$i/libfbclient.a" ]; then
- FIREBIRD_PATH="$i"
- fi
- fi
@@ -66,27 +92,30 @@ if added
- FIREBIRD_PATH="$i"
- fi
- fi
+- if [ "X" = "X$FIREBIRD_PATH" ]; then
+- TMP_LIB=`/bin/ls $i/libfbclient.dll* 2> /dev/null | grep libfbclient.`
+- if [ -n "$TMP_LIB" ]; then
+- FIREBIRD_PATH="$i"
+- fi
+- fi
-done
--for i in $INCDIRS
--do
+-for i in $INCDIRS ; do
- if [ "X" != "X$FIREBIRD_PATH" ]; then
- if [ -f "$i/ibase.h" ]; then
- FIREBIRD_IPATH="$i"
- fi
- fi
-done
-+
if [ -n "$FIREBIRD_PATH" -a -n "$FIREBIRD_IPATH" ]; then
echo " ... found"
fi
-@@ -373,28 +314,7 @@ else
+@@ -473,32 +382,6 @@ else
echo " ... math.h not found, module Mysql disabled"
fi
echo "Checking for AFP (libafpclient.so) ..."
--for i in $LIBDIRS
--do
+-for i in $LIBDIRS ; do
- if [ "X" = "X$AFP_PATH" ]; then
-- if [ -f "$i/libafpclient.so" ]; then
+- if [ -f "$i/libafpclient.so" -o -f "$i/libafpclient.so" -o -f "$i/libafpclient.a" ]; then
- AFP_PATH="$i"
- fi
- fi
@@ -96,27 +125,30 @@ if added
- AFP_PATH="$i"
- fi
- fi
+- if [ "X" = "X$AFP_PATH" ]; then
+- TMP_LIB=`/bin/ls $i/libafpclient.dll* 2> /dev/null | grep libafpclient.`
+- if [ -n "$TMP_LIB" ]; then
+- AFP_PATH="$i"
+- fi
+- fi
-done
--for i in $INCDIRS
--do
+-for i in $INCDIRS ; do
- if [ "X" != "X$AFP_PATH" ]; then
- if [ -f "$i/afpfs-ng/afp.h" ]; then
- AFP_IPATH="$i/afpfs-ng"
- fi
- fi
-done
-+
if [ -n "$AFP_PATH" -a -n "$AFP_IPATH" ]; then
echo " ... found"
fi
-@@ -405,28 +325,7 @@ if [ "X" = "X$AFP_PATH" -o "X" = "X$AFP_IPATH" ]; then
+@@ -509,32 +392,6 @@ if [ "X" = "X$AFP_PATH" -o "X" = "X$AFP_IPATH" ]; then
fi
echo "Checking for NCP (libncp.so / nwcalls.h) ..."
--for i in $LIBDIRS
--do
+-for i in $LIBDIRS ; do
- if [ "X" = "X$NCP_PATH" ]; then
-- if [ -f "$i/libncp.so" ]; then
+- if [ -f "$i/libncp.so" -o -f "$i/libncp.dylib" -o -f "$i/libncp.a" ]; then
- NCP_PATH="$i"
- fi
- fi
@@ -126,25 +158,28 @@ if added
- NCP_PATH="$i"
- fi
- fi
+- if [ "X" = "X$NCP_PATH" ]; then
+- TMP_LIB=`/bin/ls $i/libncp.dll* 2> /dev/null | grep ncp.`
+- if [ -n "$TMP_LIB" ]; then
+- NCP_PATH="$i"
+- fi
+- fi
-done
--for i in $INCDIRS
--do
+-for i in $INCDIRS ; do
- if [ "X" != "X$NCP_PATH" ]; then
- if [ -f "$i/ncp/nwcalls.h" ]; then
- NCP_IPATH="$i"
- fi
- fi
-done
-+
if [ -n "$NCP_PATH" -a -n "$NCP_IPATH" ]; then
echo " ... found"
fi
-@@ -437,28 +336,7 @@ if [ "X" = "X$NCP_PATH" -o "X" = "X$NCP_IPATH" ]; then
+@@ -545,26 +402,6 @@ if [ "X" = "X$NCP_PATH" -o "X" = "X$NCP_IPATH" ]; then
fi
echo "Checking for SAP/R3 (librfc/saprfc.h) ..."
--for i in $LIBDIRS
--do
+-for i in $LIBDIRS ; do
- if [ "X" = "X$SAPR3_PATH" ]; then
- if [ -f "$i/librfc.a" -o -f "$i/librfc.dylib" -o "$i/librfc32.dll" ]; then
- SAPR3_PATH="$i"
@@ -157,30 +192,37 @@ if added
- fi
- fi
-done
--for i in $INCDIRS
--do
+-for i in $INCDIRS ; do
- if [ "X" = "X$SAPR3_IPATH" ]; then
- if [ -f "$i/saprfc.h" ]; then
- SAPR3_IPATH="$i"
- fi
- fi
-done
-+
if [ "X" = "X$SAPR3_PATH" ]; then
SAPR3_IPATH=""
fi
-@@ -558,34 +436,6 @@ if [ "X" != "X$WORACLE_LIB_PATH" ]; then
+@@ -673,79 +510,15 @@ if [ "X" != "X$WORACLE_LIB_PATH" ]; then
LIBDIRS="$LIBDIRS $WORACLE_LIB_PATH"
fi
--for i in $LIBDIRS
--do
+-for i in $LIBDIRS ; do
- if [ "X" = "X$ORACLE_PATH" ]; then
- if [ -f "$i/libocci.so" ]&&[ -f "$i/libclntsh.so" ]; then
- ORACLE_PATH="$i"
- fi
- fi
- if [ "X" = "X$ORACLE_PATH" ]; then
+- if [ -f "$i/libocci.dylib" ]&&[ -f "$i/libclntsh.dylib" ]; then
+- ORACLE_PATH="$i"
+- fi
+- fi
+- if [ "X" = "X$ORACLE_PATH" ]; then
+- if [ -f "$i/libocci.a" ]&&[ -f "$i/libclntsh.a" ]; then
+- ORACLE_PATH="$i"
+- fi
+- fi
+- if [ "X" = "X$ORACLE_PATH" ]; then
- TMP_LIB=`/bin/ls $i/libocci.so.* 2> /dev/null | grep occi.`
- if [ -n "$TMP_LIB" ]; then
- ORACLE_PATH="$i"
@@ -192,9 +234,46 @@ if added
- fi
- fi
- fi
+- if [ "X" = "X$ORACLE_PATH" ]; then
+- TMP_LIB=`/bin/ls $i/libocci.dll* 2> /dev/null | grep occi.`
+- if [ -n "$TMP_LIB" ]; then
+- ORACLE_PATH="$i"
+- fi
+- if [ "X" != "X$ORACLE_PATH" ]; then
+- TMP_LIB=`/bin/ls $i/libclntsh.dll* 2> /dev/null | grep clntsh.`
+- if [ -z "$TMP_LIB" ]; then
+- ORACLE_PATH=""
+- fi
+- fi
+- fi
-done
--for i in $INCDIRS
--do
++
+ #check for Kernel Asynchronous I/O (AIO) lib support
+ if [ "X" != "X$ORACLE_PATH" ]; then
+ LIBAIO=""
+- for i in $LIBDIRS ; do
+- if [ "X" = "X$LIBAIO" ]; then
+- if [ -f "$i/libaio.so" -o -f "$i/libaio.dylib" -o -f "$i/libaio.a" ]; then
+- LIBAIO="$i"
+- fi
+- fi
+- if [ "X" = "X$LIBAIO" ]; then
+- TMP_LIB=`/bin/ls $i/libaio.so.* 2> /dev/null | grep aio.`
+- if [ -n "$TMP_LIB" ]; then
+- LIBAIO="$i"
+- fi
+- TMP_LIB=`/bin/ls $i/libaio.dll* 2> /dev/null | grep aio.`
+- if [ -n "$TMP_LIB" ]; then
+- LIBAIO="$i"
+- fi
+- fi
+- done
+ if [ "X" = "X$LIBAIO" ]; then
+ ORACLE_PATH=""
+ fi
+ fi
+
+-for i in $INCDIRS ; do
- if [ "X" != "X$ORACLE_PATH" ]; then
- if [ -f "$i/oci.h" ]; then
- ORACLE_IPATH="$i"
@@ -202,14 +281,5 @@ if added
- fi
-done
if [ -n "$ORACLE_PATH" -a -n "$ORACLE_IPATH" ]; then
- echo " ... found"
+ echo " ... found"
fi
-@@ -648,7 +498,7 @@ fi
-
- echo
- XDEFINES=""
--XLIBS=""
-+XLIBS="-lm"
- XLIBPATHS=""
- XIPATHS=""
-
Index: patches/patch-hydra-oracle-listener_c
===================================================================
RCS file: /cvs/ports/security/hydra/patches/patch-hydra-oracle-listener_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-hydra-oracle-listener_c
--- patches/patch-hydra-oracle-listener_c 15 Apr 2014 11:25:42 -0000 1.1
+++ patches/patch-hydra-oracle-listener_c 19 Nov 2015 16:29:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-hydra-oracle-listener_c,v 1.1 2014/04/15 11:25:42 naddy Exp $
---- hydra-oracle-listener.c.orig Sun Oct 2 10:06:15 2011
-+++ hydra-oracle-listener.c Mon Apr 14 22:49:36 2014
-@@ -105,7 +105,7 @@ int convert_byteorder(unsigned char **result, int size
+--- hydra-oracle-listener.c.orig Sun Dec 7 15:50:20 2014
++++ hydra-oracle-listener.c Thu Nov 19 14:50:52 2015
+@@ -106,7 +106,7 @@ int convert_byteorder(unsigned char **result, int size
int ora_descrypt(unsigned char **rs, unsigned char *result, int siz) {
int i = 0;
char lastkey[8];
@@ -10,7 +10,7 @@ $OpenBSD: patch-hydra-oracle-listener_c,
unsigned char key1[8] = { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF };
unsigned char ivec1[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
unsigned char *desresult;
-@@ -115,17 +115,17 @@ int ora_descrypt(unsigned char **rs, unsigned char *re
+@@ -116,17 +116,17 @@ int ora_descrypt(unsigned char **rs, unsigned char *re
hydra_report(stderr, "[ERROR] Can't allocate memory\n");
return 1;
}
Index: patches/patch-hydra-smb_c
===================================================================
RCS file: /cvs/ports/security/hydra/patches/patch-hydra-smb_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-hydra-smb_c
--- patches/patch-hydra-smb_c 15 Apr 2014 11:25:42 -0000 1.1
+++ patches/patch-hydra-smb_c 19 Nov 2015 16:29:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-hydra-smb_c,v 1.1 2014/04/15 11:25:42 naddy Exp $
---- hydra-smb.c.orig Sun Oct 2 10:06:15 2011
-+++ hydra-smb.c Mon Apr 14 22:35:34 2014
-@@ -139,19 +139,19 @@ MakeKey(unsigned char *key, unsigned char *des_key)
+--- hydra-smb.c.orig Sun Dec 7 15:50:24 2014
++++ hydra-smb.c Wed Nov 18 17:38:00 2015
+@@ -176,17 +176,17 @@ static void MakeKey(unsigned char *key, unsigned char
des_key[6] = Get7Bits(key, 42);
des_key[7] = Get7Bits(key, 49);
@@ -10,9 +10,7 @@ $OpenBSD: patch-hydra-smb_c,v 1.1 2014/0
}
/* Do the DesEncryption */
- void
- DesEncrypt(unsigned char *clear, unsigned char *key, unsigned char *cipher)
- {
+ void DesEncrypt(unsigned char *clear, unsigned char *key, unsigned char *cipher) {
- des_cblock des_key;
- des_key_schedule key_schedule;
+ DES_cblock des_key;
Index: patches/patch-hydra-snmp_c
===================================================================
RCS file: patches/patch-hydra-snmp_c
diff -N patches/patch-hydra-snmp_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-hydra-snmp_c 19 Nov 2015 16:29:14 -0000
@@ -0,0 +1,29 @@
+$OpenBSD$
+--- hydra-snmp.c.orig Sun Dec 7 15:50:24 2014
++++ hydra-snmp.c Wed Nov 18 17:38:00 2015
+@@ -335,13 +335,13 @@ int start_snmp(int s, char *ip, int port, unsigned cha
+ // xor initVect with salt
+ for (i = 0; i < 8; i++)
+ initVect[i] ^= privacy_params[i];
+- des_key_sched((C_Block *) key, symcbc);
+- des_ncbc_encrypt(snmpv3_get2 + 2, buf, sizeof(snmpv3_get2) - 2, symcbc, (C_Block *) (initVect), DES_ENCRYPT);
++ DES_key_sched((DES_cblock *) key, &symcbc);
++ DES_ncbc_encrypt(snmpv3_get2 + 2, buf, sizeof(snmpv3_get2) - 2, &symcbc, (DES_cblock *) (initVect), DES_ENCRYPT);
+
+ #endif
+
+ /* for (i = 0; i <= sizeof(snmpv3_get2) - 8; i += 8) {
+- des_ncbc_encrypt(snmpv3_get2 + i, buf + i, 8, (C_Block*)(initVect), DES_ENCRYPT);
++ DES_ncbc_encrypt(snmpv3_get2 + i, buf + i, 8, (DES_cblock*)(initVect), DES_ENCRYPT);
+ }
+ // last part of buffer
+ if (buffer_len % 8) {
+@@ -351,7 +351,7 @@ int start_snmp(int s, char *ip, int port, unsigned cha
+ memset(tmp_buf, 0, 8);
+ for (unsigned int l = start; l < buffer_len; l++)
+ *tmp_buf_ptr++ = buffer[l];
+- des_ncbc_encrypt(tmp_buf, buf + start, 1, symcbc, (C_Block*)(initVect), DES_ENCRYPT);
++ DES_ncbc_encrypt(tmp_buf, buf + start, 1, &symcbc, (DES_cblock*)(initVect), DES_ENCRYPT);
+ *out_buffer_len = buffer_len + 8 - (buffer_len % 8);
+ } else
+ *out_buffer_len = buffer_len;
