Stack.
[openssl.git] / crypto / asn1 / asn1_lib.c
index 628b864015a4603903f5c88531aba70fffa9f19c..278b70973964dd2d675d473a0b1ac9550b17dabe 100644 (file)
 #include <openssl/asn1.h>
 #include <openssl/asn1_mac.h>
 
-#ifndef NOPROTO
 static int asn1_get_length(unsigned char **pp,int *inf,long *rl,int max);
 static void asn1_put_length(unsigned char **pp, int length);
-#else
-static int asn1_get_length();
-static void asn1_put_length();
-#endif
-
 const char *ASN1_version="ASN.1" OPENSSL_VERSION_PTEXT;
 
 int ASN1_check_infinite_end(unsigned char **p, long len)
@@ -98,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);
-       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;
@@ -192,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)
-               *(p++)=i|(tag&V_ASN1_PRIMATIVE_TAG);
+               *(p++)=i|(tag&V_ASN1_PRIMITIVE_TAG);
        else
                {
-               *(p++)=i|V_ASN1_PRIMATIVE_TAG;
+               *(p++)=i|V_ASN1_PRIMITIVE_TAG;
                while (tag > 0x7f)
                        {
                        *(p++)=(tag&0x7f)|0x80;