components/network/openssh/patches/0006-Deprecated-SunSSH-options.patch

   1 From 229f03b20eb7ad551ba02508eb742c2ea5b88e7b Mon Sep 17 00:00:00 2001
   2 From: oracle <solaris@oracle.com>
   3 Date: Mon, 3 Aug 2015 14:35:12 -0700
   4 Subject: [PATCH 06/34] Deprecated SunSSH options
   5
   6 #
   7 # To make the transition from SunSSH to OpenSSH as smooth as possible, we
   8 # added SunSSH-only options as deprecated options in OpenSSH. Note that this
   9 # is an interim enhancement to OpenSSH to make the transition smoother. If a
  10 # deprecated SunSSH-only option is migrated to OpenSSH later, then it will be
  11 # changed from deprecated to supported. Since this is for Solaris only, we will
  12 # not contribute back this change to the upstream community.
  13 #
  14 ---
  15  readconf.c | 18 ++++++++++++++++++
  16  1 file changed, 18 insertions(+)
  17
  18 diff --git a/readconf.c b/readconf.c
  19 index 69d4553..0e955ae 100644
  20 --- a/readconf.c
  21 +++ b/readconf.c
  22 @@ -282,6 +282,24 @@ static struct {
  23         { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes },
  24         { "ignoreunknown", oIgnoreUnknown },
  25
  26 +#ifdef DEPRECATE_SUNSSH_OPT
  27 +        /*
  28 +         * On Solaris, to make the transition from SunSSH to OpenSSH as smooth
  29 +         * as possible, we will deprecate SunSSH-only options in OpenSSH.
  30 +         * Therefore, on a system that is running OpenSSH with a deprecated
  31 +         * option from the user's config file (~/.ssh/config), the ssh
  32 +         * connection will proceed without the deprecated option. Note that
  33 +         * this is an interim enhancement to OpenSSH to make the transition
  34 +         * smoother.  If a deprecated SunSSH-only option is migrated to OpenSSH
  35 +         * later, then it will be changed from deprecated to supported.
  36 +         */
  37 +        { "kmfpolicydatabase", oDeprecated },
  38 +        { "kmfpolicyname", oDeprecated },
  39 +        { "trustedanchorkeystore", oDeprecated },
  40 +        { "usefips140", oDeprecated },
  41 +        { "useopensslengine", oDeprecated },
  42 +#endif
  43 +
  44         { NULL, oBadOption }
  45  };
  46
  47 --
  48 2.5.4 (Apple Git-61)
  49