From eace29905be436d77245656b2511c9a9c2c67c90 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Fri, 5 May 2017 13:15:42 +0200
Subject: Revert "Prepare release"

This reverts commit dc57404252c47520f352834ad9be45ad684f96c9.
---
 lib/ssh/doc/src/notes.xml | 117 ----------------------------------------------
 lib/ssh/vsn.mk            |   2 +-
 2 files changed, 1 insertion(+), 118 deletions(-)

(limited to 'lib/ssh')

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index ac31ab14a6..bddae00dd2 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,123 +30,6 @@
     <file>notes.xml</file>
   </header>
 
-<section><title>Ssh 4.5</title>
-
-    <section><title>Improvements and New Features</title>
-      <list>
-        <item>
-          <p>
-	    The internal handling of SSH options is re-written.</p>
-          <p>
-	    Previously there were no checks if a client option was
-	    given to a daemon or vice versa. This is corrected now.
-	    If your code has e.g. a client-only option in a call to
-	    start a daemon, the call will fail.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-12872</p>
-        </item>
-        <item>
-          <p>
-	    Modernization of diffie-hellman algorithms. Removed an
-	    outdated weak algorithm and added stronger replacements
-	    to keep interoperability with other ssh clients and
-	    servers. The default ordering is also adjusted.</p>
-          <p>
-	    Retired: key-exchange <c>diffie-hellman-group1-sha1</c>.
-	    It is not enabled by default, but can be enabled with the
-	    option <c>preferred-algorithms</c>.</p>
-          <p>
-	    Added: key-exchange <c>diffie-hellman-group16-sha512</c>,
-	    <c>diffie-hellman-group18-sha512</c> and
-	    <c>diffie-hellman-group14-sha256</c>.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-14110</p>
-        </item>
-        <item>
-          <p>
-	    Modernized internal representation of sftp by use of
-	    maps.</p>
-          <p>
-	    Own Id: OTP-14117</p>
-        </item>
-        <item>
-          <p>
-	    The draft-ietf-curdle-ssh-ext-info-05 and
-	    draft-ietf-curdle-rsa-sha2-05 are (partially)
-	    implemented. </p>
-          <p>
-	    The extension <c>server-sig-algs</c> and the signature
-	    algorithms <c>rsa-sha2-256</c> and <c>rsa-sha2-512</c>
-	    are implemented. The <c>rsa-sha2-*</c> are not enabled by
-	    default yet since they has a bug. Use option
-	    preferred_algorithms with key public key to try them.</p>
-          <p>
-	    Own Id: OTP-14193</p>
-        </item>
-        <item>
-          <p>
-	    Ssh:connect, ssh:shell and ssh:start_channel now accept
-	    an IP-tuple as Host destination argument.</p>
-          <p>
-	    Own Id: OTP-14243</p>
-        </item>
-        <item>
-          <p>
-	    The function <c>ssh:daemon_info/1</c> now returns Host
-	    and Profile as well as the Port info.</p>
-          <p>
-	    Own Id: OTP-14259</p>
-        </item>
-        <item>
-          <p>
-	    Removed the option <c>public_key_alg</c> which was
-	    deprecated in 18.2. Use <c>pref_public_key_algs</c>
-	    instead.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-14263</p>
-        </item>
-        <item>
-          <p>
-	    The ssh application is refactored regarding daemon
-	    starting. The resolution of contradicting <c>Host</c>
-	    argument and <c>ip</c> option were not described. There
-	    were also strange corner cases when the <c>'any'</c>
-	    value was used in <c>Host</c> argument or <c>ip</c>
-	    option. This is (hopefully) resolved now, but it may
-	    cause incompatibilities for code using both <c>Host</c>
-	    and the <c>ip</c> option. The value 'loopback' has been
-	    added for a correct way of naming those addresses.</p>
-          <p>
-	    *** POTENTIAL INCOMPATIBILITY ***</p>
-          <p>
-	    Own Id: OTP-14264</p>
-        </item>
-        <item>
-          <p>
-	    The supervisor code is refactored. The naming of
-	    listening IP-Port-Profile tripples are slightly changed
-	    to improve consistency in strange corner cases as
-	    resolved by OTP-14264</p>
-          <p>
-	    Own Id: OTP-14267 Aux Id: OTP-14266 </p>
-        </item>
-        <item>
-          <p>
-	    The <c>idle_time</c> option can now be used in daemons.</p>
-          <p>
-	    Own Id: OTP-14312</p>
-        </item>
-      </list>
-    </section>
-
-</section>
-
 <section><title>Ssh 4.4.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 7208baca6e..48332d2e5a 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 4.5
+SSH_VSN = 4.4.2
 
 APP_VSN    = "ssh-$(SSH_VSN)"
-- 
cgit v1.2.3