lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-08-05 20:55:47 +03:00
Code Activity

include: indentation fixes

Browse Source
This commit is contained in:
Viktor Szakats
2023-04-10 23:08:22 +00:00
committed by Viktor Szakats
parent 0924632fa0
commit 504026262d
3 changed files with 136 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
include/libssh2.h
View File

@@ -301,10 +301,12 @@ typedef struct _LIBSSH2_SK_SIG_INFO {
/* SK authentication callback */ /* SK authentication callback */
#define LIBSSH2_USERAUTH_SK_SIGN_FUNC(name) \ #define LIBSSH2_USERAUTH_SK_SIGN_FUNC(name) \
int name(LIBSSH2_SESSION *session, LIBSSH2_SK_SIG_INFO *sig_info, \ int name(LIBSSH2_SESSION *session, LIBSSH2_SK_SIG_INFO *sig_info, \
const unsigned char *data, size_t data_len, int algorithm, uint8_t flags, \ const unsigned char *data, size_t data_len, \
const char *application, const unsigned char *key_handle, size_t handle_len, \ int algorithm, uint8_t flags, \
void **abstract) const char *application, const unsigned char *key_handle, \
size_t handle_len, \
void **abstract)
/* Flags for SK authentication */ /* Flags for SK authentication */
#define LIBSSH2_SK_PRESENCE_REQUIRED 0x01 #define LIBSSH2_SK_PRESENCE_REQUIRED 0x01
@@ -316,13 +318,15 @@ void **abstract)
void **abstract) void **abstract)
#define LIBSSH2_DEBUG_FUNC(name) \ #define LIBSSH2_DEBUG_FUNC(name) \
void name(LIBSSH2_SESSION *session, int always_display, const char *message, \ void name(LIBSSH2_SESSION *session, int always_display, \
int message_len, const char *language, int language_len, \ const char *message, int message_len, \
const char *language, int language_len, \
void **abstract) void **abstract)
#define LIBSSH2_DISCONNECT_FUNC(name) \ #define LIBSSH2_DISCONNECT_FUNC(name) \
void name(LIBSSH2_SESSION *session, int reason, const char *message, \ void name(LIBSSH2_SESSION *session, int reason, \
int message_len, const char *language, int language_len, \ const char *message, int message_len, \
const char *language, int language_len, \
void **abstract) void **abstract)
#define LIBSSH2_PASSWD_CHANGEREQ_FUNC(name) \ #define LIBSSH2_PASSWD_CHANGEREQ_FUNC(name) \
@@ -667,7 +671,8 @@ libssh2_userauth_password_ex(LIBSSH2_SESSION *session,
#define libssh2_userauth_password(session, username, password) \ #define libssh2_userauth_password(session, username, password) \
libssh2_userauth_password_ex((session), (username), \ libssh2_userauth_password_ex((session), (username), \
(unsigned int)strlen(username), \ (unsigned int)strlen(username), \
(password), (unsigned int)strlen(password), NULL) (password), (unsigned int)strlen(password), \
NULL)
LIBSSH2_API int LIBSSH2_API int
libssh2_userauth_publickey_fromfile_ex(LIBSSH2_SESSION *session, libssh2_userauth_publickey_fromfile_ex(LIBSSH2_SESSION *session,
@@ -736,8 +741,8 @@ LIBSSH2_API int
libssh2_userauth_keyboard_interactive_ex(LIBSSH2_SESSION* session, libssh2_userauth_keyboard_interactive_ex(LIBSSH2_SESSION* session,
const char *username, const char *username,
unsigned int username_len, unsigned int username_len,
LIBSSH2_USERAUTH_KBDINT_RESPONSE_FUNC( LIBSSH2_USERAUTH_KBDINT_RESPONSE_FUNC
(*response_callback))); ((*response_callback)));
#define libssh2_userauth_keyboard_interactive(session, username, \ #define libssh2_userauth_keyboard_interactive(session, username, \
response_callback) \ response_callback) \
@@ -872,9 +877,11 @@ LIBSSH2_API ssize_t libssh2_channel_read_ex(LIBSSH2_CHANNEL *channel,
int stream_id, char *buf, int stream_id, char *buf,
size_t buflen); size_t buflen);
#define libssh2_channel_read(channel, buf, buflen) \ #define libssh2_channel_read(channel, buf, buflen) \
libssh2_channel_read_ex((channel), 0, (buf), (buflen)) libssh2_channel_read_ex((channel), 0, \
(buf), (buflen))
#define libssh2_channel_read_stderr(channel, buf, buflen) \ #define libssh2_channel_read_stderr(channel, buf, buflen) \
libssh2_channel_read_ex((channel), SSH_EXTENDED_DATA_STDERR, (buf), (buflen)) libssh2_channel_read_ex((channel), SSH_EXTENDED_DATA_STDERR, \
(buf), (buflen))
LIBSSH2_API int libssh2_poll_channel_read(LIBSSH2_CHANNEL *channel, LIBSSH2_API int libssh2_poll_channel_read(LIBSSH2_CHANNEL *channel,
int extended); int extended);
@@ -886,7 +893,7 @@ libssh2_channel_window_read_ex(LIBSSH2_CHANNEL *channel,
#define libssh2_channel_window_read(channel) \ #define libssh2_channel_window_read(channel) \
libssh2_channel_window_read_ex((channel), NULL, NULL) libssh2_channel_window_read_ex((channel), NULL, NULL)
/* libssh2_channel_receive_window_adjust is DEPRECATED, do not use! */ /* libssh2_channel_receive_window_adjust() is DEPRECATED, do not use! */
LIBSSH2_API unsigned long LIBSSH2_API unsigned long
libssh2_channel_receive_window_adjust(LIBSSH2_CHANNEL *channel, libssh2_channel_receive_window_adjust(LIBSSH2_CHANNEL *channel,
unsigned long adjustment, unsigned long adjustment,
@@ -903,7 +910,8 @@ LIBSSH2_API ssize_t libssh2_channel_write_ex(LIBSSH2_CHANNEL *channel,
size_t buflen); size_t buflen);
#define libssh2_channel_write(channel, buf, buflen) \ #define libssh2_channel_write(channel, buf, buflen) \
libssh2_channel_write_ex((channel), 0, (buf), (buflen)) libssh2_channel_write_ex((channel), 0, \
(buf), (buflen))
#define libssh2_channel_write_stderr(channel, buf, buflen) \ #define libssh2_channel_write_stderr(channel, buf, buflen) \
libssh2_channel_write_ex((channel), SSH_EXTENDED_DATA_STDERR, \ libssh2_channel_write_ex((channel), SSH_EXTENDED_DATA_STDERR, \
(buf), (buflen)) (buf), (buflen))
@@ -929,7 +937,7 @@ LIBSSH2_API void libssh2_session_set_read_timeout(LIBSSH2_SESSION* session,
long timeout); long timeout);
LIBSSH2_API long libssh2_session_get_read_timeout(LIBSSH2_SESSION* session); LIBSSH2_API long libssh2_session_get_read_timeout(LIBSSH2_SESSION* session);
/* libssh2_channel_handle_extended_data is DEPRECATED, do not use! */ /* libssh2_channel_handle_extended_data() is DEPRECATED, do not use! */
LIBSSH2_API void libssh2_channel_handle_extended_data(LIBSSH2_CHANNEL *channel, LIBSSH2_API void libssh2_channel_handle_extended_data(LIBSSH2_CHANNEL *channel,
int ignore_mode); int ignore_mode);
LIBSSH2_API int libssh2_channel_handle_extended_data2(LIBSSH2_CHANNEL *channel, LIBSSH2_API int libssh2_channel_handle_extended_data2(LIBSSH2_CHANNEL *channel,
@@ -944,8 +952,7 @@ LIBSSH2_API int libssh2_channel_handle_extended_data2(LIBSSH2_CHANNEL *channel,
*/ */
/* DEPRECATED */ /* DEPRECATED */
#define libssh2_channel_ignore_extended_data(channel, ignore) \ #define libssh2_channel_ignore_extended_data(channel, ignore) \
libssh2_channel_handle_extended_data((channel), \ libssh2_channel_handle_extended_data((channel), (ignore) ? \
(ignore) ? \
LIBSSH2_CHANNEL_EXTENDED_DATA_IGNORE : \ LIBSSH2_CHANNEL_EXTENDED_DATA_IGNORE : \
LIBSSH2_CHANNEL_EXTENDED_DATA_NORMAL) LIBSSH2_CHANNEL_EXTENDED_DATA_NORMAL)
@@ -976,7 +983,7 @@ LIBSSH2_API int libssh2_channel_free(LIBSSH2_CHANNEL *channel);
LIBSSH2_API LIBSSH2_CHANNEL *libssh2_scp_recv(LIBSSH2_SESSION *session, LIBSSH2_API LIBSSH2_CHANNEL *libssh2_scp_recv(LIBSSH2_SESSION *session,
const char *path, const char *path,
struct stat *sb); struct stat *sb);
/* Use libssh2_scp_recv2 for large (> 2GB) file support on windows */ /* Use libssh2_scp_recv2() for large (> 2GB) file support on windows */
LIBSSH2_API LIBSSH2_CHANNEL *libssh2_scp_recv2(LIBSSH2_SESSION *session, LIBSSH2_API LIBSSH2_CHANNEL *libssh2_scp_recv2(LIBSSH2_SESSION *session,
const char *path, const char *path,
libssh2_struct_stat *sb); libssh2_struct_stat *sb);
@@ -1023,7 +1030,7 @@ struct libssh2_knownhost {
}; };
/* /*
* libssh2_knownhost_init * libssh2_knownhost_init()
* *
* Init a collection of known hosts. Returns the pointer to a collection. * Init a collection of known hosts. Returns the pointer to a collection.
* *
@@ -1032,7 +1039,7 @@ LIBSSH2_API LIBSSH2_KNOWNHOSTS *
libssh2_knownhost_init(LIBSSH2_SESSION *session); libssh2_knownhost_init(LIBSSH2_SESSION *session);
/* /*
* libssh2_knownhost_add * libssh2_knownhost_add()
* *
* Add a host and its associated key to the collection of known hosts. * Add a host and its associated key to the collection of known hosts.
* *
@@ -1084,7 +1091,7 @@ libssh2_knownhost_add(LIBSSH2_KNOWNHOSTS *hosts,
struct libssh2_knownhost **store); struct libssh2_knownhost **store);
/* /*
* libssh2_knownhost_addc * libssh2_knownhost_addc()
* *
* Add a host and its associated key to the collection of known hosts. * Add a host and its associated key to the collection of known hosts.
* *
@@ -1102,8 +1109,8 @@ libssh2_knownhost_add(LIBSSH2_KNOWNHOSTS *hosts,
* If 'sha1' is selected as type, the salt must be provided to the salt * If 'sha1' is selected as type, the salt must be provided to the salt
* argument. This too base64 encoded. * argument. This too base64 encoded.
* *
* The SHA-1 hash is what OpenSSH can be told to use in known_hosts files. If * The SHA-1 hash is what OpenSSH can be told to use in known_hosts files.
* a custom type is used, salt is ignored and you must provide the host * If a custom type is used, salt is ignored and you must provide the host
* pre-hashed when checking for it in the libssh2_knownhost_check() function. * pre-hashed when checking for it in the libssh2_knownhost_check() function.
* *
* The keylen parameter may be omitted (zero) if the key is provided as a * The keylen parameter may be omitted (zero) if the key is provided as a
@@ -1119,7 +1126,7 @@ libssh2_knownhost_addc(LIBSSH2_KNOWNHOSTS *hosts,
struct libssh2_knownhost **store); struct libssh2_knownhost **store);
/* /*
* libssh2_knownhost_check * libssh2_knownhost_check()
* *
* Check a host and its associated key against the collection of known hosts. * Check a host and its associated key against the collection of known hosts.
* *
@@ -1158,7 +1165,7 @@ libssh2_knownhost_checkp(LIBSSH2_KNOWNHOSTS *hosts,
struct libssh2_knownhost **knownhost); struct libssh2_knownhost **knownhost);
/* /*
* libssh2_knownhost_del * libssh2_knownhost_del()
* *
* Remove a host from the collection of known hosts. The 'entry' struct is * Remove a host from the collection of known hosts. The 'entry' struct is
* retrieved by a call to libssh2_knownhost_check(). * retrieved by a call to libssh2_knownhost_check().
@@ -1169,7 +1176,7 @@ libssh2_knownhost_del(LIBSSH2_KNOWNHOSTS *hosts,
struct libssh2_knownhost *entry); struct libssh2_knownhost *entry);
/* /*
* libssh2_knownhost_free * libssh2_knownhost_free()
* *
* Free an entire collection of known hosts. * Free an entire collection of known hosts.
* *
@@ -1190,7 +1197,7 @@ libssh2_knownhost_readline(LIBSSH2_KNOWNHOSTS *hosts,
const char *line, size_t len, int type); const char *line, size_t len, int type);
/* /*
* libssh2_knownhost_readfile * libssh2_knownhost_readfile()
* *
* Add hosts+key pairs from a given file. * Add hosts+key pairs from a given file.
* *
@@ -1226,7 +1233,7 @@ libssh2_knownhost_writeline(LIBSSH2_KNOWNHOSTS *hosts,
int type); int type);
/* /*
* libssh2_knownhost_writefile * libssh2_knownhost_writefile()
* *
* Write hosts+key pairs to a given file. * Write hosts+key pairs to a given file.
* *
@@ -1266,7 +1273,7 @@ struct libssh2_agent_publickey {
}; };
/* /*
* libssh2_agent_init * libssh2_agent_init()
* *
* Init an ssh-agent handle. Returns the pointer to the handle. * Init an ssh-agent handle. Returns the pointer to the handle.
* *

10
include/libssh2_publickey.h
View File

@@ -94,7 +94,9 @@ libssh2_publickey_add_ex(LIBSSH2_PUBLICKEY *pkey,
const libssh2_publickey_attribute attrs[]); const libssh2_publickey_attribute attrs[]);
#define libssh2_publickey_add(pkey, name, blob, blob_len, overwrite, \ #define libssh2_publickey_add(pkey, name, blob, blob_len, overwrite, \
num_attrs, attrs) \ num_attrs, attrs) \
libssh2_publickey_add_ex((pkey), (name), strlen(name), (blob), (blob_len), \ libssh2_publickey_add_ex((pkey), \
(name), strlen(name), \
(blob), (blob_len), \
(overwrite), (num_attrs), (attrs)) (overwrite), (num_attrs), (attrs))
LIBSSH2_API int libssh2_publickey_remove_ex(LIBSSH2_PUBLICKEY *pkey, LIBSSH2_API int libssh2_publickey_remove_ex(LIBSSH2_PUBLICKEY *pkey,
@@ -103,7 +105,9 @@ LIBSSH2_API int libssh2_publickey_remove_ex(LIBSSH2_PUBLICKEY *pkey,
const unsigned char *blob, const unsigned char *blob,
unsigned long blob_len); unsigned long blob_len);
#define libssh2_publickey_remove(pkey, name, blob, blob_len) \ #define libssh2_publickey_remove(pkey, name, blob, blob_len) \
libssh2_publickey_remove_ex((pkey), (name), strlen(name), (blob), (blob_len)) libssh2_publickey_remove_ex((pkey), \
(name), strlen(name), \
(blob), (blob_len))
LIBSSH2_API int LIBSSH2_API int
libssh2_publickey_list_fetch(LIBSSH2_PUBLICKEY *pkey, libssh2_publickey_list_fetch(LIBSSH2_PUBLICKEY *pkey,
@@ -119,4 +123,4 @@ LIBSSH2_API int libssh2_publickey_shutdown(LIBSSH2_PUBLICKEY *pkey);
} /* extern "C" */ } /* extern "C" */
#endif #endif
#endif /* ifndef: LIBSSH2_PUBLICKEY_H */ #endif /* LIBSSH2_PUBLICKEY_H */

5
include/libssh2_sftp.h
View File

@@ -235,8 +235,9 @@ libssh2_sftp_open_ex(LIBSSH2_SFTP *sftp,
(filename), (unsigned int)strlen(filename), \ (filename), (unsigned int)strlen(filename), \
(flags), (mode), LIBSSH2_SFTP_OPENFILE) (flags), (mode), LIBSSH2_SFTP_OPENFILE)
#define libssh2_sftp_opendir(sftp, path) \ #define libssh2_sftp_opendir(sftp, path) \
libssh2_sftp_open_ex((sftp), (path), (unsigned int)strlen(path), 0, 0, \ libssh2_sftp_open_ex((sftp), \
LIBSSH2_SFTP_OPENDIR) (path), (unsigned int)strlen(path), \
0, 0, LIBSSH2_SFTP_OPENDIR)
LIBSSH2_API ssize_t libssh2_sftp_read(LIBSSH2_SFTP_HANDLE *handle, LIBSSH2_API ssize_t libssh2_sftp_read(LIBSSH2_SFTP_HANDLE *handle,
char *buffer, size_t buffer_maxlen); char *buffer, size_t buffer_maxlen);