From owner-svn-ports-head@freebsd.org Tue Jan 17 19:38:39 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E17F7CB4816; Tue, 17 Jan 2017 19:38:39 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B0AE4168D; Tue, 17 Jan 2017 19:38:39 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0HJccdd010732; Tue, 17 Jan 2017 19:38:38 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0HJccXS010731; Tue, 17 Jan 2017 19:38:38 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201701171938.v0HJccXS010731@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 17 Jan 2017 19:38:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431773 - head/security/openssh-portable/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jan 2017 19:38:40 -0000 Author: bdrewery Date: Tue Jan 17 19:38:38 2017 New Revision: 431773 URL: https://svnweb.freebsd.org/changeset/ports/431773 Log: Fix build with NONE_CIPHER. Modified: head/security/openssh-portable/files/extra-patch-hpn Modified: head/security/openssh-portable/files/extra-patch-hpn ============================================================================== --- head/security/openssh-portable/files/extra-patch-hpn Tue Jan 17 18:37:29 2017 (r431772) +++ head/security/openssh-portable/files/extra-patch-hpn Tue Jan 17 19:38:38 2017 (r431773) @@ -300,7 +300,7 @@ diff -urN -x configure -x config.guess - #endif --- work.clean/openssh-6.8p1/cipher.c 2015-03-17 00:49:20.000000000 -0500 +++ work/openssh-6.8p1/cipher.c 2015-04-03 16:22:04.972592000 -0500 -@@ -244,7 +244,13 @@ +@@ -273,7 +273,13 @@ ciphers_valid(const char *names) for ((p = strsep(&cp, CIPHER_SEP)); p && *p != '\0'; (p = strsep(&cp, CIPHER_SEP))) { c = cipher_by_name(p); @@ -315,7 +315,7 @@ diff -urN -x configure -x config.guess - free(cipher_list); return 0; } -@@ -545,6 +551,9 @@ +@@ -605,6 +611,9 @@ cipher_get_keyiv(struct sshcipher_ctx *c switch (c->number) { #ifdef WITH_OPENSSL @@ -325,7 +325,7 @@ diff -urN -x configure -x config.guess - case SSH_CIPHER_SSH2: case SSH_CIPHER_DES: case SSH_CIPHER_BLOWFISH: -@@ -593,6 +602,9 @@ +@@ -653,6 +662,9 @@ cipher_set_keyiv(struct sshcipher_ctx *c switch (c->number) { #ifdef WITH_OPENSSL