Use util/mklink.pl instead of util/mklink.sh.

[oweals/openssl.git] / crypto / asn1 / asn1_mac.h

diff --git a/crypto/asn1/asn1_mac.h b/crypto/asn1/asn1_mac.h
index 834ed58f74c0f0106bc52ac4ebae76380e3f44b5..049780559009cdc11b78ce27dbc9d82643960700 100644 (file)
--- a/crypto/asn1/asn1_mac.h
+++ b/crypto/asn1/asn1_mac.h
@@ -63,9 +63,9 @@
 extern "C" {
 #endif
 
-#include "asn1.h"
-#include "x509.h"
-#include "pkcs7.h"
+#include <openssl/asn1.h>
+#include <openssl/x509.h>
+#include <openssl/pkcs7.h>
 
 #ifndef ASN1_MAC_ERR_LIB
 #define ASN1_MAC_ERR_LIB       ERR_LIB_ASN1
@@ -134,15 +134,20 @@ err:\
                M_ASN1_D2I_get(b,func); \
                }
 
+#define M_ASN1_D2I_get_imp(b,func, type) \
+       M_ASN1_next=(_tmp& V_ASN1_CONSTRUCTED)|type; \
+       c.q=c.p; \
+       if (func(&(b),&c.p,c.slen) == NULL) \
+               {c.line=__LINE__; M_ASN1_next_prev = _tmp; goto err; } \
+       c.slen-=(c.p-c.q);\
+       M_ASN1_next_prev=_tmp;
+
 #define M_ASN1_D2I_get_IMP_opt(b,func,tag,type) \
        if ((c.slen != 0) && ((M_ASN1_next & (~V_ASN1_CONSTRUCTED)) == \
                (V_ASN1_CONTEXT_SPECIFIC|(tag)))) \
                { \
-               unsigned char tmp; \
-               tmp=M_ASN1_next; \
-               M_ASN1_next=(tmp& ~V_ASN1_PRIMATIVE_TAG)|type; \
-               M_ASN1_D2I_get(b,func); \
-               M_ASN1_next_prev=tmp; \
+               unsigned char _tmp = M_ASN1_next; \
+               M_ASN1_D2I_get_imp(b,func, type);\
                }
 
 #define M_ASN1_D2I_get_set(r,func,free_func) \
@@ -175,10 +180,23 @@ err:\
                        tag,V_ASN1_CONTEXT_SPECIFIC); \
                }
 
+#define M_ASN1_D2I_get_IMP_set_opt_type(type,b,func,free_func,tag) \
+       if ((c.slen != 0) && \
+               (M_ASN1_next == \
+               (V_ASN1_CONTEXT_SPECIFIC|V_ASN1_CONSTRUCTED|(tag))))\
+               { \
+               M_ASN1_D2I_get_imp_set_type(type,b,func,free_func,\
+                       tag,V_ASN1_CONTEXT_SPECIFIC); \
+               }
+
 #define M_ASN1_D2I_get_seq(r,func,free_func) \
                M_ASN1_D2I_get_imp_set(r,func,free_func,\
                        V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
 
+#define M_ASN1_D2I_get_seq_type(type,r,func,free_func) \
+               M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,\
+                                           V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL)
+
 #define M_ASN1_D2I_get_seq_opt(r,func,free_func) \
        if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
                V_ASN1_CONSTRUCTED|V_ASN1_SEQUENCE)))\
@@ -195,6 +213,13 @@ err:\
                { c.line=__LINE__; goto err; } \
        c.slen-=(c.p-c.q);
 
+#define M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,a,b) \
+       c.q=c.p; \
+       if (d2i_ASN1_SET_OF_##type(&(r),&c.p,c.slen,func,\
+                                  free_func,a,b) == NULL) \
+               { c.line=__LINE__; goto err; } \
+       c.slen-=(c.p-c.q);
+
 #define M_ASN1_D2I_get_set_strings(r,func,a,b) \
        c.q=c.p; \
        if (d2i_ASN1_STRING_SET(&(r),&c.p,c.slen,a,b) == NULL) \
@@ -213,8 +238,16 @@ err:\
                if (Tinf & 0x80) \
                        { c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \
                        c.line=__LINE__; goto err; } \
+               if (Tinf == (V_ASN1_CONSTRUCTED+1)) \
+                                       Tlen = c.slen - (c.p - c.q) - 2; \
                if (func(&(r),&c.p,Tlen) == NULL) \
                        { c.line=__LINE__; goto err; } \
+               if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \
+                       Tlen = c.slen - (c.p - c.q); \
+                       if(!ASN1_check_infinite_end(&c.p, Tlen)) \
+                               { c.error=ERR_R_MISSING_ASN1_EOS; \
+                               c.line=__LINE__; goto err; } \
+               }\
                c.slen-=(c.p-c.q); \
                }
 
@@ -230,10 +263,18 @@ err:\
                if (Tinf & 0x80) \
                        { c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \
                        c.line=__LINE__; goto err; } \
+               if (Tinf == (V_ASN1_CONSTRUCTED+1)) \
+                                       Tlen = c.slen - (c.p - c.q) - 2; \
                if (d2i_ASN1_SET(&(r),&c.p,Tlen,(char *(*)())func, \
                        (void (*)())free_func, \
                        b,V_ASN1_UNIVERSAL) == NULL) \
                        { c.line=__LINE__; goto err; } \
+               if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \
+                       Tlen = c.slen - (c.p - c.q); \
+                       if(!ASN1_check_infinite_end(&c.p, Tlen)) \
+                               { c.error=ERR_R_MISSING_ASN1_EOS; \
+                               c.line=__LINE__; goto err; } \
+               }\
                c.slen-=(c.p-c.q); \
                }
 
@@ -272,6 +313,10 @@ err:\
                ret+=i2d_ASN1_SET(a,NULL,f,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL, \
                                  IS_SEQUENCE);
 
+#define M_ASN1_I2D_len_SEQUENCE_type(type,a,f) \
+               ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,V_ASN1_SEQUENCE, \
+                                           V_ASN1_UNIVERSAL,IS_SEQUENCE)
+
 #define M_ASN1_I2D_len_SEQUENCE_opt(a,f) \
                if ((a != NULL) && (sk_num(a) != 0)) \
                        M_ASN1_I2D_len_SEQUENCE(a,f);
@@ -293,6 +338,12 @@ err:\
                        ret+=i2d_ASN1_SET(a,NULL,f,x,V_ASN1_CONTEXT_SPECIFIC, \
                                          IS_SEQUENCE);
 
+#define M_ASN1_I2D_len_IMP_SEQUENCE_opt_type(type,a,f,x) \
+               if ((a != NULL) && (sk_##type##_num(a) != 0)) \
+                       ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,x, \
+                                                   V_ASN1_CONTEXT_SPECIFIC, \
+                                                   IS_SEQUENCE);
+
 #define M_ASN1_I2D_len_EXP_opt(a,f,mtag,v) \
                if (a != NULL)\
                        { \
@@ -336,6 +387,10 @@ err:\
 #define M_ASN1_I2D_put_SEQUENCE(a,f) i2d_ASN1_SET(a,&p,f,V_ASN1_SEQUENCE,\
                                             V_ASN1_UNIVERSAL,IS_SEQUENCE)
 
+#define M_ASN1_I2D_put_SEQUENCE_type(type,a,f) \
+     i2d_ASN1_SET_OF_##type(a,&p,f,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL, \
+                           IS_SEQUENCE)
+
 #define M_ASN1_I2D_put_SEQUENCE_opt(a,f) \
                if ((a != NULL) && (sk_num(a) != 0)) \
                        M_ASN1_I2D_put_SEQUENCE(a,f);
@@ -350,6 +405,12 @@ err:\
                        { i2d_ASN1_SET(a,&p,f,x,V_ASN1_CONTEXT_SPECIFIC, \
                                       IS_SEQUENCE); }
 
+#define M_ASN1_I2D_put_IMP_SEQUENCE_opt_type(type,a,f,x) \
+               if ((a != NULL) && (sk_##type##_num(a) != 0)) \
+                       { i2d_ASN1_SET_OF_##type(a,&p,f,x, \
+                                                V_ASN1_CONTEXT_SPECIFIC, \
+                                                IS_SEQUENCE); }
+
 #define M_ASN1_I2D_put_EXP_opt(a,f,tag,v) \
                if (a != NULL) \
                        { \
@@ -386,14 +447,8 @@ err:\
 #define M_ASN1_I2D_finish()    *pp=p; \
                                return(r);
 
-#ifndef NOPROTO
 int asn1_GetSequence(ASN1_CTX *c, long *length);
 void asn1_add_error(unsigned char *address,int offset);
-#else 
-int asn1_GetSequence();
-void asn1_add_error();
-#endif
-
 #ifdef  __cplusplus
 }
 #endif