| --- temp/openssh-7_8_P1-hpn-AES-CTR-14.16.diff.orig 2018-09-12 15:58:57.377986085 -0700 |
| +++ temp/openssh-7_8_P1-hpn-AES-CTR-14.16.diff 2018-09-12 16:07:15.376711327 -0700 |
| @@ -4,8 +4,8 @@ |
| +++ b/Makefile.in |
| @@ -42,7 +42,7 @@ CC=@CC@ |
| LD=@LD@ |
| - CFLAGS=@CFLAGS@ |
| - CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@ |
| + CFLAGS=@CFLAGS@ $(CFLAGS_EXTRA) |
| + CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@ |
| -LIBS=@LIBS@ |
| +LIBS=@LIBS@ -lpthread |
| K5LIBS=@K5LIBS@ |
| @@ -788,8 +788,8 @@ |
| ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out) |
| { |
| struct session_state *state; |
| -- const struct sshcipher *none = cipher_by_name("none"); |
| -+ struct sshcipher *none = cipher_by_name("none"); |
| +- const struct sshcipher *none = cipher_none(); |
| ++ struct sshcipher *none = cipher_none(); |
| int r; |
| |
| if (none == NULL) { |
| @@ -933,9 +933,9 @@ |
| /* Portable-specific options */ |
| sUsePAM, |
| + sDisableMTAES, |
| - /* Standard Options */ |
| - sPort, sHostKeyFile, sLoginGraceTime, |
| - sPermitRootLogin, sLogFacility, sLogLevel, |
| + /* X.509 Standard Options */ |
| + sHostbasedAlgorithms, |
| + sPubkeyAlgorithms, |
| @@ -626,6 +630,7 @@ static struct { |
| { "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL }, |
| { "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL }, |
| --- temp/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff.orig 2018-09-12 16:38:16.947447218 -0700 |
| +++ temp/openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff 2018-09-12 16:32:35.479700864 -0700 |
| @@ -382,7 +382,7 @@ |
| @@ -822,6 +822,10 @@ kex_choose_conf(struct ssh *ssh) |
| int nenc, nmac, ncomp; |
| u_int mode, ctos, need, dh_need, authlen; |
| - int r, first_kex_follows; |
| + int r, first_kex_follows = 0; |
| + int auth_flag; |
| + |
| + auth_flag = packet_authentication_state(ssh); |
| @@ -1125,15 +1125,6 @@ |
| index a738c3a..b32dbe0 100644 |
| --- a/sshd.c |
| +++ b/sshd.c |
| -@@ -373,7 +373,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out) |
| - char remote_version[256]; /* Must be at least as big as buf. */ |
| - |
| - xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n", |
| -- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, |
| -+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, |
| - *options.version_addendum == '\0' ? "" : " ", |
| - options.version_addendum); |
| - |
| @@ -1037,6 +1037,8 @@ listen_on_addrs(struct listenaddr *la) |
| int ret, listen_sock; |
| struct addrinfo *ai; |
| @@ -1213,14 +1204,3 @@ |
| # Example of overriding settings on a per-user basis |
| #Match User anoncvs |
| # X11Forwarding no |
| -diff --git a/version.h b/version.h |
| -index f1bbf00..21a70c2 100644 |
| ---- a/version.h |
| -+++ b/version.h |
| -@@ -3,4 +3,5 @@ |
| - #define SSH_VERSION "OpenSSH_7.8" |
| - |
| - #define SSH_PORTABLE "p1" |
| --#define SSH_RELEASE SSH_VERSION SSH_PORTABLE |
| -+#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN |
| -+ |
