From 89cac5263716fb51bd3f2121034dee555916385d Mon Sep 17 00:00:00 2001
From: Manoj Ampalam <manojampalam@live.com>
Date: Tue, 20 Feb 2018 23:02:04 -0800
Subject: [PATCH] onboarding fileversion, productversion and softwareversion
 changes (#274)

Updated file version info:
FileVersionRaw : 7.6.0.0
ProductVersionRaw : 7.6.0.0
ProductName : OpenSSH for Windows
ProductVersion : OpenSSH_7.6p1 for Windows

Updated softwareversion - this would show up in protocol identification string and when doing ssh -V
OpenSSH_for_Windows_7.6
---
 contrib/win32/openssh/version.rc  | Bin 4058 -> 2046 bytes
 regress/pesterTests/SSH.Tests.ps1 |   2 +-
 version.h                         |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/win32/openssh/version.rc b/contrib/win32/openssh/version.rc
index 4fb321613f0933f616d814ed7b3d9373c12880c2..e08cf3084fb5bc99303cd2da14313c179d5c3a3e 100644
GIT binary patch
literal 2046
zcmcIlO;6)65WPprf0zvy5LN3!1>%@CZiom;RVP_0Aw}KB0ZYX}PAWL?<JS%*>%!9A
zL+g_>-}B~;GZ?@vTZyW!$_6r4Z<cGAoSwo1<y0&iT7aN+wGk@{^-8ekrf*w=fo&Zz
zzFKbz3eJbV|LEA3R1~yioPs+eN$Lf0KF6*XN8utTi`#J=66L?g^Ipzi0Df0-DXJ%E
z9w{XFE(xMZn0gq_x<<Zq@WQxkLf5~?(psE0TmrHSjRW8Tm_Mvp{Rqb?XKIF|k)y0n
zItc1^Qmlj@@6#%d-RYg26p7RM1m|8Dp1|81n99VR`#Fx%6Wa>i$WL7#gStqW9|q*Q
z2P7Svf;^R@RzxYc00^QizQNuBx>h00k-sy;wuYt<Y-^1DAhIox#~|-LlJv!qEX=mf
zc6j_DzSHr>xfl0by0;<CK<7IGedlvTc_Akwk8G#gq7F7y-<~<Dcq(&cRMf2EAFyR4
z&+wcCag+zqGzR^l?y}Qq5MnKX%icu~^^la#=CPMflCKJ7J`G);+`8lj(Cc{_cGSo{
zJWhQbvo(?iL#3zdntqa_R<01zikL|25khDrHEmhRVuqzmS+?Jjmxjog{y2;$H{g&)
zF#a%QYZ~yf(qlBt)F`wm8lfvR`lYC%r0RS!RHDocQw)xZs4;bV;9T}E`lxTZ8n!c0
z6`NHPEuW~ejh`te<QmFKz)!}D>ZLYPe)TibXxCh(dmerhpryHr(p_|a*;4GrLAREO
zC9l`ZM$$!=tMI?-!SD<z4t#{wyR=2;|9F@7%x$$UEz`E2;clJwoKCOOKmJAM-9xPZ
QMF&{wE!=t4{PijM4XVf8(EtDd

literal 4058
zcmdUyO>f#j5QgVmssCZ?TpBeBq{*end=QFC0L4ICDH5UqQY3033`!6E?QNgg&Biu1
zw52_`vg}=tXJ+T~-Sv;}6{(1kE1AlzEMzV*_e7S^`p{xo$xvpzoy#jOBX=^Eh<gEj
z$vA?xU{tvkvs>ndH`O+kdw34zxjbW)iXHc$Mtq&YJ+iz(PX16nOJKQGa?kQjteomT
zm5zkcm7ZKkL)tQsYpFrKVBV6Ze1sD6ypl60P3C@mwV`~Mx6Y47>cnL|#uK76moNCg
zBsv<0E?$4&*}&^_{M2~Vpugr`&&aQH@L=QX<g)QEU&Opct~yr4N-JrC-@Da@kG$7g
zuF+d($Zkac&B#<t4H$Vz&LiG@ABN0aSH`kmPz7<Sr=~VuFEYI~LgT4iQdO>}Li(pi
zcb&8Hfa+>;sorl~W}{>m9oN+G0I3%8`*zhP)E3kpW8K!Nr#QYkx*PQBTRA{?2;UhL
zC$r8m;H&FuR{`qF<_ggM=;O&dR=xP|u%NiheNE`7_YpBG<}~*E8NSyoQYg21yo!<c
zMyikKtNC*gQz^xjUDhZ<{6O+}6UYs?bwfov>`$!RWYO`C7X9fudlrvJbedv}yA&ge
z@FrhvK1bz3m9#Z#p}zZ3_kP{sV?3Ud4^Q`=^y$6<JT>|}w0m%iclG>|K2z!R7f)Ad
z14o0tuC4JHD)@l9^S9&epubH8_CTQSZ%KIVmliwfSa$`6g!H~a`&T(8gH7v?R%L=3
zif%O!r$?7$?MyT|4M$J%V~{u|PTTpbDSq9jbk(dx8~dE@6KvG$<WVMxR+sZk2MZma
z*O`2Gcv;L<-1~~IZQ`nt39w*EzV&2wM~0?&HYQIIw$9hOu~?h$imX=kq$+Q$N1u3R
z`#O;+!Y2RKkA3o}XB>?|@ML4QP6NAl1k}<YtNFWl)ndIJqA({*D^93O>UqeCYs`AO
zCk4dop0|i-={{v_bQX;7ZRAEsK2Q<6ueZB52~vB%@|0|D`uMhZisLT1&Ss>Gwjr^J
zsU1CoIOK4V)6R31pm986C($Z*UEu6ZtW9S6eKYd@o3l_F1<N&8@6)%#t8FLU{LWJ@
skJ8qtXZr5Pzy0UYlfd?W9v{oJ73G?%g`4X=0$ud4JpYH2&%0{+306<oXaE2J

diff --git a/regress/pesterTests/SSH.Tests.ps1 b/regress/pesterTests/SSH.Tests.ps1
index 66bc92c93..df728dd51 100644
--- a/regress/pesterTests/SSH.Tests.ps1
+++ b/regress/pesterTests/SSH.Tests.ps1
@@ -106,7 +106,7 @@ Describe "E2E scenarios for ssh client" -Tags "CI" {
 
         It "$tC.$tI - test version" {
             iex "cmd /c `"ssh -V 2> $stderrFile`""
-            $stderrFile | Should Contain "OpenSSH_"
+            $stderrFile | Should Contain "OpenSSH_for_Windows"
         }
 
         It "$tC.$tI - test help" {
diff --git a/version.h b/version.h
index e093f623b..b9880e9d7 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 /* $OpenBSD: version.h,v 1.80 2017/09/30 22:26:33 djm Exp $ */
 
-#define SSH_VERSION	"OpenSSH_7.6"
+#define SSH_VERSION	"OpenSSH_for_Windows_7.6"
 
 #define SSH_PORTABLE	"p1"
 #define SSH_RELEASE	SSH_VERSION SSH_PORTABLE