diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 71c449b0..4f5bb42f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,7 @@ For contributions we prefer Merge Requests on Gitlab: https://gitlab.com/libssh/libssh-mirror/ -This way you get contintious integration which runs the complete libssh +This way you get continuous integration which runs the complete libssh testsuite for you. For larger code changes, breaking the changes up into a set of simple diff --git a/src/agent.c b/src/agent.c index 3bc99a73..5c1da819 100644 --- a/src/agent.c +++ b/src/agent.c @@ -392,7 +392,7 @@ uint32_t ssh_agent_get_ident_count(struct ssh_session_struct *session) return session->agent->count; } -/* caller has to free commment */ +/* caller has to free comment */ ssh_key ssh_agent_get_first_ident(struct ssh_session_struct *session, char **comment) { if (ssh_agent_get_ident_count(session) > 0) { @@ -402,7 +402,7 @@ ssh_key ssh_agent_get_first_ident(struct ssh_session_struct *session, return NULL; } -/* caller has to free commment */ +/* caller has to free comment */ ssh_key ssh_agent_get_next_ident(struct ssh_session_struct *session, char **comment) { struct ssh_key_struct *key; diff --git a/src/auth.c b/src/auth.c index ccf75756..b9b32dfb 100644 --- a/src/auth.c +++ b/src/auth.c @@ -364,7 +364,7 @@ SSH_PACKET_CALLBACK(ssh_packet_userauth_pk_ok) { * * @param[in] username Deprecated, set to NULL. * - * @returns A bitfield of the fllowing values: + * @returns A bitfield of the following values: * - SSH_AUTH_METHOD_PASSWORD * - SSH_AUTH_METHOD_PUBLICKEY * - SSH_AUTH_METHOD_HOSTBASED @@ -976,7 +976,7 @@ struct ssh_auth_auto_state_struct { }; /** - * @brief Get the identity that is currenly being processed by + * @brief Get the identity that is currently being processed by * ssh_userauth_publickey_auto() * * This is meant to be used by a callback that happens as part of the diff --git a/src/buffer.c b/src/buffer.c index f309215a..05a6aa12 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -868,7 +868,7 @@ static int ssh_buffer_pack_allocate_va(struct ssh_buffer_struct *buffer, va_arg(ap, bignum); /* * Use a fixed size for a bignum - * (they should normaly be around 32) + * (they should normally be around 32) */ needed_size += 64; break; diff --git a/src/external/bcrypt_pbkdf.c b/src/external/bcrypt_pbkdf.c index 8b0b8118..75c02151 100644 --- a/src/external/bcrypt_pbkdf.c +++ b/src/external/bcrypt_pbkdf.c @@ -166,7 +166,7 @@ bcrypt_pbkdf(const char *pass, size_t passlen, const uint8_t *salt, size_t saltl } /* - * pbkdf2 deviation: ouput the key material non-linearly. + * pbkdf2 deviation: output the key material non-linearly. */ amt = MIN(amt, keylen); for (i = 0; i < amt; i++) { diff --git a/src/packet.c b/src/packet.c index 66f445d7..985524be 100644 --- a/src/packet.c +++ b/src/packet.c @@ -363,7 +363,7 @@ static enum ssh_packet_filter_result_e ssh_packet_incoming_filter(ssh_session se * Transitions: * - session->dh_handshake_state = DH_STATE_INIT_SENT * then calls dh_handshake_server which triggers: - * - session->dh_handhsake_state = DH_STATE_NEWKEYS_SENT + * - session->dh_handshake_state = DH_STATE_NEWKEYS_SENT * */ if (session->session_state != SSH_SESSION_STATE_DH) { @@ -391,7 +391,7 @@ static enum ssh_packet_filter_result_e ssh_packet_incoming_filter(ssh_session se * or dh_handshake_state == DH_STATE_REQUEST_SENT (dh-gex) * * Transitions: - * - session->dh_handhsake_state = DH_STATE_NEWKEYS_SENT + * - session->dh_handshake_state = DH_STATE_NEWKEYS_SENT * */ if (session->session_state != SSH_SESSION_STATE_DH) { @@ -425,7 +425,7 @@ static enum ssh_packet_filter_result_e ssh_packet_incoming_filter(ssh_session se /* * States required: * - session_state == SSH_SESSION_STATE_AUTHENTICATING - * - dh_hanshake_state == DH_STATE_FINISHED + * - dh_handshake_state == DH_STATE_FINISHED * * Transitions: * - if authentication was successful: @@ -454,7 +454,7 @@ static enum ssh_packet_filter_result_e ssh_packet_incoming_filter(ssh_session se /* * States required: * - session_state == SSH_SESSION_STATE_AUTHENTICATING - * - dh_hanshake_state == DH_STATE_FINISHED + * - dh_handshake_state == DH_STATE_FINISHED * - session->auth.state == SSH_AUTH_STATE_KBDINT_SENT * or session->auth.state == SSH_AUTH_STATE_PUBKEY_OFFER_SENT * or session->auth.state == SSH_AUTH_STATE_PUBKEY_AUTH_SENT @@ -492,7 +492,7 @@ static enum ssh_packet_filter_result_e ssh_packet_incoming_filter(ssh_session se /* * States required: * - session_state == SSH_SESSION_STATE_AUTHENTICATING - * - dh_hanshake_state == DH_STATE_FINISHED + * - dh_handshake_state == DH_STATE_FINISHED * - session->auth.state == SSH_AUTH_STATE_KBDINT_SENT * or session->auth.state == SSH_AUTH_STATE_PUBKEY_AUTH_SENT * or session->auth.state == SSH_AUTH_STATE_PASSWORD_AUTH_SENT diff --git a/src/session.c b/src/session.c index b5ffcbc2..36339092 100644 --- a/src/session.c +++ b/src/session.c @@ -1106,7 +1106,7 @@ int ssh_get_publickey(ssh_session session, ssh_key *key) * * @param[in] hlen The length of the hash. * - * @return 0 on success, -1 if an error occured. + * @return 0 on success, -1 if an error occurred. * * @warning It is very important that you verify at some moment that the hash * matches a known server. If you don't do it, cryptography wont help diff --git a/src/socket.c b/src/socket.c index bc18f382..f80b63d9 100644 --- a/src/socket.c +++ b/src/socket.c @@ -482,7 +482,7 @@ void ssh_socket_close(ssh_socket s) } } if (!WIFEXITED(status)) { - SSH_LOG(SSH_LOG_WARN, "Proxy command exitted abnormally"); + SSH_LOG(SSH_LOG_WARN, "Proxy command exited abnormally"); return; } SSH_LOG(SSH_LOG_TRACE, "Proxy command returned %d", WEXITSTATUS(status)); @@ -495,7 +495,7 @@ void ssh_socket_close(ssh_socket s) * @brief sets the file descriptor of the socket. * @param[out] s ssh_socket to update * @param[in] fd file descriptor to set - * @warning this function updates boths the input and output + * @warning this function updates both the input and output * file descriptors */ void ssh_socket_set_fd(ssh_socket s, socket_t fd)