svn commit: r431773 - head/security/openssh-portable/files

[Bryan Drewery]

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