e7c6234e52
- update to 1.4.3
compression: add support for zlib@openssh.com
Bug fixes:
sftp_read: return error if a too large package arrives
libssh2_hostkey_hash.3: update the description of return value
examples: use stderr for messages, stdout for data
openssl: do not leak memory when handling errors
improved handling of disabled MD5 algorithm in OpenSSL
known_hosts: Fail when parsing unknown keys in known_hosts file
configure: gcrypt doesn't come with pkg-config support
session_free: wrong variable used for keeping state
libssh2_userauth_publickey_fromfile_ex.3: mention publickey == NULL
comp_method_zlib_decomp: handle Z_BUF_ERROR when inflating
Return LIBSSH2_ERROR_SOCKET_DISCONNECT on EOF when reading banner
userauth.c: fread() from public key file to correctly detect any errors
configure.ac: Add option to disable build of the example applications
Added 'Requires.private:' line to libssh2.pc
SFTP: filter off incoming "zombie" responses
gettimeofday: no need for a replacement under cygwin
SSH_MSG_CHANNEL_REQUEST: default to want_reply
win32/libssh2_config.h: Remove hardcoded #define LIBSSH2_HAVE_ZLIB
build error with gcrypt backend
always do "forced" window updates to avoid corner case stalls
aes: the init function fails when OpenSSL has AES support
transport_send: Finish in-progress key exchange before sending data
channel_write: acknowledge transport errors
examples/x11.c: Make sure sizeof passed to read operation is correct
examples/x11.c:,Fix suspicious sizeof usage
sftp_packet_add: verify the packet before accepting it
SFTP: preserve the original error code more
OBS-URL: https://build.opensuse.org/request/show/147891
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libssh2_org?expand=0&rev=41
60 lines
2.7 KiB
Diff
60 lines
2.7 KiB
Diff
From 33a59a1905feb5d786e9d457f287dd9e81a9f747 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
|
|
Date: Tue, 27 Dec 2011 00:33:28 -0300
|
|
Subject: [PATCH] Use O_CLOEXEC where needed
|
|
|
|
---
|
|
src/agent.c | 2 +-
|
|
src/knownhost.c | 4 ++--
|
|
src/userauth.c | 2 +-
|
|
3 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
Index: libssh2-1.4.3/src/agent.c
|
|
===================================================================
|
|
--- libssh2-1.4.3.orig/src/agent.c 2012-03-05 20:04:56.000000000 +0100
|
|
+++ libssh2-1.4.3/src/agent.c 2013-01-08 16:24:07.572195659 +0100
|
|
@@ -152,7 +152,7 @@ agent_connect_unix(LIBSSH2_AGENT *agent)
|
|
return _libssh2_error(agent->session, LIBSSH2_ERROR_BAD_USE,
|
|
"no auth sock variable");
|
|
|
|
- agent->fd = socket(PF_UNIX, SOCK_STREAM, 0);
|
|
+ agent->fd = socket(PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
|
|
if (agent->fd < 0)
|
|
return _libssh2_error(agent->session, LIBSSH2_ERROR_BAD_SOCKET,
|
|
"failed creating socket");
|
|
Index: libssh2-1.4.3/src/knownhost.c
|
|
===================================================================
|
|
--- libssh2-1.4.3.orig/src/knownhost.c 2012-08-21 20:27:22.000000000 +0200
|
|
+++ libssh2-1.4.3/src/knownhost.c 2013-01-08 16:24:07.573195691 +0100
|
|
@@ -907,7 +907,7 @@ libssh2_knownhost_readfile(LIBSSH2_KNOWN
|
|
"Unsupported type of known-host information "
|
|
"store");
|
|
|
|
- file = fopen(filename, "r");
|
|
+ file = fopen(filename, "re");
|
|
if(file) {
|
|
while(fgets(buf, sizeof(buf), file)) {
|
|
if(libssh2_knownhost_readline(hosts, buf, strlen(buf), type)) {
|
|
@@ -1082,7 +1082,7 @@ libssh2_knownhost_writefile(LIBSSH2_KNOW
|
|
"Unsupported type of known-host information "
|
|
"store");
|
|
|
|
- file = fopen(filename, "w");
|
|
+ file = fopen(filename, "we");
|
|
if(!file)
|
|
return _libssh2_error(hosts->session, LIBSSH2_ERROR_FILE,
|
|
"Failed to open file");
|
|
Index: libssh2-1.4.3/src/userauth.c
|
|
===================================================================
|
|
--- libssh2-1.4.3.orig/src/userauth.c 2012-04-18 22:24:04.000000000 +0200
|
|
+++ libssh2-1.4.3/src/userauth.c 2013-01-08 16:24:07.573195691 +0100
|
|
@@ -467,7 +467,7 @@ file_read_publickey(LIBSSH2_SESSION * se
|
|
_libssh2_debug(session, LIBSSH2_TRACE_AUTH, "Loading public key file: %s",
|
|
pubkeyfile);
|
|
/* Read Public Key */
|
|
- fd = fopen(pubkeyfile, "r");
|
|
+ fd = fopen(pubkeyfile, "re");
|
|
if (!fd) {
|
|
return _libssh2_error(session, LIBSSH2_ERROR_FILE,
|
|
"Unable to open public key file");
|