deleted file mode 100644

@@ -1,72 +0,0 @@

-From 1c6fa92b77e34d089493fe6d3e2c6c8775858b94 Mon Sep 17 00:00:00 2001

-From: Will Cosgrove <will@panic.com>

-Date: Thu, 29 Aug 2019 15:24:22 -0700

-Subject: [PATCH] fixed type issue, updated SSH_MSG_DISCONNECT

-

-SSH_MSG_DISCONNECT now also uses  _libssh2_get API.

- src/packet.c | 40 +++++++++++++++-------------------------

- 1 file changed, 15 insertions(+), 25 deletions(-)

-

-diff --git a/src/packet.c b/src/packet.c

-index 8908b2c5..97f0cdd4 100644

-+++ b/src/packet.c

-@@ -419,8 +419,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,

-                     size_t datalen, int macstate)

- {

-     int rc = 0;

--    char *message = NULL;

--    char *language = NULL;

-+    unsigned char *message = NULL;

-+    unsigned char *language = NULL;

-     size_t message_len = 0;

-     size_t language_len = 0;

-     LIBSSH2_CHANNEL *channelp = NULL;

-@@ -472,33 +472,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data,

- 

-         case SSH_MSG_DISCONNECT:

-             if(datalen >= 5) {

--                size_t reason = _libssh2_ntohu32(data + 1);

-+                uint32_t reason = 0;

-+                struct string_buf buf;

-+                buf.data = (unsigned char *)data;

-+                buf.dataptr = buf.data;

-+                buf.len = datalen;

-+                buf.dataptr++; /* advance past type */

- 

--                if(datalen >= 9) {

--                    message_len = _libssh2_ntohu32(data + 5);

-+                _libssh2_get_u32(&buf, &reason);

-+                _libssh2_get_string(&buf, &message, &message_len);

-+                _libssh2_get_string(&buf, &language, &language_len);

- 

--                    if(message_len < datalen-13) {

--                        /* 9 = packet_type(1) + reason(4) + message_len(4) */

--                        message = (char *) data + 9;

--

--                        language_len =

--                            _libssh2_ntohu32(data + 9 + message_len);

--                        language = (char *) data + 9 + message_len + 4;

--

--                        if(language_len > (datalen-13-message_len)) {

--                            /* bad input, clear info */

--                            language = message = NULL;

--                            language_len = message_len = 0;

--                        }

--                    }

--                    else

--                        /* bad size, clear it */

--                        message_len = 0;

--                }

-                 if(session->ssh_msg_disconnect) {

--                    LIBSSH2_DISCONNECT(session, reason, message,

--                                       message_len, language, language_len);

-+                    LIBSSH2_DISCONNECT(session, reason, (const char *)message,

-+                                       message_len, (const char *)language,

-+                                       language_len);

-                 }

-+

-                 _libssh2_debug(session, LIBSSH2_TRACE_TRANS,

-                                "Disconnect(%d): %s(%s)", reason,

-                                message, language);

@@ -1,34 +1,33 @@

 Summary:        libssh2 is a library implementing the SSH2 protocol.

 Name:           libssh2

-Version:        1.9.0

-Release:        4%{?dist}

+Version:        1.10.0

+Release:        1%{?dist}

 License:        BSD

 URL:            https://www.libssh2.org/

 Group:          System Environment/NetworkingLibraries

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        https://www.libssh2.org/download/libssh2-%{version}.tar.gz

-%define sha1    libssh2=21e98282b103307a16792e5e2d4c99beaf0b3b9c

-Patch0:         CVE-2019-17498.patch

+%define sha512  libssh2=e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30

 BuildRequires:  openssl-devel

 BuildRequires:  zlib-devel

 BuildRequires:  pkg-config

-

 Requires:       openssl

 Requires:       zlib

 %description

 libssh2 is a client-side C library implementing the SSH2 protocol.

-%package devel

-Summary: Header files for libssh2

-Group: System Environment/NetworkingLibraries

-Requires: libssh2

-%description devel

+%package        devel

+Summary:        Header files for libssh2

+Group:          System Environment/NetworkingLibraries

+Requires:       libssh2

+

+%description    devel

 These are the header files of libssh2.

 %prep

-%autosetup -p1

+%autosetup

 %build

 if [ %{_host} != %{_build} ]; then

@@ -58,6 +57,8 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'

 %{_mandir}/man3/*

 %changelog

+*   Thu Apr 21 2022 Gerrit Photon <photon-checkins@vmware.com> 1.10.0-1

+-   Automatic Version Bump

 *   Wed Aug 04 2021 Satya Naga Vasamsetty <svasamsetty@vmware.com> 1.9.0-4

 -   Bump up release for openssl

 *   Tue Dec 15 2020 Shreenidhi Shedi <sshedi@vmware.com> 1.9.0-3