summaryrefslogtreecommitdiff
path: root/lib/x509
diff options
context:
space:
mode:
Diffstat (limited to 'lib/x509')
-rw-r--r--lib/x509/attributes.c2
-rw-r--r--lib/x509/dn.c6
-rw-r--r--lib/x509/ip-in-cidr.h2
-rw-r--r--lib/x509/mpi.c2
-rw-r--r--lib/x509/name_constraints.c2
-rw-r--r--lib/x509/ocsp.c2
-rw-r--r--lib/x509/pkcs12.c2
-rw-r--r--lib/x509/time.c4
-rw-r--r--lib/x509/verify-high.c2
-rw-r--r--lib/x509/verify.c2
-rw-r--r--lib/x509/x509_ext.c4
-rw-r--r--lib/x509/x509_int.h2
12 files changed, 16 insertions, 16 deletions
diff --git a/lib/x509/attributes.c b/lib/x509/attributes.c
index 4d116be4ec..9c83ca8414 100644
--- a/lib/x509/attributes.c
+++ b/lib/x509/attributes.c
@@ -110,7 +110,7 @@ _x509_parse_attribute(ASN1_TYPE asn1_struct,
goto cleanup;
}
- /* Move to the attibute type and values
+ /* Move to the attribute type and values
*/
/* Read the OID
*/
diff --git a/lib/x509/dn.c b/lib/x509/dn.c
index 828bd9059d..033531970d 100644
--- a/lib/x509/dn.c
+++ b/lib/x509/dn.c
@@ -74,7 +74,7 @@ static int append_elements(ASN1_TYPE asn1_struct, const char *asn1_rdn_name, gnu
goto cleanup;
}
- do { /* Move to the attibute type and values
+ do { /* Move to the attribute type and values
*/
k2++;
@@ -359,7 +359,7 @@ _gnutls_x509_parse_dn_oid(ASN1_TYPE asn1_struct,
k2 = 0;
- do { /* Move to the attibute type and values
+ do { /* Move to the attribute type and values
*/
k2++;
@@ -519,7 +519,7 @@ _gnutls_x509_get_dn_oid(ASN1_TYPE asn1_struct,
k2 = 0;
- do { /* Move to the attibute type and values
+ do { /* Move to the attribute type and values
*/
k2++;
diff --git a/lib/x509/ip-in-cidr.h b/lib/x509/ip-in-cidr.h
index 86fd8e50e4..8bb5dd48ae 100644
--- a/lib/x509/ip-in-cidr.h
+++ b/lib/x509/ip-in-cidr.h
@@ -30,7 +30,7 @@
* The @ip version must match the @cidr version (v4/v6),
* (this is not checked).
*
- * Returns: 1 if @ip lies withing @cidr, 0 otherwise
+ * Returns: 1 if @ip lies within @cidr, 0 otherwise
-*/
static unsigned ip_in_cidr(const gnutls_datum_t *ip, const gnutls_datum_t *cidr)
{
diff --git a/lib/x509/mpi.c b/lib/x509/mpi.c
index 20a64690a3..bb914420f1 100644
--- a/lib/x509/mpi.c
+++ b/lib/x509/mpi.c
@@ -378,7 +378,7 @@ _gnutls_x509_write_sign_params(ASN1_TYPE dst, const char *dst_name,
}
/* this function reads a (small) unsigned integer
- * from asn1 structs. Combines the read and the convertion
+ * from asn1 structs. Combines the read and the conversion
* steps.
*/
int
diff --git a/lib/x509/name_constraints.c b/lib/x509/name_constraints.c
index c4d78026fe..a2cca38450 100644
--- a/lib/x509/name_constraints.c
+++ b/lib/x509/name_constraints.c
@@ -242,7 +242,7 @@ static name_constraints_node_st* name_constraints_node_new(unsigned type,
* @_nc_excluded: Corresponding excluded name constraints list
*
* This function finds the intersection of @_nc and @_nc2. The result is placed in @_nc,
- * the original @_nc is deallocated. @_nc2 is not chenged. If necessary, a universal
+ * the original @_nc is deallocated. @_nc2 is not changed. If necessary, a universal
* excluded name constraint node of the right type is added to the list provided
* in @_nc_excluded.
*
diff --git a/lib/x509/ocsp.c b/lib/x509/ocsp.c
index db54b3ea22..a52c4aa428 100644
--- a/lib/x509/ocsp.c
+++ b/lib/x509/ocsp.c
@@ -2575,7 +2575,7 @@ time_t _gnutls_ocsp_get_validity(gnutls_ocsp_resp_t resp)
now = gnutls_time(0);
if (ntime == -1) {
- /* This is a problematic case, and there is no concensus on how
+ /* This is a problematic case, and there is no consensus on how
* to treat these responses. It doesn't contain the time after which
* the response is invalid, thus it is an OCSP response effectively
* valid forever defeating the purpose of OCSP. We set here the same
diff --git a/lib/x509/pkcs12.c b/lib/x509/pkcs12.c
index 1f5b4bdf88..447eb8e2c9 100644
--- a/lib/x509/pkcs12.c
+++ b/lib/x509/pkcs12.c
@@ -827,7 +827,7 @@ int gnutls_pkcs12_set_bag(gnutls_pkcs12_t pkcs12, gnutls_pkcs12_bag_t bag)
asn1_delete_structure(&safe_cont);
- /* Step 5. Reencode and copy the AuthenticatedSafe into the pkcs12
+ /* Step 5. Re-encode and copy the AuthenticatedSafe into the pkcs12
* structure.
*/
result =
diff --git a/lib/x509/time.c b/lib/x509/time.c
index 4d2b789268..2632a795a9 100644
--- a/lib/x509/time.c
+++ b/lib/x509/time.c
@@ -35,7 +35,7 @@
#include <common.h>
/* TIME functions
- * Convertions between generalized or UTC time to time_t
+ * Conversions between generalized or UTC time to time_t
*
*/
@@ -69,7 +69,7 @@ static const int MONTHDAYS[] = {
/*
** Given a struct tm representing a calendar time in UTC, convert it to
** seconds since epoch. Returns (time_t) -1 if the time is not
- ** convertable. Note that this function does not canonicalize the provided
+ ** convertible. Note that this function does not canonicalize the provided
** struct tm, nor does it allow out of range values or years before 1970.
*/
static time_t mktime_utc(const struct fake_tm *tm)
diff --git a/lib/x509/verify-high.c b/lib/x509/verify-high.c
index 7f640f1a13..5969b36146 100644
--- a/lib/x509/verify-high.c
+++ b/lib/x509/verify-high.c
@@ -1203,7 +1203,7 @@ gnutls_x509_trust_list_verify_crt(gnutls_x509_trust_list_t list,
/* This macro is introduced to detect a verification output
* which indicates an unknown signer, or a signer which uses
* an insecure algorithm (e.g., sha1), something that indicates
- * a superceded signer */
+ * a superseded signer */
#define SIGNER_OLD_OR_UNKNOWN(output) ((output & GNUTLS_CERT_SIGNER_NOT_FOUND) || (output & GNUTLS_CERT_INSECURE_ALGORITHM))
#define SIGNER_WAS_KNOWN(output) (!(output & GNUTLS_CERT_SIGNER_NOT_FOUND))
diff --git a/lib/x509/verify.c b/lib/x509/verify.c
index 58acf42b86..d4eafd4fdd 100644
--- a/lib/x509/verify.c
+++ b/lib/x509/verify.c
@@ -593,7 +593,7 @@ static int _gnutls_x509_verify_data(gnutls_sign_algorithm_t sign,
* trusted CAs.
*
* Returns only 0 or 1. If 1 it means that the certificate
- * was successfuly verified.
+ * was successfully verified.
*
* 'flags': an OR of the gnutls_certificate_verify_flags enumeration.
*
diff --git a/lib/x509/x509_ext.c b/lib/x509/x509_ext.c
index 58c3263d1e..8213c6e427 100644
--- a/lib/x509/x509_ext.c
+++ b/lib/x509/x509_ext.c
@@ -453,7 +453,7 @@ int gnutls_x509_ext_import_name_constraints(const gnutls_datum_t * ext,
*
* This function will convert the provided name constraints type to a
* DER-encoded PKIX NameConstraints (2.5.29.30) extension. The output data in
- * @ext will be allocated usin gnutls_malloc().
+ * @ext will be allocated using gnutls_malloc().
*
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a negative error value.
*
@@ -3136,7 +3136,7 @@ int gnutls_x509_ext_import_key_purposes(const gnutls_datum_t * ext,
*
* This function will convert the key purposes type to a
* DER-encoded PKIX ExtKeyUsageSyntax (2.5.29.37) extension. The output data in
- * @ext will be allocated usin gnutls_malloc().
+ * @ext will be allocated using gnutls_malloc().
*
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a negative error value.
*
diff --git a/lib/x509/x509_int.h b/lib/x509/x509_int.h
index bbd59d1547..c1bacc7b2a 100644
--- a/lib/x509/x509_int.h
+++ b/lib/x509/x509_int.h
@@ -313,7 +313,7 @@ _gnutls_x509_ext_extract_number(uint8_t * number,
size_t * nr_size,
uint8_t * extnValue, int extnValueLen);
int
-_gnutls_x509_ext_gen_number(const uint8_t * nuber, size_t nr_size,
+_gnutls_x509_ext_gen_number(const uint8_t * number, size_t nr_size,
gnutls_datum_t * der_ext);