From d204c8b4aaa258faf07d4ccc1c162bcc5ca42e3a Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Wed, 25 Jul 2018 01:37:16 +0800 Subject: [PATCH] Fix several typos. --- NEWS | 6 +++--- THANKS | 2 +- build-aux/gendocs.sh | 2 +- db/file.h | 2 +- doc/gdoc | 4 ++-- doc/keytab.txt | 4 ++-- doc/reference/Makefile.am | 2 +- doc/shishi.texi | 42 +++++++++++++++++++-------------------- lib/ap.c | 12 +++++------ lib/as.c | 8 ++++---- lib/asn1.c | 6 +++--- lib/authenticator.c | 2 +- lib/enckdcreppart.c | 2 +- lib/encticketpart.c | 2 +- lib/error.c | 4 ++-- lib/gztime.c | 2 +- lib/init.c | 2 +- lib/kdc.c | 4 ++-- lib/kdcrep.c | 2 +- lib/kdcreq.c | 6 +++--- lib/kerberos5.asn1 | 2 +- lib/keytab.c | 4 ++-- lib/krberror.c | 4 ++-- lib/priv.c | 8 ++++---- lib/safe.c | 4 ++-- lib/shishi.h | 6 +++--- lib/starttls.c | 2 +- lib/tgs.c | 12 +++++------ lib/ticket.c | 2 +- lib/tktccache.c | 4 ++-- lib/tkts.c | 2 +- lib/utils.c | 2 +- lib/utils.h | 2 +- src/kdc.c | 4 ++-- src/starttls.c | 2 +- tests/priv.c | 2 +- tests/shisa.sh | 2 +- tests/shishi.supp | 2 +- 38 files changed, 91 insertions(+), 91 deletions(-) diff --git a/NEWS b/NEWS index 61627a58..315da95e 100644 --- a/NEWS +++ b/NEWS @@ -388,7 +388,7 @@ element, thanks to Elrond for debugging. ** Improved handling of key versions. Shishi should not send kvno for a session keys in TGS requests any more. Internally, the UINT32_MAX kvno is now used to denote a -"kvno"-less (i.e., non-permenant) key, earlier 0 was used which +"kvno"-less (i.e., non-permanent) key, earlier 0 was used which collided with the perfectly valid real kvno of 0. ** Improved translation of messages in shishi. @@ -401,7 +401,7 @@ collided with the perfectly valid real kvno of 0. ** Pre-authentication support. Only the PA-ENC-TIMESTAMP, ETYPE-INFO and ETYPE-INFO2 mechanisms are -supported. Tested againt MIT, Heimdal, and Windows 2003 KDCs. +supported. Tested against MIT, Heimdal, and Windows 2003 KDCs. ** Clarified the copyright on lib/kerberos5.asn1. @@ -633,7 +633,7 @@ their end time is in the past. ** Support for DES and 3DES without integrity checking re-added. Those encryption algorithms are needed by GSS Wrap/Unwrap, but was -accidently removed from Shishi during an earlier cleanup. +accidentally removed from Shishi during an earlier cleanup. ** When Libgcrypt is used, ARCFOUR now handle streamed operations. This is needed for, e.g., rsh in the Shishi patched version of GNU diff --git a/THANKS b/THANKS index d0e2be07..7f5ad255 100644 --- a/THANKS +++ b/THANKS @@ -1,4 +1,4 @@ -Shishi THANKS -- Acknowledgements. +Shishi THANKS -- Acknowledgments. Copyright (C) 2002-2014 Simon Josefsson See the end for copying conditions. diff --git a/build-aux/gendocs.sh b/build-aux/gendocs.sh index b2e7b097..2eee249c 100755 --- a/build-aux/gendocs.sh +++ b/build-aux/gendocs.sh @@ -140,7 +140,7 @@ Email bug reports or enhancement requests to address@hidden MANUAL_TITLE= PACKAGE= address@hidden # please override with --email -commonarg= # passed to all makeinfo/texi2html invcations. +commonarg= # passed to all makeinfo/texi2html invocations. dirargs= # passed to all tools (-I dir). dirs= # -I directories. htmlarg= diff --git a/db/file.h b/db/file.h index 48f3c287..22f033c8 100644 --- a/db/file.h +++ b/db/file.h @@ -20,7 +20,7 @@ * */ -/*************************************************** Initializor/destructor. */ +/*************************************************** Initializer/destructor. */ /* Initialize file backend, i.e., parse options and check if file root exists and allocate backend handle. */ diff --git a/doc/gdoc b/doc/gdoc index f067117f..d364d253 100755 --- a/doc/gdoc +++ b/doc/gdoc @@ -954,7 +954,7 @@ sub dump_function { # print STDERR " -> @args\n"; my $param = pop @args; - # Push leading asterisques into the type list. + # Push leading asterisks into the type list. if ($param =~ m/^(\*+)(.*)/) { $param = $2; push @args, $1; @@ -1429,7 +1429,7 @@ line is mandatory after the last parameter specification: =head1 CAVEATS -Most of the output modes produce a usable and conformant document +Most of the output modes produce a usable and conforming document for a single function only, since multiple functions lead to simple concatenation of the individual documents. diff --git a/doc/keytab.txt b/doc/keytab.txt index 88a7b467..09274571 100644 --- a/doc/keytab.txt +++ b/doc/keytab.txt @@ -64,7 +64,7 @@ bit length. For the realm and name components, the counted_octet_string bytes are ASCII encoded text with no zero terminator. Following the realm is the components array that represents the name of -the principal. The text of these components may be joined with slashs +the principal. The text of these components may be joined with slashes to construct the typical SPN representation. For example, the service principal HTTP/address@hidden would consist of name components "HTTP" followed by "www.foo.net". @@ -86,7 +86,7 @@ etc). This is followed by a counted_octet_string containing the key. The last field of the keytab_entry structure is optional. If the size of the keytab_entry indicates that there are at least 4 bytes remaining, a 32 bit value representing the key version number is present. This -value supersedes the 8 bit vno8 value preceeding the keyblock. +value supersedes the 8 bit vno8 value preceding the keyblock. Older keytabs with a file_format_version of 0x501 are different in three ways: diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index 2d87e6dc..74810fc0 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -69,7 +69,7 @@ HTML_IMAGES=../components.png # e.g. content_files=running.sgml building.sgml changes-2.0.sgml content_files= -# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded +# SGML files where gtk-doc abbreviations (#GtkWidget) are expanded # These files must be listed here *and* in content_files # e.g. expand_content_files=running.sgml expand_content_files= diff --git a/doc/shishi.texi b/doc/shishi.texi index f1311808..7bf00e10 100644 --- a/doc/shishi.texi +++ b/doc/shishi.texi @@ -1457,7 +1457,7 @@ prudent to run all Shishi applications as a special address@hidden user, and have all Shishi related files owned by that user, so that any security vulnerabilities do not lead to a system compromise. (However, if the user database is ever stolen, system compromises of other -systems may be inoccured, should you use, e.g., a kerberized Telnet.) +systems may occur, should you use, e.g., a kerberized Telnet.) @example jas@@latte:~$ mkdir /usr/local/var/shishi @@ -1854,7 +1854,7 @@ KDC locations. Implementations SHOULD provide a way of specifying this information locally without the use of DNS. However, to make this feature worthwhile a lack of any configuration information on a client should -be interpretted as permission to use DNS. +be interpreted as permission to use DNS. @node Kerberos via TLS @section Kerberos via TLS @@ -1877,7 +1877,7 @@ themselves to the Kerberos server. For details on the implementation, Resuming earlier TLS session is supported and enabled by default. This improves the speed of the TLS handshake, because results from earlier negotiations can be re-used. Currently the TLS resume -database is stored in memory (in constract to storing it on disk), in +database is stored in memory (in contrast to storing it on disk), in both the client and in the server. Because the server typically runs for a long time, this is not a problem for that side. The client is typically not a long-running process though; the client usually is @@ -2630,7 +2630,7 @@ each style follow: other: NAMETYPE:rest/of.name=without-restrictions @end example -Domain syle realm names MUST look like domain names: they consist of +Domain style realm names MUST look like domain names: they consist of components separated by periods (.) and they contain neither colons (:) nor slashes (/). Though domain names themselves are case insensitive, in order for realms to match, the case must match as @@ -3509,7 +3509,7 @@ the path to the library files has to be added to the library search path (via the @option{-L} option). For this, the option @option{--libs} to @command{pkg-config shishi} can be used. For convenience, this option also outputs all other options that are required to link the program -with the `Libshishi' libararies (in particular, the @samp{-lshishi} +with the `Libshishi' libraries (in particular, the @samp{-lshishi} option). The example shows how to link @file{foo.o} with the `Libshishi' library to a program @command{foo}. @@ -3614,7 +3614,7 @@ developer. A ``ticket set'' is, as the name implies, a collection of tickets. Functions are provided to read tickets from file into a ticket set, to query number of tickets in the set, to extract a given ticket from the -set, to search the ticket set for tickets matching certain criterium, +set, to search the ticket set for tickets matching certain criteria, to write the ticket set to a file, etc. High level functions for performing a initial authentication (@pxref{AS Functions}) or subsequent authentication (@pxref{TGS Functions}) and storing the new @@ -3632,7 +3632,7 @@ ticket in the ticket set are also provided. The ``AP-REQ'' and ``AP-REP'' are ASN.1 structures used by application client and servers to prove to each other who they are. The -structures contain auxilliary information, together with an +structures contain auxiliary information, together with an authenticator (@pxref{Authenticator Functions}) which is the real cryptographic proof. The following illustrates the AP-REQ and AP-REP ASN.1 structures. @@ -4111,11 +4111,11 @@ All functions that operate on this data structure are described now. @include texi/key.c.texi -Applications that run uninteractively may need keying material. In +Applications that run non-interactively may need keying material. In these cases, the keys are stored in a file, a file that is normally stored on the local host. The file should be protected from unauthorized access. The file is in ASCII format and contains keys as -outputed by @code{shishi_key_print}. All functions that handle these +output by @code{shishi_key_print}. All functions that handle these keys sets are described now. @include texi/keys.c.texi @@ -4184,7 +4184,7 @@ Most functions in `Libshishi' are returning an error if they fail. For this reason, the application should always catch the error condition and take appropriate measures, for example by releasing the resources and passing the error up to the caller, or by displaying a -descriptive message to the user and cancelling the operation. +descriptive message to the user and canceling the operation. Some error values do not indicate a system error or an error in the operation, but the result of an operation that failed properly. @@ -4340,7 +4340,7 @@ The core part of the Shisa interface follows. The typical procedure is to use @code{shisa_principal_find} to verify that a specific principal exists, and to extract some information about it, and then use @code{shisa_keys_find} to get the cryptographic keys for the -principal, usually suppliying some hints as to which of all keys you +principal, usually supplying some hints as to which of all keys you are interested in (e.g., key version number and encryption algorithm number). @@ -4495,7 +4495,7 @@ situations, the policy may be that password authentication may only be done through SRP. @item Kerberos exchanges are privacy protected. -Part of many Kerberos packets are transfered without privacy +Part of many Kerberos packets are transferred without privacy protection (i.e., encryption). That part contains information, such as the client principal name, the server principal name, the encryption types supported by the client, the lifetime of tickets, @@ -4601,7 +4601,7 @@ If the TLS negotiation fails, possibly due to client or server policy (e.g., inadequate support of encryption types in TLS, or lack of client or server authentication) the entity that detect the failure MUST disconnected the connection. It is expected that any error -messages that explain the error condition is transfered by TLS. +messages that explain the error condition is transferred by TLS. @subsection Interaction with KDC addresses in DNS @@ -4840,7 +4840,7 @@ the address@hidden team for the kerberized @command{rsh} and @command{rlogin} programs. The differences between @command{rlogin} and @command{rsh} are explained below, as are differences between protocol versions v0.1 -and v0.2. Both remain in use resons of compatibility. +and v0.2. Both remain in use for reasons of compatibility. It is possible that some parts of this document are not in conformity with the original KCMD protocol, because there is no official @@ -4855,7 +4855,7 @@ at @url{http://www.cs.berkeley.edu/~hildrum/043.pdf}. @subsection Establish connection -Initially the client establishs a TCP connection to the server. +Initially the client establishes a TCP connection to the server. Default ports are 543 (@samp{klogin}), 544 (@samp{kshell}), and 2105 (@samp{eklogin}). Here @samp{eklogin} is the same as @samp{klogin}, but with encryption. @@ -4902,7 +4902,7 @@ a second length-string. This time based on @noindent or on ``KCMDV0.1'', for the older version. -If the client's indentification is acceptable, the server will respond +If the client's identification is acceptable, the server will respond with a null byte (@code{0x00}). Otherwise, if the authentication message was incorrect, then the server responds with the single byte @code{0x01}, while if the protocol version @@ -4910,7 +4910,7 @@ message was unacceptable, then the response is a single @code{0x02}. @subsection Kerberos authentication -When the client is indentified, Kerberos authentication can begin. +When the client is identified, Kerberos authentication can begin. The client must send an AP-REQ to the server; an AP-REQ authenticator must contain a subkey (only for KCMDV0.2) and a checksum. The authenticator checksum is calculated from the following string. @@ -4937,7 +4937,7 @@ transmission to the server. Its length (as @code{int32}) is first sent in network order (MSB), followed by the DER encoded AP-REQ itself. -If all is acceptable, the server reponds with an @code{int32} of +If all is acceptable, the server responds with an @code{int32} of value null. (In MSB order, but as it is null, order is irrelevant!). The KCMD protocol uses mutual authentication, so the server must @@ -5039,12 +5039,12 @@ Previously, there was a specific port @samp{ekshell} for that purpose, a use which is now extinct. Instead, whenever an encrypted exchange is desired via the port @samp{kshell}, client must prefix the string ``-x '' to the -command string, when it is sent inbetween the remote user name +command string, when it is sent between the remote user name and the local user name. In contrast, when the client computes the checksum for the AP-REQ authenticator, the string ``-x '' must not be included. -Encryption porcedure under version KCMDV0.2 differs from that in the +Encryption procedure under version KCMDV0.2 differs from that in the older protocol version. Under version KCMDV0.1, the ticket session key is put to use as encryption key, and only standard Kerberos encryption functions @@ -5063,7 +5063,7 @@ To contrast, KCMDV0.2 can be used with all Kerberos encryption modes, i.e., @samp{des}, @samp{3des}, @samp{aes}, @samp{arcfour}, and it uses an AP-REQ authenticator subkey. In opposition to KCMDV0.1, initialisation vectors are used. -All encryption and descryption must be made using a cryptographic context. +All encryption and decryption must be made using a cryptographic context. A typical coding example updates the context with an @code{iv}, then executes an encryption call : diff --git a/lib/ap.c b/lib/ap.c index 02f9e89a..c0e3004d 100644 --- a/lib/ap.c +++ b/lib/ap.c @@ -41,7 +41,7 @@ struct Shishi_ap there is data in authenticatorcksumdata to compute a checksum on, this also indicate the algorithm to use for this computation. */ int32_t authenticatorcksumtype; - /* Auxilliary application data to compute checksum on and store in + /* Auxiliary application data to compute checksum on and store in Authenticator, in AP-REQ. Note that data is not stored in AP-REQ, only a checksum of it. */ char *authenticatorcksumdata; @@ -543,7 +543,7 @@ shishi_ap_tktoptionsasn1usage (Shishi * handle, * Get Ticket from AP exchange. * * Return value: Returns the ticket from the AP exchange, or NULL if - * not yet set or an error occured. + * not yet set or an error occurred. **/ Shishi_tkt * shishi_ap_tkt (Shishi_ap * ap) @@ -675,7 +675,7 @@ shishi_ap_authenticator_cksumtype_set (Shishi_ap * ap, int32_t cksumtype) * Get ASN.1 Authenticator structure from AP exchange. * * Return value: Returns the Authenticator from the AP exchange, or - * NULL if not yet set or an error occured. + * NULL if not yet set or an error occurred. **/ Shishi_asn1 @@ -706,7 +706,7 @@ shishi_ap_authenticator_set (Shishi_ap * ap, Shishi_asn1 authenticator) * Get ASN.1 AP-REQ structure from AP exchange. * * Return value: Returns the AP-REQ from the AP exchange, or NULL if - * not yet set or an error occured. + * not yet set or an error occurred. **/ Shishi_asn1 shishi_ap_req (Shishi_ap * ap) @@ -1062,7 +1062,7 @@ shishi_ap_key (Shishi_ap * ap) * Get ASN.1 AP-REP structure from AP exchange. * * Return value: Returns the AP-REP from the AP exchange, or NULL if - * not yet set or an error occured. + * not yet set or an error occurred. **/ Shishi_asn1 shishi_ap_rep (Shishi_ap * ap) @@ -1299,7 +1299,7 @@ shishi_ap_rep_verify_asn1 (Shishi_ap * ap, Shishi_asn1 aprep) * Get ASN.1 EncAPRepPart structure from AP exchange. * * Return value: Returns the EncAPREPPart from the AP exchange, or - * NULL if not yet set or an error occured. + * NULL if not yet set or an error occurred. **/ Shishi_asn1 shishi_ap_encapreppart (Shishi_ap * ap) diff --git a/lib/as.c b/lib/as.c index cb2f7466..7903267d 100644 --- a/lib/as.c +++ b/lib/as.c @@ -116,7 +116,7 @@ shishi_as_done (Shishi_as * as) * Get ASN.1 AS-REQ structure from AS exchange. * * Return value: Returns the generated AS-REQ packet from the AS - * exchange, or NULL if not yet set or an error occured. + * exchange, or NULL if not yet set or an error occurred. **/ Shishi_asn1 shishi_as_req (Shishi_as * as) @@ -215,7 +215,7 @@ shishi_as_req_der_set (Shishi_as * as, char *der, size_t derlen) * Get ASN.1 AS-REP structure from AS exchange. * * Return value: Returns the received AS-REP packet from the AS - * exchange, or NULL if not yet set or an error occured. + * exchange, or NULL if not yet set or an error occurred. **/ Shishi_asn1 shishi_as_rep (Shishi_as * as) @@ -442,7 +442,7 @@ shishi_as_rep_der_set (Shishi_as * as, char *der, size_t derlen) * Get ASN.1 KRB-ERROR structure from AS exchange. * * Return value: Returns the received KRB-ERROR packet from the AS - * exchange, or NULL if not yet set or an error occured. + * exchange, or NULL if not yet set or an error occurred. **/ Shishi_asn1 shishi_as_krberror (Shishi_as * as) @@ -495,7 +495,7 @@ shishi_as_krberror_set (Shishi_as * as, Shishi_asn1 krberror) * Get Ticket in AS exchange. * * Return value: Returns the newly acquired tkt from the AS - * exchange, or NULL if not yet set or an error occured. + * exchange, or NULL if not yet set or an error occurred. **/ Shishi_tkt * shishi_as_tkt (Shishi_as * as) diff --git a/lib/asn1.c b/lib/asn1.c index 11d13593..963e4ba0 100644 --- a/lib/asn1.c +++ b/lib/asn1.c @@ -116,7 +116,7 @@ shishi_asn1_empty_p (Shishi * handle, Shishi_asn1 node, const char *field) * * Return value: Returns SHISHI_OK if successful, * SHISHI_ASN1_NO_ELEMENT if the element do not exist, - * SHISHI_ASN1_NO_VALUE if the field has no value, ot + * SHISHI_ASN1_NO_VALUE if the field has no value, or * SHISHI_ASN1_ERROR otherwise. **/ int @@ -157,7 +157,7 @@ shishi_asn1_read_inline (Shishi * handle, Shishi_asn1 node, * * Return value: Returns SHISHI_OK if successful, * SHISHI_ASN1_NO_ELEMENT if the element do not exist, - * SHISHI_ASN1_NO_VALUE if the field has no value, ot + * SHISHI_ASN1_NO_VALUE if the field has no value, or * SHISHI_ASN1_ERROR otherwise. **/ int @@ -217,7 +217,7 @@ shishi_asn1_read (Shishi * handle, * to avoid special error handling in your code. * * Return value: Returns SHISHI_OK if successful, - * SHISHI_ASN1_NO_VALUE if the field has no value, ot + * SHISHI_ASN1_NO_VALUE if the field has no value, or * SHISHI_ASN1_ERROR otherwise. **/ int diff --git a/lib/authenticator.c b/lib/authenticator.c index d8ceffb7..9bdd894a 100644 --- a/lib/authenticator.c +++ b/lib/authenticator.c @@ -332,7 +332,7 @@ shishi_authenticator_set_crealm (Shishi * handle, * shishi_authenticator_set_cname: * @handle: shishi handle as allocated by shishi_init(). * @authenticator: authenticator as allocated by shishi_authenticator(). - * @name_type: type of principial, see Shishi_name_type, usually + * @name_type: type of principal, see Shishi_name_type, usually * SHISHI_NT_UNKNOWN. * @cname: input array with principal name. * diff --git a/lib/enckdcreppart.c b/lib/enckdcreppart.c index 1ea5533c..df24b8f1 100644 --- a/lib/enckdcreppart.c +++ b/lib/enckdcreppart.c @@ -321,7 +321,7 @@ shishi_enckdcreppart_srealm_set (Shishi * handle, * shishi_enckdcreppart_sname_set: * @handle: shishi handle as allocated by shishi_init(). * @enckdcreppart: EncKDCRepPart variable to set server name field in. - * @name_type: type of principial, see Shishi_name_type, usually + * @name_type: type of principal, see Shishi_name_type, usually * SHISHI_NT_UNKNOWN. * @sname: input array with principal name. * diff --git a/lib/encticketpart.c b/lib/encticketpart.c index 3d6a3619..500a6d9d 100644 --- a/lib/encticketpart.c +++ b/lib/encticketpart.c @@ -196,7 +196,7 @@ shishi_encticketpart_crealm_set (Shishi * handle, * shishi_encticketpart_cname_set: * @handle: shishi handle as allocated by shishi_init(). * @encticketpart: input EncTicketPart variable. - * @name_type: type of principial, see Shishi_name_type, usually + * @name_type: type of principal, see Shishi_name_type, usually * SHISHI_NT_UNKNOWN. * @principal: input array with principal name. * diff --git a/lib/error.c b/lib/error.c index 7b2dbf2c..ec6d16e8 100644 --- a/lib/error.c +++ b/lib/error.c @@ -106,7 +106,7 @@ static const struct shishi_error_msgs _shishi_error_messages[] = { N_("Could not decrypt Ticket using provided key. " "This usually indicates an internal application error.")}, {SHISHI_INVALID_TICKET, - N_("Invalid ticked passed in call.")}, + N_("Invalid ticket passed in call.")}, {SHISHI_OUT_OF_RANGE, N_("Argument lies outside of valid range.")}, {SHISHI_ASN1_NO_ELEMENT, @@ -138,7 +138,7 @@ static const struct shishi_error_msgs _shishi_error_messages[] = { {SHISHI_FILE_ERROR, N_("The desired file could not be accessed. Check permissions.")}, {SHISHI_ENCAPREPPART_BAD_KEYTYPE, - N_("The present AP reply specifies an inpermissible key type.")}, + N_("The present AP reply specifies an impermissible key type.")}, {SHISHI_GETTIMEOFDAY_ERROR, N_("A request for present time of day has failed. " "This is usually internal, but a valid time is imperative for us.")}, diff --git a/lib/gztime.c b/lib/gztime.c index ed9f6a9f..501a7207 100644 --- a/lib/gztime.c +++ b/lib/gztime.c @@ -1,4 +1,4 @@ -/* gztime.c --- Convertion functions for GeneralizedTime. +/* gztime.c --- Conversion functions for GeneralizedTime. * Copyright (C) 2002-2014 Simon Josefsson * * This file is part of Shishi. diff --git a/lib/init.c b/lib/init.c index e4f4b8da..fb6a417b 100644 --- a/lib/init.c +++ b/lib/init.c @@ -46,7 +46,7 @@ init_handle (int outputtype) if (!shishi_check_version (SHISHI_VERSION)) { - shishi_warn (handle, "Library and header version missmatch (%s vs %s).", + shishi_warn (handle, "Library and header version mismatch (%s vs %s).", shishi_check_version (NULL), SHISHI_VERSION); free (handle); return NULL; diff --git a/lib/kdc.c b/lib/kdc.c index 10552019..46cc3e5f 100644 --- a/lib/kdc.c +++ b/lib/kdc.c @@ -460,7 +460,7 @@ shishi_as_check_cname (Shishi * handle, Shishi_asn1 asreq, Shishi_asn1 asrep) * @kdcreq: KDC-REQ providing "nonce" field. * @enckdcreppart: EncKDCRepPart where "nonce" field is updated. * - * Sets the field "nonce" in @enckdcreppart to a value retreived + * Sets the field "nonce" in @enckdcreppart to a value retrieved * from the corresponding field in @kdcreq. * * Return value: Returns %SHISHI_OK if successful. @@ -726,7 +726,7 @@ shishi_as_process (Shishi * handle, * @handle: Shishi handle as allocated by shishi_init(). * @kdcreq: Input variable holding the transmitted KDC-REQ. * @kdcrep: Input variable holding the received KDC-REP. - * @key: Input pointet to key for decrypting parts of @kdcrep. + * @key: Input pointer to key for decrypting parts of @kdcrep. * @keyusage: Kerberos key usage code. * @enckdcreppart: Output pointer for the extracted EncKDCRepPart. * diff --git a/lib/kdcrep.c b/lib/kdcrep.c index 6e0f02bd..d81393ff 100644 --- a/lib/kdcrep.c +++ b/lib/kdcrep.c @@ -287,7 +287,7 @@ shishi_kdcrep_crealm_set (Shishi * handle, * shishi_kdcrep_cname_set: * @handle: shishi handle as allocated by shishi_init(). * @kdcrep: Kdcrep variable to set server name field in. - * @name_type: type of principial, see Shishi_name_type, usually + * @name_type: type of principal, see Shishi_name_type, usually * SHISHI_NT_UNKNOWN. * @cname: input array with principal name. * diff --git a/lib/kdcreq.c b/lib/kdcreq.c index 219b6dfc..8f679d3d 100644 --- a/lib/kdcreq.c +++ b/lib/kdcreq.c @@ -367,7 +367,7 @@ shishi_kdcreq_nonce_set (Shishi * handle, Shishi_asn1 kdcreq, uint32_t nonce) * shishi_kdcreq_set_cname: * @handle: shishi handle as allocated by shishi_init(). * @kdcreq: KDC-REQ variable to set client name field in. - * @name_type: type of principial, see Shishi_name_type, usually + * @name_type: type of principal, see Shishi_name_type, usually * SHISHI_NT_UNKNOWN. * @principal: input array with principal name. * @@ -523,7 +523,7 @@ shishi_kdcreq_server (Shishi * handle, Shishi_asn1 kdcreq, * shishi_kdcreq_set_sname: * @handle: shishi handle as allocated by shishi_init(). * @kdcreq: KDC-REQ variable to set server name field in. - * @name_type: type of principial, see Shishi_name_type, usually + * @name_type: type of principal, see Shishi_name_type, usually * SHISHI_NT_UNKNOWN. * @sname: input array with principal name. * @@ -905,7 +905,7 @@ shishi_kdcreq_renewable_p (Shishi * handle, Shishi_asn1 kdcreq) * transited field is disabled. Tickets issued without the performance * of this check will be noted by the reset (0) value of the * TRANSITED-POLICY-CHECKED flag, indicating to the application server - * that the tranisted field must be checked locally. KDCs are + * that the transited field must be checked locally. KDCs are * encouraged but not required to honor the DISABLE-TRANSITED-CHECK * option. * diff --git a/lib/kerberos5.asn1 b/lib/kerberos5.asn1 index 5bacdc61..5cd3cadc 100644 --- a/lib/kerberos5.asn1 +++ b/lib/kerberos5.asn1 @@ -23,7 +23,7 @@ -- http://www.ietf.org/rfc/rfc4120.txt (MD5 -- f95332f70f18eb9252756c7e2accc141), with two minor modifications -- marked with "libtasn1 bug" below. RFC 4120 exhibit the ISOC --- copyright, althought it does not cover the ASN.1 schema, see +-- copyright, although it does not cover the ASN.1 schema, see -- discussions in the IETF IPR WG. I have acquired permission to use -- the ASN.1 schema from RFC 4120 under the MIT/X11 license from all -- authors but Tom Yu (as of April 2006). For prudence, asking the diff --git a/lib/keytab.c b/lib/keytab.c index 0400df6e..2a390567 100644 --- a/lib/keytab.c +++ b/lib/keytab.c @@ -288,7 +288,7 @@ shishi_keys_add_keytab_file (Shishi * handle, * @data: constant memory buffer with keytab of @len size. * @len: size of memory buffer with keytab data. * @outkeys: pointer to key set that will be allocated and populated, - * must be deallocated by caller on succes. + * must be deallocated by caller on success. * * Create a new key set populated with keys from a MIT keytab data * structure read from a memory block. @@ -327,7 +327,7 @@ shishi_keys_from_keytab_mem (Shishi * handle, * @handle: shishi handle as allocated by shishi_init(). * @filename: name of file to read. * @outkeys: pointer to key set that will be allocated and populated, - * must be deallocated by caller on succes. + * must be deallocated by caller on success. * * Create a new key set populated with keys from a MIT keytab data * structure read from a file. diff --git a/lib/krberror.c b/lib/krberror.c index 8ba74a0f..af7c678f 100644 --- a/lib/krberror.c +++ b/lib/krberror.c @@ -500,7 +500,7 @@ shishi_krberror_client (Shishi * handle, * shishi_krberror_set_cname: * @handle: shishi handle as allocated by shishi_init(). * @krberror: krberror as allocated by shishi_krberror(). - * @name_type: type of principial, see Shishi_name_type, usually + * @name_type: type of principal, see Shishi_name_type, usually * SHISHI_NT_UNKNOWN. * @cname: input array with principal name. * @@ -667,7 +667,7 @@ shishi_krberror_remove_sname (Shishi * handle, Shishi_asn1 krberror) * shishi_krberror_set_sname: * @handle: shishi handle as allocated by shishi_init(). * @krberror: krberror as allocated by shishi_krberror(). - * @name_type: type of principial, see Shishi_name_type, usually + * @name_type: type of principal, see Shishi_name_type, usually * SHISHI_NT_UNKNOWN. * @sname: input array with principal name. * diff --git a/lib/priv.c b/lib/priv.c index 0178c4c5..662dbb2c 100644 --- a/lib/priv.c +++ b/lib/priv.c @@ -140,7 +140,7 @@ shishi_priv_done (Shishi_priv * priv) * Get key from PRIV exchange. * * Return value: Returns the key used in the PRIV exchange, or NULL if - * not yet set or an error occured. + * not yet set or an error occurred. **/ Shishi_key * shishi_priv_key (Shishi_priv * priv) @@ -168,7 +168,7 @@ shishi_priv_key_set (Shishi_priv * priv, Shishi_key * key) * Get ASN.1 PRIV structure in PRIV exchange. * * Return value: Returns the ASN.1 priv in the PRIV exchange, or NULL if - * not yet set or an error occured. + * not yet set or an error occurred. **/ Shishi_asn1 shishi_priv_priv (Shishi_priv * priv) @@ -248,7 +248,7 @@ shishi_priv_priv_der_set (Shishi_priv * priv, char *der, size_t derlen) * Get ASN.1 EncPrivPart structure from PRIV exchange. * * Return value: Returns the ASN.1 encprivpart in the PRIV exchange, or NULL if - * not yet set or an error occured. + * not yet set or an error occurred. **/ Shishi_asn1 shishi_priv_encprivpart (Shishi_priv * priv) @@ -509,7 +509,7 @@ shishi_priv_enc_part_etype (Shishi * handle, * created by calling shishi_encrypt() on some application specific * data using the key from the ticket that is being used. To save * time, you may want to use shishi_priv_build() instead, which - * encryptes the data and calls this function in one step. + * encrypts the data and calls this function in one step. * * Return value: Returns SHISHI_OK iff successful. **/ diff --git a/lib/safe.c b/lib/safe.c index 815a359e..5b77f933 100644 --- a/lib/safe.c +++ b/lib/safe.c @@ -129,7 +129,7 @@ shishi_safe_done (Shishi_safe * safe) * Get key structured from SAFE exchange. * * Return value: Returns the key used in the SAFE exchange, or NULL if - * not yet set or an error occured. + * not yet set or an error occurred. **/ Shishi_key * shishi_safe_key (Shishi_safe * safe) @@ -157,7 +157,7 @@ shishi_safe_key_set (Shishi_safe * safe, Shishi_key * key) * Get ASN.1 SAFE structured from SAFE exchange. * * Return value: Returns the ASN.1 safe in the SAFE exchange, or NULL if - * not yet set or an error occured. + * not yet set or an error occurred. **/ Shishi_asn1 shishi_safe_safe (Shishi_safe * safe) diff --git a/lib/shishi.h b/lib/shishi.h index 01275886..33daaf52 100644 --- a/lib/shishi.h +++ b/lib/shishi.h @@ -118,7 +118,7 @@ extern "C" SHISHI_NT_SRV_XHST = 4, /* Unique ID */ SHISHI_NT_UID = 5, - /* Encoded X.509 Distingished name [RFC 2253] */ + /* Encoded X.509 Distinguished name [RFC 2253] */ SHISHI_NT_X500_PRINCIPAL = 6, /* Name in form of SMTP email name (e.g. address@hidden) */ SHISHI_NT_SMTP_NAME = 7, @@ -245,7 +245,7 @@ extern "C" /* Reserved for user-to-user krb_tgt_reply */ SHISHI_MSGTYPE_RESERVED17 = 17, /* 18-19 unused */ - /* Safe (checksummed) application message */ + /* Safe (checksumed) application message */ SHISHI_MSGTYPE_SAFE = 20, /* Private (encrypted) application message */ SHISHI_MSGTYPE_PRIV = 21, @@ -465,7 +465,7 @@ extern "C" SHISHI_KDC_ERR_KEY_EXPIRED = 23, /* Pre-authentication information was invalid */ SHISHI_KDC_ERR_PREAUTH_FAILED = 24, - /* Additional pre-authenticationrequired */ + /* Additional pre-authentication required */ SHISHI_KDC_ERR_PREAUTH_REQUIRED = 25, /* Requested server and ticket don't match */ SHISHI_KDC_ERR_SERVER_NOMATCH = 26, diff --git a/lib/starttls.c b/lib/starttls.c index 55993715..e6913a44 100644 --- a/lib/starttls.c +++ b/lib/starttls.c @@ -187,7 +187,7 @@ _shishi_sendrecv_tls1 (Shishi * handle, return SHISHI_SENDTO_ERROR; } - /* XXX sanities input. */ + /* XXX sanitize input. */ *outlen = C2I (tmpbuf); *outdata = xmalloc (*outlen); diff --git a/lib/tgs.c b/lib/tgs.c index e609b85c..61bb1592 100644 --- a/lib/tgs.c +++ b/lib/tgs.c @@ -122,7 +122,7 @@ shishi_tgs_done (Shishi_tgs * tgs) * Get Ticket-granting-ticket from TGS exchange. * * Return value: Returns the ticket-granting-ticket used in the TGS - * exchange, or NULL if not yet set or an error occured. + * exchange, or NULL if not yet set or an error occurred. **/ Shishi_tkt * shishi_tgs_tgtkt (Shishi_tgs * tgs) @@ -151,7 +151,7 @@ shishi_tgs_tgtkt_set (Shishi_tgs * tgs, Shishi_tkt * tgtkt) * * Return value: Returns the AP exchange (part of TGS-REQ) from the * TGS exchange, or NULL if not yet set or an error - * occured. + * occurred. **/ Shishi_ap * shishi_tgs_ap (Shishi_tgs * tgs) @@ -166,7 +166,7 @@ shishi_tgs_ap (Shishi_tgs * tgs) * Get the TGS-REQ from TGS exchange. * * Return value: Returns the generated TGS-REQ from the TGS exchange, - * or NULL if not yet set or an error occured. + * or NULL if not yet set or an error occurred. **/ Shishi_asn1 shishi_tgs_req (Shishi_tgs * tgs) @@ -340,7 +340,7 @@ shishi_tgs_req_build (Shishi_tgs * tgs) * Get TGS-REP from TGS exchange. * * Return value: Returns the received TGS-REP from the TGS exchange, - * or NULL if not yet set or an error occured. + * or NULL if not yet set or an error occurred. **/ Shishi_asn1 shishi_tgs_rep (Shishi_tgs * tgs) @@ -490,7 +490,7 @@ shishi_tgs_rep_build (Shishi_tgs * tgs, int keyusage, Shishi_key * key) * Get KRB-ERROR from TGS exchange. * * Return value: Returns the received TGS-REP from the TGS exchange, - * or NULL if not yet set or an error occured. + * or NULL if not yet set or an error occurred. **/ Shishi_asn1 shishi_tgs_krberror (Shishi_tgs * tgs) @@ -543,7 +543,7 @@ shishi_tgs_krberror_set (Shishi_tgs * tgs, Shishi_asn1 krberror) * Get Ticket from TGS exchange. * * Return value: Returns the newly acquired ticket from the TGS - * exchange, or NULL if not yet set or an error occured. + * exchange, or NULL if not yet set or an error occurred. **/ Shishi_tkt * shishi_tgs_tkt (Shishi_tgs * tgs) diff --git a/lib/ticket.c b/lib/ticket.c index 33902953..7a2c8dd7 100644 --- a/lib/ticket.c +++ b/lib/ticket.c @@ -125,7 +125,7 @@ shishi_ticket_server (Shishi * handle, Shishi_asn1 ticket, * shishi_ticket_sname_set: * @handle: shishi handle as allocated by shishi_init(). * @ticket: Ticket variable to set server name field in. - * @name_type: type of principial, see Shishi_name_type, usually + * @name_type: type of principal, see Shishi_name_type, usually * SHISHI_NT_UNKNOWN. * @sname: input array with principal name. * diff --git a/lib/tktccache.c b/lib/tktccache.c index 907875ae..f837170c 100644 --- a/lib/tktccache.c +++ b/lib/tktccache.c @@ -347,7 +347,7 @@ shishi_tkts_add_ccache_file (Shishi * handle, * @data: constant memory buffer with ccache of @len size. * @len: size of memory buffer with ccache data. * @outtkts: pointer to ticket set that will be allocated and populated, - * must be deallocated by caller on succes. + * must be deallocated by caller on success. * * Read tickets from a ccache data structure, and add them to the * ticket set. @@ -386,7 +386,7 @@ shishi_tkts_from_ccache_mem (Shishi * handle, * @handle: shishi handle as allocated by shishi_init(). * @filename: name of file to read. * @outtkts: pointer to ticket set that will be allocated and populated, - * must be deallocated by caller on succes. + * must be deallocated by caller on success. * * Read tickets from a ccache data structure, and add them to the * ticket set. diff --git a/lib/tkts.c b/lib/tkts.c index 24078a2a..45f49cde 100644 --- a/lib/tkts.c +++ b/lib/tkts.c @@ -648,7 +648,7 @@ shishi_tkt_match_p (Shishi_tkt * tkt, Shishi_tkts_hint * hint) * characteristics. If a ticket is found, the hint->startpos field is * updated to point to the next ticket in the set, so this function * can be called repeatedly with the same hint argument in order to - * find all tickets matching a certain criterium. Note that if + * find all tickets matching a certain criteria. Note that if * tickets are added to, or removed from, the ticketset during a query * with the same hint argument, the hint->startpos field must be * updated appropriately. diff --git a/lib/utils.c b/lib/utils.c index 38aafee3..139743ca 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -1,4 +1,4 @@ -/* utils.c --- Auxilliary help functions. +/* utils.c --- Auxiliary help functions. * Copyright (C) 2002-2014 Simon Josefsson * * This file is part of Shishi. diff --git a/lib/utils.h b/lib/utils.h index da014a23..afa24a46 100644 --- a/lib/utils.h +++ b/lib/utils.h @@ -1,4 +1,4 @@ -/* utils.h --- Auxilliary help prototypes. +/* utils.h --- Auxiliary help prototypes. * Copyright (C) 2002-2014 Simon Josefsson * * This file is part of Shishi. diff --git a/src/kdc.c b/src/kdc.c index 2d7d7f38..d55dc461 100644 --- a/src/kdc.c +++ b/src/kdc.c @@ -23,7 +23,7 @@ /* Note: only use syslog to report errors in this file. * * XXX: Examine in detail the made choices of syslog facility. - * Messages should not exessively use 'auth', be it as default + * Messages should not excessively use 'auth', be it as default * by openlog(), or explicitly. */ @@ -661,7 +661,7 @@ tgsreq1 (Shishi_tgs * tgs) * ticket-granting ticket for a remote realm, and if no key is shared * with the requested realm, then the Kerberos server will select the * realm 'closest' to the requested realm with which it does share a - * key, and use that realm instead. Thss is theonly cases where the + * key, and use that realm instead. This is the only case where the * response for the KDC will be for a different server than that * requested by the client. */ diff --git a/src/starttls.c b/src/starttls.c index 1bf9c105..5ae6ee57 100644 --- a/src/starttls.c +++ b/src/starttls.c @@ -231,7 +231,7 @@ logtlsinfo (gnutls_session_t session) /* This message can arguably belong to LOG_AUTH. */ syslog (LOG_INFO, "TLS handshake negotiated protocol `%s', " - "key exchange `%s', certficate type `%s', cipher `%s', " + "key exchange `%s', certificate type `%s', cipher `%s', " "mac `%s', compression `%s', %s", protocol ? protocol : "N/A", keyexchange ? keyexchange : "N/A", diff --git a/tests/priv.c b/tests/priv.c index ce16e9b5..9a65ea85 100644 --- a/tests/priv.c +++ b/tests/priv.c @@ -103,7 +103,7 @@ test (Shishi * handle) /* shishi_priv_process */ res = shishi_priv_process (priv, key); if (res == SHISHI_PRIV_BAD_KEYTYPE) /* t==42 unsupported etype */ - success ("shishi_priv_proces() OK\n"); + success ("shishi_priv_process() OK\n"); else fail ("shishi_priv_process() failed (%d)\n", res); diff --git a/tests/shisa.sh b/tests/shisa.sh index 014ee599..92dd1b4c 100755 --- a/tests/shisa.sh +++ b/tests/shisa.sh @@ -270,7 +270,7 @@ if test "$out" != "$expectout"; then exit 1 fi -echo Tring to remove entire realm. +echo Trying to remove entire realm. out=`$SHISA -c $CONF -r TESTREALM 2>&1` if test $? != 1; then echo rc $? diff --git a/tests/shishi.supp b/tests/shishi.supp index 30473270..ccadca9a 100644 --- a/tests/shishi.supp +++ b/tests/shishi.supp @@ -1,4 +1,4 @@ -# shishi.supp -- Valgrind suppresion file for Shishi. +# shishi.supp -- Valgrind suppression file for Shishi. # Copyright (C) 2006-2014 Simon Josefsson # Copying and distribution of this file, with or without modification, -- 2.18.0