mirror of
https://git.libssh.org/projects/libssh.git
synced 2026-02-10 10:26:47 +09:00
Some grammarnazi things + fix int->socket_t
This commit is contained in:
@@ -81,7 +81,8 @@ typedef struct ssh_poll_ctx_struct *ssh_poll_ctx;
|
|||||||
typedef struct ssh_poll_handle_struct *ssh_poll_handle;
|
typedef struct ssh_poll_handle_struct *ssh_poll_handle;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief SSH poll callback.
|
* @brief SSH poll callback. This callback will be used when an event
|
||||||
|
* caught on the socket.
|
||||||
*
|
*
|
||||||
* @param p Poll object this callback belongs to.
|
* @param p Poll object this callback belongs to.
|
||||||
* @param fd The raw socket.
|
* @param fd The raw socket.
|
||||||
@@ -89,9 +90,9 @@ typedef struct ssh_poll_handle_struct *ssh_poll_handle;
|
|||||||
* @param userdata Userdata to be passed to the callback function.
|
* @param userdata Userdata to be passed to the callback function.
|
||||||
*
|
*
|
||||||
* @return 0 on success, < 0 if you removed the poll object from
|
* @return 0 on success, < 0 if you removed the poll object from
|
||||||
* it's poll context.
|
* its poll context.
|
||||||
*/
|
*/
|
||||||
typedef int (*ssh_poll_callback)(ssh_poll_handle p, int fd, int revents,
|
typedef int (*ssh_poll_callback)(ssh_poll_handle p, socket_t fd, int revents,
|
||||||
void *userdata);
|
void *userdata);
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -716,7 +716,7 @@ ssh_private_key privatekey_from_file(ssh_session session, const char *filename,
|
|||||||
#elif defined HAVE_LIBCRYPTO
|
#elif defined HAVE_LIBCRYPTO
|
||||||
dsa = PEM_read_DSAPrivateKey(file, NULL, pem_get_password, session);
|
dsa = PEM_read_DSAPrivateKey(file, NULL, pem_get_password, session);
|
||||||
} else { /* authcb */
|
} else { /* authcb */
|
||||||
/* openssl uses it's own callback to get the passphrase here */
|
/* openssl uses its own callback to get the passphrase here */
|
||||||
dsa = PEM_read_DSAPrivateKey(file, NULL, NULL, NULL);
|
dsa = PEM_read_DSAPrivateKey(file, NULL, NULL, NULL);
|
||||||
} /* authcb */
|
} /* authcb */
|
||||||
} else { /* passphrase */
|
} else { /* passphrase */
|
||||||
@@ -755,7 +755,7 @@ ssh_private_key privatekey_from_file(ssh_session session, const char *filename,
|
|||||||
#elif defined HAVE_LIBCRYPTO
|
#elif defined HAVE_LIBCRYPTO
|
||||||
rsa = PEM_read_RSAPrivateKey(file, NULL, pem_get_password, session);
|
rsa = PEM_read_RSAPrivateKey(file, NULL, pem_get_password, session);
|
||||||
} else { /* authcb */
|
} else { /* authcb */
|
||||||
/* openssl uses it's own callback to get the passphrase here */
|
/* openssl uses its own callback to get the passphrase here */
|
||||||
rsa = PEM_read_RSAPrivateKey(file, NULL, NULL, NULL);
|
rsa = PEM_read_RSAPrivateKey(file, NULL, NULL, NULL);
|
||||||
} /* authcb */
|
} /* authcb */
|
||||||
} else { /* passphrase */
|
} else { /* passphrase */
|
||||||
|
|||||||
Reference in New Issue
Block a user