mirror of
https://git.libssh.org/projects/libssh.git
synced 2026-02-04 12:20:42 +09:00
Fixed typos from a* to error.c
This commit is contained in:
@@ -27,7 +27,7 @@
|
||||
* How does the ssh-agent work?
|
||||
*
|
||||
* a) client sends a request to get a list of all keys
|
||||
* the agent returns the cound and all public keys
|
||||
* the agent returns the count and all public keys
|
||||
* b) iterate over them to check if the server likes one
|
||||
* c) the client sends a sign request to the agent
|
||||
* type, pubkey as blob, data to sign, flags
|
||||
|
||||
@@ -935,7 +935,7 @@ static struct ssh_keys_struct keytab[] = {
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @brief Tries to automaticaly authenticate with public key and "none"
|
||||
* @brief Tries to automatically authenticate with public key and "none"
|
||||
*
|
||||
* It may fail, for instance it doesn't ask for a password and uses a default
|
||||
* asker for passphrases (in case the private key is encrypted).
|
||||
@@ -1543,7 +1543,7 @@ int ssh_userauth_kbdint(ssh_session session, const char *user,
|
||||
}
|
||||
|
||||
/*
|
||||
* If we are at this point, it ss because session->kbdint exists.
|
||||
* If we are at this point, it is because session->kbdint exists.
|
||||
* It means the user has set some informations there we need to send
|
||||
* the server and then we need to ack the status (new questions or ok
|
||||
* pass in).
|
||||
@@ -1618,7 +1618,7 @@ const char *ssh_userauth_kbdint_getinstruction(ssh_session session) {
|
||||
*
|
||||
* @param session The ssh session to use.
|
||||
*
|
||||
* @param i The inndex number of the i'th prompt.
|
||||
* @param i The index number of the i'th prompt.
|
||||
*
|
||||
* @param echo When different of NULL, it will obtain a boolean meaning
|
||||
* that the resulting user input should be echoed or not
|
||||
|
||||
@@ -121,7 +121,7 @@ static int realloc_buffer(struct ssh_buffer_struct *buffer, int needed) {
|
||||
/* \internal
|
||||
* \brief reinitialize a buffer
|
||||
* \param buffer buffer
|
||||
* \return 0 on sucess, < 0 on error
|
||||
* \return 0 on success, < 0 on error
|
||||
*/
|
||||
int buffer_reinit(struct ssh_buffer_struct *buffer) {
|
||||
buffer_verify(buffer);
|
||||
|
||||
@@ -180,7 +180,7 @@ SSH_PACKET_CALLBACK(ssh_packet_channel_open_fail){
|
||||
* @param window receiving window of the channel. The window is the
|
||||
* maximum size of data that can stay in buffers and network.
|
||||
* @param maxpacket maximum packet size allowed (like MTU).
|
||||
* @param payload buffer containing additionnal payload for the query.
|
||||
* @param payload buffer containing additional payload for the query.
|
||||
*/
|
||||
static int channel_open(ssh_channel channel, const char *type_c, int window,
|
||||
int maxpacket, ssh_buffer payload) {
|
||||
@@ -700,10 +700,10 @@ int channel_open_session(ssh_channel channel) {
|
||||
*
|
||||
* @param remoteport The remote port.
|
||||
*
|
||||
* @param sourcehost The source host (your local computer). It's facultative
|
||||
* @param sourcehost The source host (your local computer). It's optional
|
||||
* and for logging purpose.
|
||||
*
|
||||
* @param localport The source port (your local computer). It's facultative
|
||||
* @param localport The source port (your local computer). It's optional
|
||||
* and for logging purpose.
|
||||
* @warning This function does not bind the local port and does not automatically
|
||||
* forward the content of a socket to the channel. You still have to
|
||||
@@ -1045,7 +1045,7 @@ int channel_is_eof(ssh_channel channel) {
|
||||
*
|
||||
* @param blocking A boolean for blocking or nonblocking.
|
||||
*
|
||||
* @bug This functionnality is still under development and
|
||||
* @bug This functionality is still under development and
|
||||
* doesn't work correctly.
|
||||
*/
|
||||
void channel_set_blocking(ssh_channel channel, int blocking) {
|
||||
@@ -1491,7 +1491,7 @@ static ssh_channel channel_accept(ssh_session session, int channeltype,
|
||||
*
|
||||
* @param channel An x11-enabled session channel.
|
||||
*
|
||||
* @param timeout_ms Timeout in milli-seconds.
|
||||
* @param timeout_ms Timeout in milliseconds.
|
||||
*
|
||||
* @return Newly created channel, or NULL if no X11 request from the server
|
||||
*/
|
||||
@@ -1621,7 +1621,7 @@ error:
|
||||
*
|
||||
* @param session The ssh session to use.
|
||||
*
|
||||
* @param timeout_ms Timeout in milli-seconds.
|
||||
* @param timeout_ms Timeout in milliseconds.
|
||||
*
|
||||
* @return Newly created channel, or NULL if no incoming channel request from
|
||||
* the server
|
||||
@@ -1672,9 +1672,9 @@ error:
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Set environement variables.
|
||||
* @brief Set environment variables.
|
||||
*
|
||||
* @param channel The channel to set the environement variables.
|
||||
* @param channel The channel to set the environment variables.
|
||||
*
|
||||
* @param name The name of the variable.
|
||||
*
|
||||
@@ -1682,7 +1682,7 @@ error:
|
||||
*
|
||||
* @return SSH_SUCCESS on success, SSH_ERROR on error.
|
||||
*
|
||||
* @warning Some environement variables may be refused by security reasons.
|
||||
* @warning Some environment variables may be refused by security reasons.
|
||||
* */
|
||||
int channel_request_env(ssh_channel channel, const char *name, const char *value) {
|
||||
ssh_buffer buffer = NULL;
|
||||
@@ -1828,7 +1828,7 @@ error:
|
||||
*
|
||||
* @param buffer The buffer which will get the data.
|
||||
*
|
||||
* @param count The count of bytes to be read. If it is biggerthan 0,
|
||||
* @param count The count of bytes to be read. If it is bigger than 0,
|
||||
* the exact size will be read, else (bytes=0) it will
|
||||
* return once anything is available.
|
||||
*
|
||||
@@ -2017,7 +2017,7 @@ int channel_read(ssh_channel channel, void *dest, uint32_t count, int is_stderr)
|
||||
* @brief Do a nonblocking read on the channel.
|
||||
*
|
||||
* A nonblocking read on the specified channel. it will return <= count bytes of
|
||||
* data read atomicly.
|
||||
* data read atomically.
|
||||
*
|
||||
* @param channel The channel to read from.
|
||||
*
|
||||
@@ -2118,7 +2118,7 @@ ssh_session channel_get_session(ssh_channel channel) {
|
||||
* @param channel The channel to get the status from.
|
||||
*
|
||||
* @return -1 if no exit status has been returned or eof not sent,
|
||||
* the exit status othewise.
|
||||
* the exit status otherwise.
|
||||
*/
|
||||
int channel_get_exit_status(ssh_channel channel) {
|
||||
if (channel->local_eof == 0) {
|
||||
@@ -2283,7 +2283,7 @@ int channel_select(ssh_channel *readchans, ssh_channel *writechans,
|
||||
channel_protocol_select(readchans, writechans, exceptchans,
|
||||
rchans, wchans, echans);
|
||||
if (rchans[0] != NULL || wchans[0] != NULL || echans[0] != NULL) {
|
||||
/* We've got one without doing any select overwrite the begining arrays */
|
||||
/* We've got one without doing any select overwrite the beginning arrays */
|
||||
memcpy(readchans, rchans, (count_ptrs(rchans) + 1) * sizeof(ssh_channel ));
|
||||
memcpy(writechans, wchans, (count_ptrs(wchans) + 1) * sizeof(ssh_channel ));
|
||||
memcpy(exceptchans, echans, (count_ptrs(echans) + 1) * sizeof(ssh_channel ));
|
||||
|
||||
@@ -38,9 +38,9 @@
|
||||
/*
|
||||
* This is a big hack. In fact, SSH1 doesn't make a clever use of channels.
|
||||
* The whole packets concerning shells are sent outside of a channel.
|
||||
* Thus, an inside limitation of this behaviour is that you can't only
|
||||
* Thus, an inside limitation of this behavior is that you can't only
|
||||
* request one shell.
|
||||
* The question is stil how they managed to imbed two "channel" into one
|
||||
* The question is still how they managed to embed two "channel" into one
|
||||
* protocol.
|
||||
*/
|
||||
|
||||
@@ -276,7 +276,7 @@ int channel_handle1(ssh_session session, int type) {
|
||||
}
|
||||
break;
|
||||
default:
|
||||
ssh_log(session, SSH_LOG_FUNCTIONS, "Unexepected message %d", type);
|
||||
ssh_log(session, SSH_LOG_FUNCTIONS, "Unexpected message %d", type);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -85,7 +85,7 @@ static void socket_callback_exception(int code, int errno, void *user){
|
||||
* @brief Gets the banner from socket and saves it in session.
|
||||
* Updates the session state
|
||||
*
|
||||
* @param data pointer to the begining of header
|
||||
* @param data pointer to the beginning of header
|
||||
* @param len size of the banner
|
||||
* @param user is a pointer to session
|
||||
* @returns Number of bytes processed, or zero if the banner is not complete.
|
||||
@@ -332,7 +332,7 @@ SSH_PACKET_CALLBACK(ssh_packet_newkeys){
|
||||
|
||||
/*
|
||||
* Set the cryptographic functions for the next crypto
|
||||
* (it is needed for generate_session_keys for key lenghts)
|
||||
* (it is needed for generate_session_keys for key lengths)
|
||||
*/
|
||||
if (crypt_set_algorithms(session)) {
|
||||
goto error;
|
||||
@@ -430,7 +430,7 @@ static int dh_handshake(ssh_session session) {
|
||||
/* wait until ssh_packet_dh_reply is called */
|
||||
break;
|
||||
case DH_STATE_NEWKEYS_SENT:
|
||||
/* wait until ssh_packet_newkeys is calles */
|
||||
/* wait until ssh_packet_newkeys is called */
|
||||
break;
|
||||
case DH_STATE_FINISHED:
|
||||
leave_function();
|
||||
@@ -567,7 +567,7 @@ void ssh_connection_callback(ssh_session session){
|
||||
ssh_log(session, SSH_LOG_RARE,
|
||||
"SSH server banner: %s", session->serverbanner);
|
||||
|
||||
/* Here we analyse the different protocols the server allows. */
|
||||
/* Here we analyze the different protocols the server allows. */
|
||||
if (ssh_analyze_banner(session, &ssh1, &ssh2) < 0) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -179,7 +179,7 @@ unsigned char *packet_encrypt(ssh_session session, void *data, uint32_t len) {
|
||||
* @param mac The mac to compare with the hmac.
|
||||
*
|
||||
* @return 0 if hmac and mac are equal, < 0 if not or an error
|
||||
* occured.
|
||||
* occurred.
|
||||
*/
|
||||
int packet_hmac_verify(ssh_session session, ssh_buffer buffer,
|
||||
unsigned char *mac) {
|
||||
|
||||
@@ -29,10 +29,10 @@
|
||||
* g and n are two numbers common to every ssh software.
|
||||
* client's public key (e) is calculated by doing:
|
||||
* e = g^x mod p
|
||||
* client sents e to the server.
|
||||
* client sends e to the server.
|
||||
* the server computes his own public key, f
|
||||
* f = g^y mod p
|
||||
* it sents it to the client
|
||||
* it sends it to the client
|
||||
* the common key K is calculated by the client by doing
|
||||
* k = f^x mod p
|
||||
* the server does the same with the client public key e
|
||||
@@ -209,7 +209,7 @@ char *ssh_get_hexa(const unsigned char *what, size_t len) {
|
||||
/**
|
||||
* @brief Print a buffer as colon separated hex string.
|
||||
*
|
||||
* @param descr Description printed infront of the hex string.
|
||||
* @param descr Description printed in front of the hex string.
|
||||
*
|
||||
* @param what What should be converted to a hex string.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user