Spelling error.

diff --git a/crypto/asn1/a_bytes.c b/crypto/asn1/a_bytes.c
index de74e8a629a8430d01a982fa57fe394f3c36118e..e452e03b88f84cf6ef6533f17a685def3e28ffe9 100644 (file)
--- a/crypto/asn1/a_bytes.c
+++ b/crypto/asn1/a_bytes.c
@@ -314,7 +314,7 @@ static int asn1_collate_primative(ASN1_STRING *a, ASN1_CTX *c)
        if (os != NULL) ASN1_STRING_free(os);
        return(1);
 err:
        if (os != NULL) ASN1_STRING_free(os);
        return(1);
 err:

-       ASN1err(ASN1_F_ASN1_COLLATE_PRIMATIVE,c->error);
+       ASN1err(ASN1_F_ASN1_COLLATE_PRIMITIVE,c->error);

        if (os != NULL) ASN1_STRING_free(os);
        if (b.data != NULL) Free(b.data);
        return(0);
        if (os != NULL) ASN1_STRING_free(os);
        if (b.data != NULL) Free(b.data);
        return(0);

diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index a0a3130eff961751b7c920bec056f4d5d0159609..3de083984e56de4dc673bfee6dd009a0b1eca91c 100644 (file)
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -74,6 +74,7 @@ extern "C" {
 #define V_ASN1_PRIVATE                 0xc0
 
 #define V_ASN1_CONSTRUCTED             0x20
 #define V_ASN1_PRIVATE                 0xc0
 
 #define V_ASN1_CONSTRUCTED             0x20

+#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_PRIMATIVE_TAG           0x1f
 
 #define V_ASN1_APP_CHOOSE              -2      /* let the recipent choose */


@@ -695,7 +696,7 @@ ASN1_STRING *ASN1_pack_string(char *obj, int (*i2d)(), ASN1_OCTET_STRING **oct);
 #define ASN1_F_A2I_ASN1_ENUMERATED                      236
 #define ASN1_F_A2I_ASN1_INTEGER                                 101
 #define ASN1_F_A2I_ASN1_STRING                          102
 #define ASN1_F_A2I_ASN1_ENUMERATED                      236
 #define ASN1_F_A2I_ASN1_INTEGER                                 101
 #define ASN1_F_A2I_ASN1_STRING                          102

-#define ASN1_F_ASN1_COLLATE_PRIMATIVE                   103
+#define ASN1_F_ASN1_COLLATE_PRIMITIVE                   103

 #define ASN1_F_ASN1_D2I_BIO                             104
 #define ASN1_F_ASN1_D2I_FP                              105
 #define ASN1_F_ASN1_DUP                                         106
 #define ASN1_F_ASN1_D2I_BIO                             104
 #define ASN1_F_ASN1_D2I_FP                              105
 #define ASN1_F_ASN1_DUP                                         106

diff --git a/crypto/asn1/asn1_err.c b/crypto/asn1/asn1_err.c
index fbf73fb6da5b0c0939e06a198e78706dc9e1f9d9..cc0431b994684eaf83b9bc56820c8cd99a2c9aa2 100644 (file)
--- a/crypto/asn1/asn1_err.c
+++ b/crypto/asn1/asn1_err.c
@@ -69,7 +69,7 @@ static ERR_STRING_DATA ASN1_str_functs[]=
 {ERR_PACK(0,ASN1_F_A2I_ASN1_ENUMERATED,0),     "a2i_ASN1_ENUMERATED"},
 {ERR_PACK(0,ASN1_F_A2I_ASN1_INTEGER,0),        "a2i_ASN1_INTEGER"},
 {ERR_PACK(0,ASN1_F_A2I_ASN1_STRING,0), "a2i_ASN1_STRING"},
 {ERR_PACK(0,ASN1_F_A2I_ASN1_ENUMERATED,0),     "a2i_ASN1_ENUMERATED"},
 {ERR_PACK(0,ASN1_F_A2I_ASN1_INTEGER,0),        "a2i_ASN1_INTEGER"},
 {ERR_PACK(0,ASN1_F_A2I_ASN1_STRING,0), "a2i_ASN1_STRING"},

-{ERR_PACK(0,ASN1_F_ASN1_COLLATE_PRIMATIVE,0),  "ASN1_COLLATE_PRIMATIVE"},
+{ERR_PACK(0,ASN1_F_ASN1_COLLATE_PRIMITIVE,0),  "ASN1_COLLATE_PRIMITIVE"},

 {ERR_PACK(0,ASN1_F_ASN1_D2I_BIO,0),    "ASN1_d2i_bio"},
 {ERR_PACK(0,ASN1_F_ASN1_D2I_FP,0),     "ASN1_d2i_fp"},
 {ERR_PACK(0,ASN1_F_ASN1_DUP,0),        "ASN1_dup"},
 {ERR_PACK(0,ASN1_F_ASN1_D2I_BIO,0),    "ASN1_d2i_bio"},
 {ERR_PACK(0,ASN1_F_ASN1_D2I_FP,0),     "ASN1_d2i_fp"},
 {ERR_PACK(0,ASN1_F_ASN1_DUP,0),        "ASN1_dup"},

diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c
index 7fd9f53b0ea632e7caf5e0a0c90935e735d0f39c..278b70973964dd2d675d473a0b1ac9550b17dabe 100644 (file)
--- a/crypto/asn1/asn1_lib.c
+++ b/crypto/asn1/asn1_lib.c
@@ -92,8 +92,8 @@ int ASN1_get_object(unsigned char **pp, long *plength, int *ptag, int *pclass,
        if (!max) goto err;
        ret=(*p&V_ASN1_CONSTRUCTED);
        xclass=(*p&V_ASN1_PRIVATE);
        if (!max) goto err;
        ret=(*p&V_ASN1_CONSTRUCTED);
        xclass=(*p&V_ASN1_PRIVATE);

-       i= *p&V_ASN1_PRIMATIVE_TAG;
-       if (i == V_ASN1_PRIMATIVE_TAG)
+       i= *p&V_ASN1_PRIMITIVE_TAG;
+       if (i == V_ASN1_PRIMITIVE_TAG)

                {               /* high-tag */
                p++;
                if (--max == 0) goto err;
                {               /* high-tag */
                p++;
                if (--max == 0) goto err;


@@ -186,10 +186,10 @@ void ASN1_put_object(unsigned char **pp, int constructed, int length, int tag,
        i=(constructed)?V_ASN1_CONSTRUCTED:0;
        i|=(xclass&V_ASN1_PRIVATE);
        if (tag < 31)
        i=(constructed)?V_ASN1_CONSTRUCTED:0;
        i|=(xclass&V_ASN1_PRIVATE);
        if (tag < 31)

-               *(p++)=i|(tag&V_ASN1_PRIMATIVE_TAG);
+               *(p++)=i|(tag&V_ASN1_PRIMITIVE_TAG);

        else
                {
        else
                {

-               *(p++)=i|V_ASN1_PRIMATIVE_TAG;
+               *(p++)=i|V_ASN1_PRIMITIVE_TAG;

                while (tag > 0x7f)
                        {
                        *(p++)=(tag&0x7f)|0x80;
                while (tag > 0x7f)
                        {
                        *(p++)=(tag&0x7f)|0x80;