5 files changed, 6 insertions, 98 deletions

diff --git a/security/hydra/Makefile b/security/hydra/Makefile
index 68b5e5e6a45c..fb795afa185a 100644
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hydra
-PORTVERSION=	8.2
+PORTVERSION=	8.3
 CATEGORIES=	security
 MASTER_SITES=	https://www.thc.org/releases/ \
 		PACKETSTORM/groups/thc/
diff --git a/security/hydra/distinfo b/security/hydra/distinfo
index 7501434f3ffc..2fe0c6d952ce 100644
--- a/security/hydra/distinfo
+++ b/security/hydra/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1469203290
-SHA256 (hydra-8.2.tar.gz) = 9e88496aca1d7ee94410cf3e3d87bc8cbaa91e37fd5ef700cab2f55ce92b4ac4
-SIZE (hydra-8.2.tar.gz) = 578596
+TIMESTAMP = 1471866771
+SHA256 (hydra-8.3.tar.gz) = b94ee47254e01a8c18be38eae8b953bfe4f734db60cafd1054b3316419b1687d
+SIZE (hydra-8.3.tar.gz) = 1136387
diff --git a/security/hydra/files/patch-configure b/security/hydra/files/patch-configure
index 0a7d79e876a5..4b6017b2a5df 100644
--- a/security/hydra/files/patch-configure
+++ b/security/hydra/files/patch-configure
@@ -1,4 +1,4 @@
---- configure.orig	2016-06-16 14:57:15 UTC
+--- configure.orig	2016-08-11 07:50:21 UTC
 +++ configure
 @@ -1009,7 +1009,7 @@ XLIBPATHS=""
  XIPATHS=""
diff --git a/security/hydra/files/patch-fix-libressl-build b/security/hydra/files/patch-fix-libressl-build
deleted file mode 100644
index abb981d8d351..000000000000
--- a/security/hydra/files/patch-fix-libressl-build
+++ /dev/null
@@ -1,92 +0,0 @@
-From ae324d6544e36251dedda0c5e20049d04eab776e Mon Sep 17 00:00:00 2001
-From: Bernard Spil <spil.oss@gmail.com>
-Date: Thu, 12 Mar 2015 08:57:57 +0100
-Subject: [PATCH] Replace deprecated des_ and fix LibreSSL build
-
-uses deprecated des_ methods and types that were marked deprecated by
-OpenSSL 0.9.7 and will be removed in OpenSSL 1.1.0 . This patch replaces
-the des_ methods and types with their new DES_ counterparts. This
-enables building with LibreSSL as OpenSSL library.
----
- hydra-oracle-listener.c | 10 +++++-----
- hydra-smb.c             | 10 +++++-----
- hydra-snmp.c            |  4 ++--
- 3 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/hydra-oracle-listener.c b/hydra-oracle-listener.c
-index 242bd61..6636705 100644
---- hydra-oracle-listener.c
-+++ hydra-oracle-listener.c
-@@ -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];
--  des_key_schedule ks1;
-+  DES_key_schedule ks1;
-   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;
-@@ -116,17 +116,17 @@ int ora_descrypt(unsigned char **rs, unsigned char *result, int siz) {
-     hydra_report(stderr, "[ERROR] Can't allocate memory\n");
-     return 1;
-   }
--  des_key_sched((C_Block *) key1, ks1);
--  des_ncbc_encrypt(result, desresult, siz, ks1, &ivec1, DES_ENCRYPT);
-+  DES_key_sched((DES_cblock *) key1, &ks1);
-+  DES_ncbc_encrypt(result, desresult, siz, &ks1, &ivec1, DES_ENCRYPT);
- 
-   for (i = 0; i < 8; i++) {
-     lastkey[i] = desresult[siz - 8 + i];
-   }
- 
--  des_key_sched((C_Block *) lastkey, ks1);
-+  DES_key_sched((DES_cblock *) lastkey, &ks1);
-   memset(desresult, 0, siz);
-   memset(ivec1, 0, sizeof(ivec1));
--  des_ncbc_encrypt(result, desresult, siz, ks1, &ivec1, DES_ENCRYPT);
-+  DES_ncbc_encrypt(result, desresult, siz, &ks1, &ivec1, DES_ENCRYPT);
- 
-   if ((*rs = malloc(siz)) == NULL) {
-     hydra_report(stderr, "[ERROR] Can't allocate memory\n");
-diff --git a/hydra-smb.c b/hydra-smb.c
-index 0d6fb2e..2d9ee7f 100644
---- hydra-smb.c
-+++ hydra-smb.c
-@@ -176,17 +176,17 @@ static void MakeKey(unsigned char *key, unsigned char *des_key) {
-   des_key[6] = Get7Bits(key, 42);
-   des_key[7] = Get7Bits(key, 49);
- 
--  des_set_odd_parity((des_cblock *) des_key);
-+  DES_set_odd_parity((DES_cblock *) des_key);
- }
- 
- /* Do the DesEncryption */
- void DesEncrypt(unsigned char *clear, unsigned char *key, unsigned char *cipher) {
--  des_cblock des_key;
--  des_key_schedule key_schedule;
-+  DES_cblock des_key;
-+  DES_key_schedule key_schedule;
- 
-   MakeKey(key, des_key);
--  des_set_key(&des_key, key_schedule);
--  des_ecb_encrypt((des_cblock *) clear, (des_cblock *) cipher, key_schedule, 1);
-+  DES_set_key(&des_key, &key_schedule);
-+  DES_ecb_encrypt((DES_cblock *) clear, (DES_cblock *) cipher, &key_schedule, 1);
- }
- 
- /*
-diff --git a/hydra-snmp.c b/hydra-snmp.c
-index 5649bb7..21ada7f 100644
---- hydra-snmp.c
-+++ hydra-snmp.c
-@@ -335,8 +335,8 @@ int start_snmp(int s, char *ip, int port, unsigned char options, char *miscptr,
-       // 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
- 
diff --git a/security/hydra/files/patch-hydra-gtk-make_xhydra.sh b/security/hydra/files/patch-hydra-gtk-make_xhydra.sh
index ef99a5beb6a0..a0b914e567e7 100644
--- a/security/hydra/files/patch-hydra-gtk-make_xhydra.sh
+++ b/security/hydra/files/patch-hydra-gtk-make_xhydra.sh
@@ -1,4 +1,4 @@
---- hydra-gtk/make_xhydra.sh.orig	2016-06-16 14:57:15 UTC
+--- hydra-gtk/make_xhydra.sh.orig	2016-08-11 07:50:21 UTC
 +++ hydra-gtk/make_xhydra.sh
 @@ -8,7 +8,7 @@ test -e Makefile || {
    cat errors