diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-01-17 19:38:38 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2017-01-17 19:38:38 +0000 |
| commit | d5324e35113653d9c20fbcab6d36b68c1f97b614 (patch) | |
| tree | dff90f139b910cf694a403305a8b7d201d357424 /security | |
| parent | The change in r431769 requires a PORTREVISION bump. (diff) | |
Fix build with NONE_CIPHER.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssh-portable/files/extra-patch-hpn | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/openssh-portable/files/extra-patch-hpn b/security/openssh-portable/files/extra-patch-hpn index d99575c65ede..83462934c1a2 100644 --- a/security/openssh-portable/files/extra-patch-hpn +++ b/security/openssh-portable/files/extra-patch-hpn @@ -300,7 +300,7 @@ diff -urN -x configure -x config.guess -x config.h.in -x config.sub work.clean/o #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 -x config.h.in -x config.sub work.clean/o 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 -x config.h.in -x config.sub work.clean/o 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 |