2 files changed, 59 insertions, 67 deletions

diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile
index 7a960db0fed8..78ffa5ae722b 100644
--- a/security/dropbear/Makefile
+++ b/security/dropbear/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dropbear
-PORTVERSION=	2019.78
-PORTREVISION=	1
+PORTVERSION=	2020.79
 CATEGORIES=	security
 MASTER_SITES=	https://matt.ucc.asn.au/dropbear/releases/
 
@@ -18,29 +17,33 @@ CPE_VENDOR=	matt_johnston
 CPE_PRODUCT=	dropbear_ssh_server
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-harden
 USE_RC_SUBR=	${PORTNAME}
 ALL_TARGET=	all scp
 
-OPTIONS_DEFINE=		SMALL_CODE STATIC
-OPTIONS_DEFAULT=	AES128 AES256 CTR CURVE25519 GROUP14_SHA256 GROUP16 RSA SHA2_256 TWOFISH128 TWOFISH256
+OPTIONS_DEFINE=		SMALL_CODE STATIC X11FWD
+OPTIONS_DEFAULT=	AES128 AES256 CURVE25519 ED25519 GCM GROUP14_SHA256 \
+			GROUP16 RSA SHA2_256
 OPTIONS_MULTI=		ENC KEY KEX MAC MODE
-OPTIONS_MULTI_ENC=	3DES AES128 AES256 BLOWFISH TWOFISH128 TWOFISH256
-OPTIONS_MULTI_KEY=	ECDSA DSA RSA
-OPTIONS_MULTI_KEX=	CURVE25519 ECDH GROUP1 GROUP14_SHA1 GROUP14_SHA256 GROUP16
-OPTIONS_MULTI_MAC=	MD5 SHA1 SHA1_96 SHA2_256
-OPTIONS_MULTI_MODE=	CBC CTR
+OPTIONS_MULTI_ENC=	3DES AES128 AES256 CHACHA20POLY1305 TWOFISH128 \
+			TWOFISH256
+OPTIONS_MULTI_KEY=	ECDSA ED25519 DSA RSA
+OPTIONS_MULTI_KEX=	CURVE25519 ECDH GROUP1 GROUP14_SHA1 GROUP14_SHA256 \
+			GROUP16
+OPTIONS_MULTI_MAC=	MD5 SHA1 SHA1_96 SHA2_256 SHA2_512
+OPTIONS_MULTI_MODE=	CBC CTR GCM
 
 3DES_DESC=		Enable 3DES-based encryption
 AES128_DESC=		Enable AES128-based encryption
 AES256_DESC=		Enable AES256-based encryption
-BLOWFISH_DESC=		Enable Blowfish-based encryption
 CBC_DESC=		Use CBC mode for ciphers (less secure)
-CTR_DESC=		Use CTR mode for ciphers (more secure)
+CHACHA20POLY1305_DESC=	Enable chacha20poly1305-based encryption
+CTR_DESC=		Use CTR mode for ciphers
 CURVE25519_DESC=	Enable Curve25519
 DSA_DESC=		Enable DSA public key support
 ECDH_DESC=		Enable ECDH (insecure)
 ECDSA_DESC=		Enable ECDSA public key support
+ED25519_DESC=		Enable ED25519 public key support
+GCM_DESC=		Enable GCM mode for ciphers (more secure)
 GROUP14_SHA1_DESC=	Enable Group14 Diffie-Helman with SHA1 (insecure)
 GROUP14_SHA256_DESC=	Enable Group14 Diffie-Helman with SHA256
 GROUP16_DESC=		Enable Group16 Diffie-Hellman
@@ -50,9 +53,11 @@ RSA_DESC=		Enable RSA public key support
 SHA1_96_DESC=		Enable SHA1_96 MAC (less secure)
 SHA1_DESC=		Enable SHA1 MAC (less secure)
 SHA2_256_DESC=		Enable SHA2_256 MAC
+SHA2_512_DESC=		Enable SHA2_512 MAC
 SMALL_CODE_DESC=	Make binary smaller in exchange for 50% performance hit
 TWOFISH128_DESC=	Enable Twofish128-based encryption
 TWOFISH256_DESC=	Enable Twofish256-based encryption
+X11FWD_DESC=		Enable X11 forwarding
 
 3DES_IMPLIES=	CTR
 CBC_IMPLIES=	CTR
@@ -62,97 +67,84 @@ STATIC_CONFIGURE_ENABLE=	static
 post-patch:
 	@${REINPLACE_CMD} -e "s,_PRIV_FILENAME \"/etc/,_PRIV_FILENAME \"${PREFIX}/etc/,g; \
 		s,/usr/bin/X11/,${LOCALBASE}/,g" ${WRKSRC}/default_options.h
-	@${REINPLACE_CMD} -e "s,sys/dir.h,dirent.h," ${WRKSRC}/*.[ch]
-	@${REINPLACE_CMD} -e "s,make clean,\$${MAKE} clean," \
-				${WRKSRC}/libtomcrypt/Makefile.in
 
 post-patch-SMALL_CODE-off:
-	@${REINPLACE_CMD} -e "/#define DROPBEAR_SMALL_CODE/d" \
-		${WRKSRC}/default_options.h
+	@${ECHO} "#define DROPBEAR_SMALL_CODE 0" >> ${WRKSRC}/localoptions.h
 
-post-patch-3DES-off:
-	@${REINPLACE_CMD} -e "/#define DROPBEAR_3DES/d" \
-		${WRKSRC}/default_options.h
+post-patch-3DES-on:
+	@${ECHO} "#define DROPBEAR_3DES 1" >> ${WRKSRC}/localoptions.h
 
 post-patch-AES128-off:
-	@${REINPLACE_CMD} -e "/#define DROPBEAR_AES128/d" \
-		${WRKSRC}/default_options.h
+	@${ECHO} "#define DROPBEAR_AES128 0" >> ${WRKSRC}/localoptions.h
 
 post-patch-AES256-off:
-	@${REINPLACE_CMD} -e "/#define DROPBEAR_AES256/d" \
-		${WRKSRC}/default_options.h
+	@${ECHO} "#define DROPBEAR_AES256 0" >> ${WRKSRC}/localoptions.h
+
+post-patch-CHACHA20POLY1305-off:
+	@${ECHO} "#define DROPBEAR_CHACHA20POLY1305 0" >> ${WRKSRC}/localoptions.h
 
 post-patch-TWOFISH256-on:
-	@${REINPLACE_CMD} -e "s,#define DROPBEAR_TWOFISH256 0,#define DROPBEAR_TWOFISH256 1,g" \
-		${WRKSRC}/default_options.h
+	@${ECHO} "#define DROPBEAR_TWOFISH256 1" >> ${WRKSRC}/localoptions.h
 
 post-patch-TWOFISH128-on:
-	@${REINPLACE_CMD} -e "s,#define DROPBEAR_TWOFISH128 0,#define DROPBEAR_TWOFISH128 1,g" \
-		${WRKSRC}/default_options.h
-
-post-patch-BLOWFISH-on:
-	@${REINPLACE_CMD} -e "s,#define DROPBEAR_BLOWFISH 0,#define DROPBEAR_BLOWFISH 1,g" \
-		${WRKSRC}/default_options.h
+	@${ECHO} "#define DROPBEAR_TWOFISH128 1" >> ${WRKSRC}/localoptions.h
 
-post-patch-CBC-off:
-	@${REINPLACE_CMD} -e "/#define DROPBEAR_ENABLE_CBC_MODE/d" \
-		${WRKSRC}/default_options.h
+post-patch-CBC-on:
+	@${ECHO} "#define DROPBEAR_ENABLE_CBC_MODE 1" >> ${WRKSRC}/localoptions.h
 
 post-patch-CTR-off:
-	@${REINPLACE_CMD} -e "/#define DROPBEAR_ENABLE_CTR_MODE/d" \
-		${WRKSRC}/default_options.h
+	@${ECHO} "#define DROPBEAR_ENABLE_CTR_MODE 0" >> ${WRKSRC}/localoptions.h
+
+post-patch-GCM-on:
+	@${ECHO} "#define DROPBEAR_ENABLE_GCM_MODE 1" >> ${WRKSRC}/localoptions.h
 
 post-patch-CURVE25519-off:
-	@${REINPLACE_CMD} -e "/#define DROPBEAR_CURVE25519 1/d" \
-		${WRKSRC}/default_options.h
+	@${ECHO} "#define DROPBEAR_CURVE25519 0" >> ${WRKSRC}/localoptions.h
 
 post-patch-ECDH-off:
-	@${REINPLACE_CMD} -e "/#define DROPBEAR_ECDH 1/d" \
-		${WRKSRC}/default_options.h
+	@${ECHO} "#define DROPBEAR_ECDH 0" >> ${WRKSRC}/localoptions.h
 
 post-patch-GROUP1-off:
-	@${REINPLACE_CMD} -e "/#define DROPBEAR_DH_GROUP1 1/d" \
-		${WRKSRC}/default_options.h
+	@${ECHO} "#define DROPBEAR_DH_GROUP1 0" >> ${WRKSRC}/localoptions.h
 
 post-patch-GROUP14_SHA1-off:
-	@${REINPLACE_CMD} -e "/#define DROPBEAR_DH_GROUP14_SHA1 1/d" \
-		${WRKSRC}/default_options.h
+	@${ECHO} "#define DROPBEAR_DH_GROUP14_SHA1 0" >> ${WRKSRC}/localoptions.h
 
 post-patch-GROUP14_SHA256-off:
-	@${REINPLACE_CMD} -e "/#define DROPBEAR_DH_GROUP14_SHA256 1/d" \
-		${WRKSRC}/default_options.h
+	@${ECHO} "#define DROPBEAR_DH_GROUP14_SHA256 0" >> ${WRKSRC}/localoptions.h
 
 post-patch-GROUP16-on:
-	@${REINPLACE_CMD} -e "s,#define DROPBEAR_DH_GROUP16 0,#define DROPBEAR_DH_GROUP16 1,g" \
-		${WRKSRC}/default_options.h
+	@${ECHO} "#define DROPBEAR_DH_GROUP16 1" >> ${WRKSRC}/localoptions.h
 
 post-patch-DSA-off:
-	@${REINPLACE_CMD} -e "/#define DROPBEAR_DSS/d" \
-		${WRKSRC}/default_options.h
+	@${ECHO} "#define DROPBEAR_DSS 0" >> ${WRKSRC}/localoptions.h
 
 post-patch-RSA-off:
-	@${REINPLACE_CMD} -e "/#define DROPBEAR_RSA/d" \
-		${WRKSRC}/default_options.h
+	@${ECHO} "#define DROPBEAR_RSA 0" >> ${WRKSRC}/localoptions.h
 
 post-patch-ECDSA-off:
-	@${REINPLACE_CMD} -e "/#define DROPBEAR_ECDSA/d" \
-		${WRKSRC}/default_options.h
+	@${ECHO} "#define DROPBEAR_ECDSA 0" >> ${WRKSRC}/localoptions.h
 
-post-patch-MD5-off:
-	@${REINPLACE_CMD} -e "/#define DROPBEAR_MD5_HMAC/d" \
-		${WRKSRC}/default_options.h
+post-patch-ED25519-off:
+	@${ECHO} "#define DROPBEAR_E25519 0" >> ${WRKSRC}/localoptions.h
+
+post-patch-MD5-on:
+	@${ECHO} "#define DROPBEAR_MD5_HMAC 1" >> ${WRKSRC}/localoptions.h
 
 post-patch-SHA1-off:
-	@${REINPLACE_CMD} -e "/#define DROPBEAR_SHA1_HMAC/d" \
-		${WRKSRC}/default_options.h
+	@${ECHO} "#define DROPBEAR_SHA1_HMAC 0" >> ${WRKSRC}/localoptions.h
 
 post-patch-SHA1_96-off:
-	@${REINPLACE_CMD} -e "/#define DROPBEAR_SHA1_96_HMAC/d" \
-		${WRKSRC}/default_options.h
+	@${ECHO} "#define DROPBEAR_SHA1_96_HMAC 0" >> ${WRKSRC}/localoptions.h
 
 post-patch-SHA2_256-off:
-	@${REINPLACE_CMD} -e "/#define DROPBEAR_SHA2_256_HMAC/d" \
-		${WRKSRC}/default_options.h
+	@${ECHO} "#define DROPBEAR_SHA2_256_HMAC 0" >> ${WRKSRC}/localoptions.h
+
+post-patch-SHA2-512-on:
+	@${ECHO} "#define DROPBEAR_SHA2_512_HMAC 1" >> ${WRKSRC}/localoptions.h
+
+post-patch-X11FWD-on:
+	@${ECHO} "#define DROPBEAR_X11FWD 1" >> ${WRKSRC}/localoptions.h
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/dropbear
diff --git a/security/dropbear/distinfo b/security/dropbear/distinfo
index d5011f207077..fa2b84c586b9 100644
--- a/security/dropbear/distinfo
+++ b/security/dropbear/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1560268601
-SHA256 (dropbear-2019.78.tar.bz2) = 525965971272270995364a0eb01f35180d793182e63dd0b0c3eb0292291644a4
-SIZE (dropbear-2019.78.tar.bz2) = 2708659
+TIMESTAMP = 1592303773
+SHA256 (dropbear-2020.79.tar.bz2) = 084f00546b1610a3422a0773e2c04cbe1a220d984209e033b548b49f379cc441
+SIZE (dropbear-2020.79.tar.bz2) = 2290687