summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/gnutls_pubkey.c2
-rw-r--r--lib/openpgp/gnutls_openpgp.c10
-rw-r--r--lib/x509/pkcs12_bag.c2
-rw-r--r--lib/x509/x509.c2
-rw-r--r--lib/x509/x509_ext.c2
-rw-r--r--src/certtool-cfg.c2
6 files changed, 10 insertions, 10 deletions
diff --git a/lib/gnutls_pubkey.c b/lib/gnutls_pubkey.c
index 5a7b6676b3..504b6d972f 100644
--- a/lib/gnutls_pubkey.c
+++ b/lib/gnutls_pubkey.c
@@ -253,7 +253,7 @@ gnutls_pubkey_import_privkey(gnutls_pubkey_t key, gnutls_privkey_t pkey,
* @hash: The result of the call with the hash algorithm used for signature
* @mand: If non zero it means that the algorithm MUST use this hash. May be NULL.
*
- * This function will read the certifcate and return the appropriate digest
+ * This function will read the certificate and return the appropriate digest
* algorithm to use for signing with this certificate. Some certificates (i.e.
* DSA might not be able to sign without the preferred algorithm).
*
diff --git a/lib/openpgp/gnutls_openpgp.c b/lib/openpgp/gnutls_openpgp.c
index 4c867960dc..6185639ebb 100644
--- a/lib/openpgp/gnutls_openpgp.c
+++ b/lib/openpgp/gnutls_openpgp.c
@@ -339,7 +339,7 @@ gnutls_openpgp_get_key(gnutls_datum_t * key,
* @key: the datum that contains the secret key.
* @format: the format of the keys
*
- * This funtion is used to load OpenPGP keys into the GnuTLS credential
+ * This function is used to load OpenPGP keys into the GnuTLS credential
* structure. The datum should contain at least one valid non encrypted subkey.
*
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
@@ -362,7 +362,7 @@ gnutls_certificate_set_openpgp_key_mem(gnutls_certificate_credentials_t
* @keyfile: the file that contains the secret key.
* @format: the format of the keys
*
- * This funtion is used to load OpenPGP keys into the GnuTLS
+ * This function is used to load OpenPGP keys into the GnuTLS
* credentials structure. The file should contain at least one valid non encrypted subkey.
*
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
@@ -412,7 +412,7 @@ static int get_keyid(gnutls_openpgp_keyid_t keyid, const char *str)
* @subkey_id: a hex encoded subkey id
* @format: the format of the keys
*
- * This funtion is used to load OpenPGP keys into the GnuTLS
+ * This function is used to load OpenPGP keys into the GnuTLS
* credentials structure. The datum should contain at least one valid non encrypted subkey.
*
* The special keyword "auto" is also accepted as @subkey_id. In that
@@ -509,7 +509,7 @@ gnutls_certificate_set_openpgp_key_mem2(gnutls_certificate_credentials_t
* @subkey_id: a hex encoded subkey id
* @format: the format of the keys
*
- * This funtion is used to load OpenPGP keys into the GnuTLS credential
+ * This function is used to load OpenPGP keys into the GnuTLS credential
* structure. The file should contain at least one valid non encrypted subkey.
*
* The special keyword "auto" is also accepted as @subkey_id. In that
@@ -752,7 +752,7 @@ _gnutls_openpgp_request_key(gnutls_session_t session, gnutls_datum_t * ret,
* @session: a TLS session
* @func: the callback
*
- * This funtion will set a key retrieval function for OpenPGP keys. This
+ * This function will set a key retrieval function for OpenPGP keys. This
* callback is only useful in server side, and will be used if the peer
* sent a key fingerprint instead of a full key.
*
diff --git a/lib/x509/pkcs12_bag.c b/lib/x509/pkcs12_bag.c
index 2807b5dd9a..136db73755 100644
--- a/lib/x509/pkcs12_bag.c
+++ b/lib/x509/pkcs12_bag.c
@@ -110,7 +110,7 @@ gnutls_pkcs12_bag_get_type(gnutls_pkcs12_bag_t bag, int indx)
* gnutls_pkcs12_bag_get_count:
* @bag: The bag
*
- * This function will return the number of the elements withing the bag.
+ * This function will return the number of the elements within the bag.
*
* Returns: Number of elements in bag, or an negative error code on
* error.
diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index aae85dc282..e1b5c57bf6 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -2843,7 +2843,7 @@ gnutls_x509_crt_check_revocation(gnutls_x509_crt_t cert,
* @hash: The result of the call with the hash algorithm used for signature
* @mand: If non-zero it means that the algorithm MUST use this hash. May be NULL.
*
- * This function will read the certifcate and return the appropriate digest
+ * This function will read the certificate and return the appropriate digest
* algorithm to use for signing with this certificate. Some certificates (i.e.
* DSA might not be able to sign without the preferred algorithm).
*
diff --git a/lib/x509/x509_ext.c b/lib/x509/x509_ext.c
index 2cd9640541..c22665cc0a 100644
--- a/lib/x509/x509_ext.c
+++ b/lib/x509/x509_ext.c
@@ -2237,7 +2237,7 @@ int crl_dist_points_set(gnutls_x509_crl_dist_points_t cdp,
* @san: The point name data
* @reasons: Revocation reasons. An ORed sequence of flags from %gnutls_x509_crl_reason_flags_t.
*
- * This function will store the specified CRL distibution point value
+ * This function will store the specified CRL distribution point value
* the @cdp type.
*
* Returns: On success, %GNUTLS_E_SUCCESS (0), otherwise a negative error value.
diff --git a/src/certtool-cfg.c b/src/certtool-cfg.c
index 1bae6ec8c9..ba9b7ba199 100644
--- a/src/certtool-cfg.c
+++ b/src/certtool-cfg.c
@@ -679,7 +679,7 @@ const char *get_confirmed_pass(bool empty_ok)
do {
if (pass)
fprintf(stderr,
- "Password missmatch, try again.\n");
+ "Password mismatch, try again.\n");
free(copy);