diff options
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/a_bytes.c | 10 | ||||
| -rw-r--r-- | crypto/asn1/a_null.c | 2 | ||||
| -rw-r--r-- | crypto/asn1/a_object.c | 2 | ||||
| -rw-r--r-- | crypto/asn1/a_sign.c | 2 | ||||
| -rw-r--r-- | crypto/asn1/asn1.h | 4 | ||||
| -rw-r--r-- | crypto/asn1/asn1_lib.c | 4 | ||||
| -rw-r--r-- | crypto/asn1/d2i_pr.c | 2 | ||||
| -rw-r--r-- | crypto/asn1/t_pkey.c | 2 | ||||
| -rw-r--r-- | crypto/asn1/x_req.c | 6 | ||||
| -rw-r--r-- | crypto/asn1/x_spki.c | 2 |
10 files changed, 18 insertions, 18 deletions
diff --git a/crypto/asn1/a_bytes.c b/crypto/asn1/a_bytes.c index 47a88aa952..8cde695804 100644 --- a/crypto/asn1/a_bytes.c +++ b/crypto/asn1/a_bytes.c @@ -71,7 +71,7 @@ B_ASN1_T61STRING,B_ASN1_VIDEOTEXSTRING,B_ASN1_IA5STRING,0, B_ASN1_UNIVERSALSTRING,B_ASN1_UNKNOWN,B_ASN1_BMPSTRING,B_ASN1_UNKNOWN, }; -static int asn1_collate_primative(ASN1_STRING *a, ASN1_CTX *c); +static int asn1_collate_primitive(ASN1_STRING *a, ASN1_CTX *c); /* type is a 'bitmap' of acceptable string types. */ ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a, unsigned char **pp, @@ -205,7 +205,7 @@ ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, unsigned char **pp, long length, c.tag=Ptag; c.xclass=Pclass; c.max=(length == 0)?0:(p+length); - if (!asn1_collate_primative(ret,&c)) + if (!asn1_collate_primitive(ret,&c)) goto err; else { @@ -254,11 +254,11 @@ err: } -/* We are about to parse 0..n d2i_ASN1_bytes objects, we are to collapes - * them into the one struture that is then returned */ +/* We are about to parse 0..n d2i_ASN1_bytes objects, we are to collapse + * them into the one structure that is then returned */ /* There have been a few bug fixes for this function from * Paul Keogh <paul.keogh@sse.ie>, many thanks to him */ -static int asn1_collate_primative(ASN1_STRING *a, ASN1_CTX *c) +static int asn1_collate_primitive(ASN1_STRING *a, ASN1_CTX *c) { ASN1_STRING *os=NULL; BUF_MEM b; diff --git a/crypto/asn1/a_null.c b/crypto/asn1/a_null.c index 3eb4f7939d..119fd784be 100644 --- a/crypto/asn1/a_null.c +++ b/crypto/asn1/a_null.c @@ -60,7 +60,7 @@ #include "cryptlib.h" #include <openssl/asn1.h> -/* ASN1 functions for NULL type. For compatability with other ASN1 code +/* ASN1 functions for NULL type. For compatibility with other ASN1 code * it returns a pointer to an "ASN1_NULL" structure. The new/free functions * don't need to do any allocating because nothing is stored in a NULL. */ diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c index 4812724a15..09d56fb669 100644 --- a/crypto/asn1/a_object.c +++ b/crypto/asn1/a_object.c @@ -269,7 +269,7 @@ void ASN1_OBJECT_free(ASN1_OBJECT *a) if (a == NULL) return; if (a->flags & ASN1_OBJECT_FLAG_DYNAMIC_STRINGS) { -#ifndef CONST_STRICT /* disable purely for compile-time strict const checking. Doing this on a "real" compile will cause mempory leaks */ +#ifndef CONST_STRICT /* disable purely for compile-time strict const checking. Doing this on a "real" compile will cause memory leaks */ if (a->sn != NULL) Free((void *)a->sn); if (a->ln != NULL) Free((void *)a->ln); #endif diff --git a/crypto/asn1/a_sign.c b/crypto/asn1/a_sign.c index e9c41e3d20..cfb4bca4f1 100644 --- a/crypto/asn1/a_sign.c +++ b/crypto/asn1/a_sign.c @@ -133,7 +133,7 @@ int ASN1_sign(int (*i2d)(), X509_ALGOR *algor1, X509_ALGOR *algor2, signature->data=buf_out; buf_out=NULL; signature->length=outl; - /* In the interests of compatability, I'll make sure that + /* In the interests of compatibility, I'll make sure that * the bit string has a 'not-used bits' value of 0 */ signature->flags&= ~(ASN1_STRING_FLAG_BITS_LEFT|0x07); diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index cebbcd3737..da41317fc9 100644 --- a/crypto/asn1/asn1.h +++ b/crypto/asn1/asn1.h @@ -81,7 +81,7 @@ extern "C" { #define V_ASN1_PRIMITIVE_TAG 0x1f #define V_ASN1_PRIMATIVE_TAG 0x1f -#define V_ASN1_APP_CHOOSE -2 /* let the recipent choose */ +#define V_ASN1_APP_CHOOSE -2 /* let the recipient choose */ #define V_ASN1_UNDEF -1 #define V_ASN1_EOC 0 @@ -176,7 +176,7 @@ typedef struct asn1_ctx_st int tag; /* tag from last 'get object' */ int xclass; /* class from last 'get object' */ long slen; /* length of last 'get object' */ - unsigned char *max; /* largest value of p alowed */ + unsigned char *max; /* largest value of p allowed */ unsigned char *q;/* temporary variable */ unsigned char **pp;/* variable */ int line; /* used in error processing */ diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c index 65eaa96c14..e84dd5f34b 100644 --- a/crypto/asn1/asn1_lib.c +++ b/crypto/asn1/asn1_lib.c @@ -176,7 +176,7 @@ static int asn1_get_length(unsigned char **pp, int *inf, long *rl, int max) } /* class 0 is constructed - * constructed == 2 for indefinitle length constructed */ + * constructed == 2 for indefinite length constructed */ void ASN1_put_object(unsigned char **pp, int constructed, int length, int tag, int xclass) { @@ -349,7 +349,7 @@ int ASN1_STRING_set(ASN1_STRING *str, const void *_data, int len) if (data != NULL) { memcpy(str->data,data,len); - /* an alowance for strings :-) */ + /* an allowance for strings :-) */ str->data[len]='\0'; } return(1); diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c index 7ae87819de..c92b8325d8 100644 --- a/crypto/asn1/d2i_pr.c +++ b/crypto/asn1/d2i_pr.c @@ -122,7 +122,7 @@ EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, unsigned char **pp, int keytype; p = *pp; /* Dirty trick: read in the ASN1 data into a STACK_OF(ASN1_TYPE): - * by analysing it we can determine the passed structure: this + * by analyzing it we can determine the passed structure: this * assumes the input is surrounded by an ASN1 SEQUENCE. */ inkey = d2i_ASN1_SET_OF_ASN1_TYPE(NULL, &p, length, d2i_ASN1_TYPE, diff --git a/crypto/asn1/t_pkey.c b/crypto/asn1/t_pkey.c index 43ff4f73c2..e570ed1c47 100644 --- a/crypto/asn1/t_pkey.c +++ b/crypto/asn1/t_pkey.c @@ -298,7 +298,7 @@ int DHparams_print(BIO *bp, DH *x) if (!print(bp,"generator:",x->g,m,4)) goto err; if (x->length != 0) { - if (BIO_printf(bp," recomented-private-length: %d bits\n", + if (BIO_printf(bp," recommended-private-length: %d bits\n", (int)x->length) <= 0) goto err; } ret=1; diff --git a/crypto/asn1/x_req.c b/crypto/asn1/x_req.c index c170b02274..0cd572ee73 100644 --- a/crypto/asn1/x_req.c +++ b/crypto/asn1/x_req.c @@ -73,7 +73,7 @@ int i2d_X509_REQ_INFO(X509_REQ_INFO *a, unsigned char **pp) * allow some CA Software to accept the cert request. * It is not following the PKCS standards ... * PKCS#10 pg 5 - * attributes [0] IMPLICIT Attibutes + * attributes [0] IMPLICIT Attributes * NOTE: no OPTIONAL ... so it *must* be there */ if (a->req_kludge) @@ -94,7 +94,7 @@ int i2d_X509_REQ_INFO(X509_REQ_INFO *a, unsigned char **pp) /* this is a *nasty* hack reported to be required by some CA's. * It is not following the PKCS standards ... * PKCS#10 pg 5 - * attributes [0] IMPLICIT Attibutes + * attributes [0] IMPLICIT Attributes * NOTE: no OPTIONAL ... so it *must* be there */ if (a->req_kludge) @@ -126,7 +126,7 @@ X509_REQ_INFO *d2i_X509_REQ_INFO(X509_REQ_INFO **a, unsigned char **pp, * have been reported as requiring it. * It is not following the PKCS standards ... * PKCS#10 pg 5 - * attributes [0] IMPLICIT Attibutes + * attributes [0] IMPLICIT Attributes * NOTE: no OPTIONAL ... so it *must* be there */ if (asn1_Finish(&c)) diff --git a/crypto/asn1/x_spki.c b/crypto/asn1/x_spki.c index c1d8fce71c..8f5e7e6380 100644 --- a/crypto/asn1/x_spki.c +++ b/crypto/asn1/x_spki.c @@ -57,7 +57,7 @@ */ /* This module was send to me my Pat Richards <patr@x509.com> who - * wrote it. It is under my Copyright with his permision + * wrote it. It is under my Copyright with his permission */ #include <stdio.h> |