Skip to content

Commit

Permalink
Spelling corrections, found using the codespell tool.
Browse files Browse the repository at this point in the history
  • Loading branch information
jp-bennett committed Apr 10, 2016
1 parent 0917755 commit d939deb
Show file tree
Hide file tree
Showing 56 changed files with 93 additions and 93 deletions.
2 changes: 1 addition & 1 deletion CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ Alexander Kozhevnikov

Dan Brooks
- Contributed a patch for the Android client app to add the definition of
custom server udp port. This is similiar to the --server-port argument
custom server udp port. This is similar to the --server-port argument
offered by the main fwknop client.

Github user 'sgh7':
Expand Down
4 changes: 2 additions & 2 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ fwknop-2.6.6 (04/23/2015):
default from accessing the broader Internet until a valid SPA packet is
sent to the gateway. Two new access.conf variables support this feature:
DISABLE_DNAT (do not build any DNAT rules for forwarded connections) and
FORWARD_ALL (allow all traffic to be forwarded instead of specfic
FORWARD_ALL (allow all traffic to be forwarded instead of specific
services requested within an SPA packet). So far, this feature is only
supported on systems running iptables or firewalld. The idea was
contributed by "spartan1833" to the fwknop mailing list, and this became
Expand All @@ -90,7 +90,7 @@ fwknop-2.6.6 (04/23/2015):
pcap.h, which is likely not installed whenever libpcap is also not
installed. This bug was reported by Alexander Kozhevnikov.
- [android] (Dan Brooks) Contributed a patch for the Android client app to
add the definition of custom server udp port. This is similiar to the
add the definition of custom server udp port. This is similar to the
--server-port argument offered by the main fwknop client.
- [test suite] Handle versions of lcov that don't have the --rc argument
which is normally used to force the creation of branch coverage stats
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ protected void onPostExecute(Void test) {
}
}

// Another Generic Messanger
// Another Generic Messenger
public static void sendHandlerMessage(Handler handler, int message_type) {
Message msg1 = handler.obtainMessage();
Bundle b = new Bundle();
Expand Down
6 changes: 3 additions & 3 deletions client/config_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ set_rc_file(char *rcfile, fko_cli_options_t *options)
rcf_offset = strlen(rcfile);

/* Sanity check the path to .fwknoprc.
* The preceeding path plus the path separator and '.fwknoprc' = 11
* The preceding path plus the path separator and '.fwknoprc' = 11
* cannot exceed MAX_PATH_LEN.
*/
if(rcf_offset > (MAX_PATH_LEN - 11))
Expand Down Expand Up @@ -801,7 +801,7 @@ create_fwknoprc(const char *rcfile)
* If the rcfile already exists, an error is returned */
rcfile_fd = open(rcfile, FWKNOPRC_OFLAGS ,FWKNOPRC_MODE);

// If an error occured ...
// If an error occurred ...
if (rcfile_fd == -1) {
log_msg(LOG_VERBOSITY_WARNING, "Unable to create initial rc file: %s: %s",
rcfile, strerror(errno));
Expand Down Expand Up @@ -1511,7 +1511,7 @@ add_multiple_vars_to_rc(FILE* rc, fko_cli_options_t *options, fko_var_bitmask_t
* be stored.
*
* @return 0 if the section has been found and processed successfully
* a negative value if one or more errors occured
* a negative value if one or more errors occurred
*/
static int
process_rc_section(char *section_name, fko_cli_options_t *options)
Expand Down
4 changes: 2 additions & 2 deletions client/getpasswd.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ read_passwd_from_stream(FILE *stream)
* @param fd File descriptor to use to read the pasword from. If fd is set
* to FD_INVALID, then a new stream is opened.
*
* @return NULL if a problem occured or the user killed the terminal (Ctrl-C)\n
* @return NULL if a problem occurred or the user killed the terminal (Ctrl-C)\n
* otherwise the password - empty password is accepted.
*/
char*
Expand Down Expand Up @@ -175,7 +175,7 @@ getpasswd(const char *prompt, int fd)
* Save current tty state for later restoration after we :
* - disable echo of characters to the tty
* - disable signal generation
* - disable cannonical mode (input read line by line mode)
* - disable canonical mode (input read line by line mode)
*/
tcgetattr(fileno(fp), &ts);
old_c_lflag = ts.c_lflag;
Expand Down
4 changes: 2 additions & 2 deletions client/spa_comm.c
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ send_spa_packet_http(const char *spa_data, const int sd_len,
else /* we are sending the SPA packet through an HTTP proxy */
{
/* Extract the hostname if it was specified as a URL. Actually,
* we just move the start of the hostname to the begining of the
* we just move the start of the hostname to the beginning of the
* original string.
*/
if(strncasecmp(ndx, "http://", 7) == 0)
Expand Down Expand Up @@ -622,7 +622,7 @@ send_spa_packet(fko_ctx_t ctx, fko_cli_options_t *options)
int res, sd_len;
char *spa_data;
struct sockaddr_in saddr, daddr;
char ip_str[INET_ADDRSTRLEN] = {0}; /* String used to contain the ip addres of an hostname */
char ip_str[INET_ADDRSTRLEN] = {0}; /* String used to contain the ip address of an hostname */
struct addrinfo hints; /* Structure used to set hints to resolve hostname */
#ifdef WIN32
WSADATA wsa_data;
Expand Down
2 changes: 1 addition & 1 deletion client/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ get_in_addr(struct sockaddr *sa)
* @param ip_bufsize Number of bytes available in the ip_str buffer
* @param opts Client command line options
*
* @return 0 if successful, 1 if an error occured.
* @return 0 if successful, 1 if an error occurred.
*/
int
resolve_dst_addr(const char *dns_str, struct addrinfo *hints,
Expand Down
8 changes: 4 additions & 4 deletions common/fko_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ int zero_free(char *buf, int len)
}

/* zero out sensitive information in a way that isn't optimized out by the compiler
* since we force a comparision and return an error if there is a problem (though
* since we force a comparison and return an error if there is a problem (though
* the caller should do something with this information too).
*/
int
Expand Down Expand Up @@ -585,7 +585,7 @@ char
* written is set to 0. This way the user knows exactly how many bytes
* can be appended afterwards.
*
* @param buf Buffer to write the formated message to
* @param buf Buffer to write the formatted message to
* @param buf_size Maximum number of bytes to write to the buffer
* @param msg Message to format and to append to the buffer
*
Expand All @@ -605,7 +605,7 @@ append_msg_to_buf(char *buf, size_t buf_size, const char* msg, ...)
/* Format the message like a printf message */
bytes_written = vsnprintf(buf, buf_size, msg, ap);

/* It looks like the message has been truncated or an error occured*/
/* It looks like the message has been truncated or an error occurred*/
if (bytes_written < 0)
bytes_written = 0;

Expand Down Expand Up @@ -996,7 +996,7 @@ get_in_addr(struct sockaddr *sa)
* @param ip_bufsize Number of bytes available in the ip_str buffer
* @param opts Client command line options
*
* @return 0 if successful, 1 if an error occured.
* @return 0 if successful, 1 if an error occurred.
*/
int
ipv4_resolve(const char *dns_str, char *ip_str)
Expand Down
2 changes: 1 addition & 1 deletion common/fko_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void chop_spaces(char *str);

/**
*
* \brief counts the occurences of a character
* \brief counts the occurrences of a character
*
* \return returns the number of chars found
*/
Expand Down
4 changes: 2 additions & 2 deletions doc/README
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Until we decide on a better way, the man pages for 'fwknop' (client) and
'fwknopd' (server) are generated from the asciidoc sources in this directory,
then copied to their respective directories before check-in.

We use the "a2x" command to generate the inital nroff-formated version,
We use the "a2x" command to generate the initial nroff-formated version,
which is then manually edited to clean it up a bit. The "a2x" command is:

a2x -f manpage fwknopd.man.asciidoc
Expand All @@ -13,7 +13,7 @@ This creates the "fwknopd.8" man page. However, depending on the a2x and.or
asciidoc configuration on your system, you may have to edit the "fwknopd.8"
file directly to remove the "[FIXME: source/manual]" string embedded within.
At present, we simply remove them. There may also be places where you want
items on succesive line without intervening lines (i.e. the AUTHORS section
items on successive line without intervening lines (i.e. the AUTHORS section
of the generated man page). In those cases, simply change the ".sp"
between those lines to ".br".

Expand Down
8 changes: 4 additions & 4 deletions doc/libfko.texi
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ server. The timeout value is provided via the @code{client_timeout} data
field.

@item FKO_LOCAL_NAT_ACCESS_MSG
This is similar to the FKO_NAT_ACCESS request exept the @acronym{NAT} is
This is similar to the FKO_NAT_ACCESS request except the @acronym{NAT} is
to the local to the server (i.e. a service listening on 127.0.0.1).

@item FKO_CLIENT_TIMEOUT_LOCAL_NAT_ACCESS_MSG
Expand Down Expand Up @@ -1213,7 +1213,7 @@ will be NULL if the context value was not previously set.
This section describes the functions not covered elsewhere in this
manual. These are utility functions that operate on the data in the fko
context. All but @code{fko_spa_data_final} are called by other functions
and are not normally explictly called by the user. However, they can
and are not normally explicitly called by the user. However, they can
be, so they are listed here.

All of these functions return an integer representing the return status of
Expand Down Expand Up @@ -1289,7 +1289,7 @@ for the given error code.

@deftypefun {const char *} fko_errstr (int @var{err_code})
The function @code{fko_errstr} returns a pointer to a statically
allocated string containing the descripton of the error.
allocated string containing the description of the error.
@end deftypefun

@noindent
Expand Down Expand Up @@ -1599,7 +1599,7 @@ using the following function:

@deftypefun {const char *} fko_gpg_errstr (int @var{err_code})
The function @code{fko_errstr} returns a pointer to a statically
allocated string containing the descripton of the @acronym{GPGME} error.
allocated string containing the description of the @acronym{GPGME} error.
@end deftypefun

@noindent
Expand Down
4 changes: 2 additions & 2 deletions extras/openwrt/README.openwrt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ This directory holds files and subdirectories related to fwknop and the
OpenWRT platform.

The "package" directory contains the individual OpenWRT package directories.
Each of these package directories hold the Makefile and addtional patch or
file directories used by teh OpenWRT build sytem.
Each of these package directories hold the Makefile and additional patch or
file directories used by the OpenWRT build system.

At present, the packages we include are "fwknop" and "gpgpme". The gpgme
package is include because it does not appear to be available on any of
Expand Down
2 changes: 1 addition & 1 deletion iphone/Classes/libfwknop/fko_common.b
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ typedef u_int32_t uint32_t;
#endif
#endif

/* Work out endianess (sp?)
/* Work out endianness
*/
#if HAVE_ENDIAN_H /* Should cover most Linux systems */
#include <endian.h>
Expand Down
4 changes: 2 additions & 2 deletions lib/fko.h
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ DLL_API int fko_set_spa_hmac_type(fko_ctx_t ctx, const short hmac_type);
* \brief Return error in string form
*
* The function 'fko_errstr' returns a pointer to a statically
* allocated string containing the descripton of the error.
* allocated string containing the description of the error.
*
* \param err_code The error code to convert
*
Expand Down Expand Up @@ -1297,7 +1297,7 @@ DLL_API int fko_set_gpg_ignore_verify_error(fko_ctx_t ctx,
* ignore_verify_error flag value associated with the current context.
*
* \param ctx The FKO context to access
* \param val Pointer where teh flag value will be set
* \param val Pointer where the flag value will be set
*
* \return FKO_SUCCESS if successful, returns an error code otherwise
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/fko_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
#endif
#endif

/* Work out endianess (sp?)
/* Work out endianness
*/
#if HAVE_ENDIAN_H /* Should cover most Linux systems */
#include <endian.h>
Expand Down
4 changes: 2 additions & 2 deletions lib/fko_context.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* \file lib/fko_context.h
*
* \brief fko context definiton.
* \brief fko context definition.
*/

/*
Expand Down Expand Up @@ -43,7 +43,7 @@
*
* \struct fko_gpg_sig
*
* \brief Stucture to hold a list of the gpg signature information we are interested in.
* \brief Structure to hold a list of the gpg signature information we are interested in.
*/
struct fko_gpg_sig {
struct fko_gpg_sig *next; /**< link to next member */
Expand Down
2 changes: 1 addition & 1 deletion lib/fko_digest.c
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ set_digest(char *data, char **digest, short digest_type, int *digest_len)
return(FKO_ERROR_INVALID_DIGEST_TYPE);
}

/* Just in case this is a subsquent call to this function. We
/* Just in case this is a subsequent call to this function. We
* do not want to be leaking memory.
*/
if(*digest != NULL)
Expand Down
2 changes: 1 addition & 1 deletion lib/fko_message.c
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ fko_set_spa_message(fko_ctx_t ctx, const char * const msg)
if(res != FKO_SUCCESS)
return(res);

/* Just in case this is a subsquent call to this function. We
/* Just in case this is a subsequent call to this function. We
* do not want to be leaking memory.
*/
if(ctx->message != NULL)
Expand Down
2 changes: 1 addition & 1 deletion lib/fko_nat_access.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ fko_set_spa_nat_access(fko_ctx_t ctx, const char * const msg)
if((res = validate_nat_access_msg(msg)) != FKO_SUCCESS)
return(res);

/* Just in case this is a subsquent call to this function. We
/* Just in case this is a subsequent call to this function. We
* do not want to be leaking memory.
*/
if(ctx->nat_access != NULL)
Expand Down
2 changes: 1 addition & 1 deletion lib/fko_server_auth.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ fko_set_spa_server_auth(fko_ctx_t ctx, const char * const msg)

/**/

/* Just in case this is a subsquent call to this function. We
/* Just in case this is a subsequent call to this function. We
* do not want to be leaking memory.
*/
if(ctx->server_auth != NULL)
Expand Down
2 changes: 1 addition & 1 deletion lib/fko_state.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ typedef enum {
#define FKO_IS_SPA_DATA_MODIFIED(ctx) (ctx->state & FKO_SPA_DATA_MODIFIED)

/* Clear all SPA data modified flags. This is normally called after a
* succesful encode/digest/encryption cycle.
* successful encode/digest/encryption cycle.
*/
#define FKO_CLEAR_SPA_DATA_MODIFIED(ctx) \
(ctx->state &= (0xffff & ~FKO_SPA_DATA_MODIFIED))
Expand Down
4 changes: 2 additions & 2 deletions lib/fko_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ fko_set_username(fko_ctx_t ctx, const char * const spoof_user)
if(!CTX_INITIALIZED(ctx))
return FKO_ERROR_CTX_NOT_INITIALIZED;

/* If spoof_user was not passed in, check for a SPOOF_USER enviroment
/* If spoof_user was not passed in, check for a SPOOF_USER environment
* variable. If it is set, use its value.
*/
if(spoof_user != NULL && spoof_user[0] != '\0')
Expand Down Expand Up @@ -115,7 +115,7 @@ fko_set_username(fko_ctx_t ctx, const char * const spoof_user)
return res;
}

/* Just in case this is a subsquent call to this function. We
/* Just in case this is a subsequent call to this function. We
* do not want to be leaking memory.
*/
if(ctx->username != NULL)
Expand Down
2 changes: 1 addition & 1 deletion lib/sha2.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
* Please make sure that your system defines BYTE_ORDER. If your
* architecture is little-endian, make sure it also defines
* LITTLE_ENDIAN and that the two (BYTE_ORDER and LITTLE_ENDIAN) are
* equivilent.
* equivalent.
*
* If your system does not define the above, then you can do so by
* hand like this:
Expand Down
2 changes: 1 addition & 1 deletion perl/FKO/lib/FKO.pm
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,7 @@ server. The timeout value is provided via the C<client_timeout> data field.
=item * B<FKO_LOCAL_NAT_ACCESS_MSG>
This is similar to the C<FKO_NAT_ACCESS> request exept the NAT is to the
This is similar to the C<FKO_NAT_ACCESS> request except the NAT is to the
local to the server (i.e. a service listening on 127.0.0.1).
=item * B<FKO_CLIENT_TIMEOUT_LOCAL_NAT_ACCES_MSG>
Expand Down
4 changes: 2 additions & 2 deletions perl/legacy/fwknop/ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,7 @@ fwknop-0.9.6 (01/13/2006):
adds a "-K <fwknop cmd line>" argument to the SSH client so that
fwknop can be executed directly before an SSH connection is made.
- Separated server and client portions of fwknop into "fwknopd" and
fwknop repectively. This will allow better portability to be
fwknop respectively. This will allow better portability to be
developed since the client and server pieces can be developed more
independently. NOTE: With so many changes, it is probably a good idea
to not preserve old fwknop configs via install.pl.
Expand Down Expand Up @@ -1093,7 +1093,7 @@ fwknop-0.9.1 (07/29/2005):
server with the --Access command line option.
- Added the ability to spoof SPA packets over icmp and tcp protocols.
- Added the ability to restrict access at the server to only those
ports defined in the OPEN_PORTS keyword. This option is controled by
ports defined in the OPEN_PORTS keyword. This option is controlled by
a new keyword "PERMIT_CLIENT_PORTS".
- Bugfix for MD5 sum not being properly calculated over decrypted data.
This allowed old packets that contained additional garbage data to
Expand Down
10 changes: 5 additions & 5 deletions perl/legacy/fwknop/deps/Class-MethodMaker/Changes
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,19 @@ Revision History for Class::MethodMaker (versions 2)
- Flatten list passed to * in v1 list
- Fix buglet in object that called default_ctor method even when an
explicit value was supplied
- Add compatiblity support for boolean
- Add compatibility support for boolean
- Lots of documentation improvements
- Add html target to Makefile.PL
- Add implementation of _clear by default
- Add *_clear to array
- Add support for 5.6.x
- Add new -singleton
- Add compatiblity support for singleton
- Add compatiblity support for get_concat
- Add compatibility support for singleton
- Add compatibility support for get_concat
- Add basic support for INTEGER type
- Add compatiblity support for get_counter
- Add compatibility support for get_counter
- Bug fixes to read callback
- Add compatiblity support for key_{attrib,with_create}
- Add compatibility support for key_{attrib,with_create}

2.00a09 Sep 18 11:04 AM GMT 2003
- Add tie_scalar, static_hash, tie_hash for V1
Expand Down
Loading

0 comments on commit d939deb

Please sign in to comment.