Security-58286.260.20.tar.gz

[apple/security.git] / OSX / libsecurity_asn1 / lib / secasn1e.c

diff --git a/OSX/libsecurity_asn1/lib/secasn1e.c b/OSX/libsecurity_asn1/lib/secasn1e.c
index 0dee92c61db2c28f8d0e54c421c677ac218a1838..e695972f30f0a4075a60c3940556a3eb123009c4 100644 (file)
--- a/OSX/libsecurity_asn1/lib/secasn1e.c
+++ b/OSX/libsecurity_asn1/lib/secasn1e.c
@@ -285,7 +285,7 @@ sec_asn1e_init_state_based_on_template (sec_asn1e_state *state)
                }
        
                subt = SEC_ASN1GetSubtemplate (state->theTemplate, state->src, PR_TRUE,
                }
        
                subt = SEC_ASN1GetSubtemplate (state->theTemplate, state->src, PR_TRUE,

-                       NULL /* __APPLE__ */);
+                       NULL /* __APPLE__ */, 0 /* __APPLE__ */);

                state = sec_asn1e_push_state (state->top, subt, src, PR_FALSE);
                if (state == NULL)
                        return NULL;
                state = sec_asn1e_push_state (state->top, subt, src, PR_FALSE);
                if (state == NULL)
                        return NULL;


@@ -575,7 +575,7 @@ sec_asn1e_contents_length (const SecAsn1Template *theTemplate, void *src,
        /* XXX any bits we want to disallow (PORT_Assert against) here? */
 
        theTemplate = SEC_ASN1GetSubtemplate (theTemplate, src, PR_TRUE,
        /* XXX any bits we want to disallow (PORT_Assert against) here? */
 
        theTemplate = SEC_ASN1GetSubtemplate (theTemplate, src, PR_TRUE,

-               NULL /* __APPLE__ */);
+               NULL /* __APPLE__ */, 0 /* __APPLE__ */);

 
        if (encode_kind & SEC_ASN1_POINTER) {
            /*
 
        if (encode_kind & SEC_ASN1_POINTER) {
            /*


@@ -677,7 +677,7 @@ sec_asn1e_contents_length (const SecAsn1Template *theTemplate, void *src,
                break;
 
            tmpt = SEC_ASN1GetSubtemplate (theTemplate, src, PR_TRUE,
                break;
 
            tmpt = SEC_ASN1GetSubtemplate (theTemplate, src, PR_TRUE,

-                       NULL /* __APPLE__ */);
+                       NULL /* __APPLE__ */, 0 /* __APPLE__ */);

 
            for (; *group != NULL; group++) {
                        sub_src = (char *)(*group) + tmpt->offset;
 
            for (; *group != NULL; group++) {
                        sub_src = (char *)(*group) + tmpt->offset;


@@ -884,7 +884,7 @@ sec_asn1e_write_header (sec_asn1e_state *state)
                                      SEC_ASN1GetSubtemplate(state->theTemplate,
                                                             state->src,
                                                             PR_TRUE,
                                      SEC_ASN1GetSubtemplate(state->theTemplate,
                                                             state->src,
                                                             PR_TRUE,

-                                                                NULL /* __APPLE__ */),
+                                                                NULL /* __APPLE__ */, 0 /* __APPLE__ */),

                                      state->src, PR_TRUE);
        if (state != NULL)
            state = sec_asn1e_init_state_based_on_template (state);
                                      state->src, PR_TRUE);
        if (state != NULL)
            state = sec_asn1e_init_state_based_on_template (state);


@@ -914,7 +914,7 @@ sec_asn1e_write_header (sec_asn1e_state *state)
            }
            state->place = duringGroup;
            subt = SEC_ASN1GetSubtemplate (state->theTemplate, state->src,
            }
            state->place = duringGroup;
            subt = SEC_ASN1GetSubtemplate (state->theTemplate, state->src,

-                                          PR_TRUE, NULL /* __APPLE__ */);
+                                          PR_TRUE, NULL /* __APPLE__ */, 0 /* __APPLE__ */);

            state = sec_asn1e_push_state (state->top, subt, *group, PR_TRUE);
            if (state != NULL)
                state = sec_asn1e_init_state_based_on_template (state);
            state = sec_asn1e_push_state (state->top, subt, *group, PR_TRUE);
            if (state != NULL)
                state = sec_asn1e_init_state_based_on_template (state);