aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2019-04-26 10:06:49 +0200
committerHans Nilsson <[email protected]>2019-04-26 10:06:49 +0200
commitcc804d6650f81617a4a6fd08617be43cf8aa6c2e (patch)
tree34c5f9390e8701f741f720e90bb5cdac6d431df7 /lib
parenta90da2351b7088547b93413a3adf779d936bd056 (diff)
parent5593c7237c691eeef73a157d0aabe7a254b15912 (diff)
downloadotp-cc804d6650f81617a4a6fd08617be43cf8aa6c2e.tar.gz
otp-cc804d6650f81617a4a6fd08617be43cf8aa6c2e.tar.bz2
otp-cc804d6650f81617a4a6fd08617be43cf8aa6c2e.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # make/otp_version_tickets_in_merge
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh/doc/src/notes.xml22
-rw-r--r--lib/ssh/vsn.mk2
2 files changed, 23 insertions, 1 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index bad5815f40..78990c48f2 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,28 @@
<file>notes.xml</file>
</header>
+<section><title>Ssh 4.7.6</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ When an SSH server receives the very first message on a
+ new TCP connection, and that message is not the expected
+ one, the 64 first bytes of the received message are now
+ dumped in the INFO REPORT that reports the Protocol
+ Error.</p>
+ <p>
+ This facilitates the debugging of who sends the bad
+ message or of detecting a possible port scanning.</p>
+ <p>
+ Own Id: OTP-15772</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Ssh 4.7.5</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 2947f82556..837da27ab0 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,4 +1,4 @@
#-*-makefile-*- ; force emacs to enter makefile-mode
-SSH_VSN = 4.7.5
+SSH_VSN = 4.7.6
APP_VSN = "ssh-$(SSH_VSN)"