Merge branch 'typos' of ssh://github.com/NathanBaulch/easy-rsa into N…

…athanBaulch-typos Signed-off-by: Richard T Bonhomme <tincantech@protonmail.com>
OpenVPN · Jun 17, 2024 · be5265c · be5265c
2 parents 5e9cdb3 + 350011d
commit be5265c
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 40 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -44,7 +44,7 @@ Easy-RSA 3 ChangeLog
    Branch-merge: v3.2.0-beta1 (#1046) 2023/12/15 Commit: 7120876
 
    * Important note: As of Easy-RSA version 3.2.0-beta1, the configuration files
-     `vars.example`, `openssl-eayrsa.cnf` and all files in `x509-types` directory
+     `vars.example`, `openssl-easyrsa.cnf` and all files in `x509-types` directory
      are no longer required. Package maintainers can omit these files in the future.
      All files are created as required and deleted upon command completion.
      `vars.example` is created during `init-pki` and placed in the fresh PKI.
@@ -73,7 +73,7 @@ Easy-RSA 3 ChangeLog
 3.1.7 (2023-10-13)
    * Rewrite vars-auto-detect, adhere to EasyRSA-Advanced.md (#1029)
      Under the hood, this is a considerable change but there are no user
-     noticable differences. With the exception of:
+     noticeable differences. With the exception of:
      Caveat: The default '$PWD/pki/vars' file is forbidden to change either
              EASYRSA or EASYRSA_PKI, which are both implied by default.
    * EasyRSA-Advanced.md: Correct vars-auto-detect hierarchy (#1029)
@@ -97,7 +97,7 @@ Easy-RSA 3 ChangeLog
 3.1.5 (2023-06-10)
    * Build Update: script now supports signing and verifying
    * Automate support-file creation (Free packaging) (#964)
-   * build-ca: New command option 'raw-ca', abbrevation: 'raw' (#963)
+   * build-ca: New command option 'raw-ca', abbreviation: 'raw' (#963)
 
      This 'raw' method, is the most reliable way to build a CA,
      with a password, without writing the CA password to a temp-file.
@@ -183,7 +183,7 @@ Easy-RSA 3 ChangeLog
 
 3.0.9 (2022-05-17)
    * Upgrade OpenSSL from 1.1.0j to 1.1.1o (#405, #407) 
-      - We are buliding this ourselves now.
+      - We are building this ourselves now.
    * Fix --version so it uses EASYRSA_OPENSSL (#416)
    * Use openssl rand instead of non-POSIX mktemp (#478)
    * Fix paths with spaces (#443)

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 [![CI](https://github.com/Openvpn/easy-rsa/actions/workflows/action.yml/badge.svg)](https://github.com/Openvpn/easy-rsa/actions/workflows/action.yml)
 # Overview
 
-easy-rsa is a CLI utility to build and manage a PKI CA. In laymen's terms,
+easy-rsa is a CLI utility to build and manage a PKI CA. In layman's terms,
 this means to create a root certificate authority, and request and sign
 certificates, including intermediate CAs and certificate revocation lists (CRL).
 

diff --git a/dev/easyrsa-tools.lib b/dev/easyrsa-tools.lib
@@ -404,7 +404,7 @@ db_date_to_iso_8601_date: force_set_var - $2 - $out_date"
 
 # Convert default SSL date to iso_8601 date
 # This may not be feasible, due to different languages
-# Alow the caller to assess those errors (eg. Fall-back)
+# Allow the caller to assess those errors (eg. Fall-back)
 # shellcheck disable=2317 # Unreach - cert_date_to_iso_8601_date()
 cert_date_to_iso_8601_date() {
 	verbose "iso_8601-WIP: cert_date_to_iso_8601_date"
@@ -453,7 +453,7 @@ cert_date_to_iso_8601_date: input error"
 		return 1
 	esac
 
-	# Assign signle letter timezone from abbreviation
+	# Assign single letter timezone from abbreviation
 	case "$TZ" in
 	GMT) TZ=Z ;;
 	*)

diff --git a/distro/windows/Licensing/LICENSE-OpenSSL.txt b/distro/windows/Licensing/LICENSE-OpenSSL.txt
@@ -71,10 +71,10 @@
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
+ * The implementation was written so as to conform with Netscape's SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
+ * the following conditions are adhered to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
@@ -99,7 +99,7 @@
  *    must display the following acknowledgement:
  *    "This product includes cryptographic software written by
  *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
+ *    The word 'cryptographic' can be left out if the routines from the library
  *    being used are not cryptographic related :-).
  * 4. If you include any Windows specific code (or a derivative thereof) from 
  *    the apps directory (application code) you must include an acknowledgement:
@@ -117,7 +117,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- * The licence and distribution terms for any publically available version or
+ * The licence and distribution terms for any publicly available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]

diff --git a/distro/windows/Licensing/mksh-Win32.txt b/distro/windows/Licensing/mksh-Win32.txt
@@ -133,7 +133,7 @@ This icon may be used to refer to The MirBSD Korn Shell and
 its Win32 port. Distribution patches are acceptable as long
 as they modify $KSH_VERSION according to the guidelines that
 are published on the website; forks and works that are not
-derivates are not allowed to use it.
+derivatives are not allowed to use it.
 
 The BSD daemon is Copyright (c) 1988 by Marshall Kirk McKusick.
 All Rights Reserved.  Individuals may use the daemon for their

diff --git a/doc/EasyRSA-Advanced.md b/doc/EasyRSA-Advanced.md
@@ -158,7 +158,6 @@ short description is shown below:
     include the **deprecated** Netscape extensions
  *  `EASYRSA_NS_COMMENT` (CLI: `--ns-comment`) - string comment to include when
     using the **deprecated** Netscape extensions
-    extensions
  *  `EASYRSA_REQ_CN` (CLI: `--req-cn`) - default CN, can only be used in BATCH
     mode
  *  `EASYRSA_DIGEST` (CLI: `--digest`) - set a hash digest to use for req/cert

diff --git a/doc/EasyRSA-Contributing.md b/doc/EasyRSA-Contributing.md
@@ -1,4 +1,4 @@
-Easy-RSA 3 Github Contributions Documentation
+Easy-RSA 3 GitHub Contributions Documentation
 =============================================
 
 This document explains how to contribute to Easy-RSA 3.
@@ -14,7 +14,7 @@ Contributing Guide
 
 -   **Do not** edit Easy-RSA `master` branch.
 
-    Pull Requests submitted from `master` branch may be be squashed or rejected.
+    Pull Requests submitted from `master` branch may be squashed or rejected.
 
 ### Create a new branch:
 
@@ -72,7 +72,7 @@ Contributing Guide
     Raise a Pull Request on github.
     ```
 
-Keeping your fork syncronised
+Keeping your fork synchronised
 -----------------------------
 
 -   Configure the `upstream` remote for your fork:
@@ -101,7 +101,7 @@ Keeping your fork syncronised
     upstream https://github.com/Openvpn/easy-rsa.git (push)
     ```
 
-### Syncronising your fork:
+### Synchronising your fork:
 
 -   Select `master` branch:
 
@@ -128,4 +128,4 @@ Keeping your fork syncronised
     ```
 
 
-    Your fork is now syncronised.
+    Your fork is now synchronised.
diff --git a/doc/EasyRSA-Renew-and-Revoke.md b/doc/EasyRSA-Renew-and-Revoke.md
@@ -19,7 +19,7 @@ Instead, the process is as follows:
 
 2. Command `sign-req <TYPE> <NAME>` - Sign a new certificate.
 
-   This allows ALL command line cutomisations to be used. eg: SAN.
+   This allows ALL command line customisations to be used. eg: SAN.
    (These customisations do not work correctly with the old `renew`)
 
 3. If required, Command `revoke-expired` can be used to revoke an
@@ -116,7 +116,7 @@ Easy-RSA Reporting tools for certificate status
 -----------------------------------------------
 
 Easy-RSA version `3.1.x`, also has the following tools to keep track of
-certificate staus:
+certificate status:
 
     easyrsa [ --days=# ] show-expire [ file-name-base ]
 

diff --git a/doc/Hacking.md b/doc/Hacking.md
@@ -108,7 +108,7 @@ messages and merge actions.
 
   Contributions can come in many forms: GitHub "pull requests" from cloned
   repos, references to external repos, patches to the ML, or others. Those won't
-  necessary have `Signed-off-by:` lines or may contain less info in the commit
+  necessarily have `Signed-off-by:` lines or may contain less info in the commit
   message than is desirable to explain the changes.
 
   The committing author to this project should make a merge-commit in this case

diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
@@ -441,15 +441,15 @@ Usage: easyrsa [ OPTIONS.. ] <COMMAND> <TARGET> [ cmd-opts.. ]"
     These are the only commands that support --copy-ext and/or --san.
 
     Command 'gen-req':
-      --san: Add SAN extention to the request file.
+      --san: Add SAN extension to the request file.
 
     Command 'sign-req':
-      --copy-ext: Copy all request extentions to the signed certificate.
+      --copy-ext: Copy all request extensions to the signed certificate.
       --san: Over write the request SAN with option SAN.
 
     Command 'build-*-full':
       --copy-ext: Always enabled.
-      --san: Add SAN extention to the request and signed certificate.
+      --san: Add SAN extension to the request and signed certificate.
 
     See 'help san' for option --san full syntax."
 	;;
@@ -463,7 +463,7 @@ Usage: easyrsa [ OPTIONS.. ] <COMMAND> <TARGET> [ cmd-opts.. ]"
         eg: '--days=3650 build-ca'
       * Expiry days for new/renewed certificate.
         eg: '--days=1095 renew server'
-      * Expiry days for certificate revokation list.
+      * Expiry days for certificate revocation list.
         eg: '--days=180 gen-crl'
       * Cutoff days for command: show-expire.
         eg: '--days=90 show-expire'"
@@ -1771,7 +1771,7 @@ Raw CA mode
 		# X509 files
 		cat "$x509_ca_file" "$x509_COMMON_file"
 
-		# User extentions
+		# User extensions
 		[ "$EASYRSA_EXTRA_EXTS" ] && \
 			print "$EASYRSA_EXTRA_EXTS"
 
@@ -2008,7 +2008,7 @@ self-sign: Use ALGO/CURVE to $EASYRSA_ALGO/$EASYRSA_CURVE"
 		# X509 files
 		cat "$x509_selfsign_file" "$x509_COMMON_file"
 
-		# User extentions
+		# User extensions
 		[ "$EASYRSA_EXTRA_EXTS" ] && \
 			print "$EASYRSA_EXTRA_EXTS"
 
@@ -2231,7 +2231,7 @@ $EASYRSA_EXTRA_EXTS"
 	{ while ( getline<"/dev/stdin" ) {print} next }
  {print}
 }'
-		# Assign temp-file for confg
+		# Assign temp-file for config
 		adjusted_ssl_cnf_tmp=""
 		easyrsa_mktemp adjusted_ssl_cnf_tmp || \
 			die "gen_req - easyrsa_mktemp adjusted_ssl_cnf_tmp"
@@ -2433,7 +2433,7 @@ to the latest Easy-RSA release."
 	{ while ( getline<"/dev/stdin" ) {print} next }
  {print}
 }'
-		# Assign temp-file for confg
+		# Assign temp-file for config
 		adjusted_ssl_cnf_tmp=""
 		easyrsa_mktemp adjusted_ssl_cnf_tmp || \
 			die "sign_req - easyrsa_mktemp adjusted_ssl_cnf_tmp"
@@ -2473,9 +2473,9 @@ Writing 'copy_exts' to SSL config temp-file failed"
 	unset -v basicConstraints
 	if [ "$crt_type" = "ca" ] && [ "$EASYRSA_SUBCA_LEN" ]
 	then
-		# Print the last occurence of basicContraints in
+		# Print the last occurrence of basicConstraints in
 		# x509-types/ca
-		# If basicContraints is not defined then bail
+		# If basicConstraints is not defined then bail
 		# shellcheck disable=SC2016 # No expand '' - sign_req()
 		awkscript='\
 /^[[:blank:]]*basicConstraints[[:blank:]]*=/ { bC=$0 }
@@ -2576,7 +2576,7 @@ Failed to create temp extension file (bad permissions?) at:
 	# Set confirm SAN
 	# SAN from .req
 	if [ "$EASYRSA_CP_EXT" ]; then
-		# cature complete CSR
+		# capture complete CSR
 		req_text="$(
 			easyrsa_openssl req -in "$req_in" -noout -text
 			)" || die "sign-req: openssl: req_text"
@@ -2621,12 +2621,12 @@ $confirm_dn"
 
 	# Display the request subject in an easy-to-read format
 	# Confirm the user wishes to sign this request
-	# The foriegn_request confirmation is not required
+	# The foreign_request confirmation is not required
 	# for build_full:
 	if [ "$do_build_full" ]; then
-		unset -v foriegn_request
+		unset -v foreign_request
 	else
-		foriegn_request="\
+		foreign_request="\
 Please check over the details shown below for accuracy. \
 Note that this request
 has not been cryptographically verified. Please be sure \
@@ -2636,7 +2636,7 @@ with the sender.$NL"
 	fi
 
 	confirm "Confirm request details: " "yes" "\
-${foriegn_request}You are about to sign the following certificate:
+${foreign_request}You are about to sign the following certificate:
 
 $confirm_details" # => confirm end
 
@@ -2687,7 +2687,7 @@ check_serial_unique() {
 
 	# Check for openssl -status of serial number
 	# Always errors out - Do not capture error
-	# unset EASYRSA_SILENT_SSL to capure all output
+	# unset EASYRSA_SILENT_SSL to capture all output
 	# Do NOT unset check_serial for sign-req error msg
 	check_serial="$(
 		unset -v EASYRSA_SILENT_SSL
@@ -4451,7 +4451,7 @@ set_var() {
 	die "set_var - eval '$*'"
 } # => set_var()
 
-# sanatize and set var
+# sanitize and set var
 # nix.sh/win.sh/busybox.sh never return error from unset
 # when an invalid variable name 'a=b' is used with a value
 # to set, eg. 'c'; This causes EasyRSA to execute:
@@ -4466,7 +4466,7 @@ force_set_var() {
 	esac
 	# Guard unset with '|| die', just in case
 	unset -v "$1" || die "force_set_var - unset '$1'"
-	# Allow emmpty value to unset variable
+	# Allow empty value to unset variable
 	[ "$2" ] || return 0
 	set_var "$1" "$2" && return
 	die "force_set_var - set_var '$*'"
@@ -4748,7 +4748,7 @@ write_legacy_file_v2() {
 	write_recursion="$(( write_recursion - 1 ))"
 } # => write_legacy_file_v2()
 
-# set heredoc variables for openssl-esyrsa.cnf
+# set heredoc variables for openssl-easyrsa.cnf
 # shellcheck disable=SC2016 # (info): $ don't expand in ''
 set_openssl_easyrsa_cnf_vars(){
 	case "$1" in