Commit dd12df79 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Remove old style ASN.1 support. 



Remove old ASN.1 COMPAT type. This was meant as a temporary measure
so older ASN.1 code (from OpenSSL 0.9.6) still worked. It's a hack
which breaks constification and hopefully nothing uses it now, if
it ever did.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 4dcb4b91

crypto/asn1/asn1t.h

+0 −34
Original line number Diff line number Diff line
@@ -597,10 +597,6 @@ struct ASN1_ITEM_st { 
 * The 'funcs' field is used for application

 * specific functions.

 *

 * For COMPAT types the funcs field gives a

 * set of functions that handle this type, this

 * supports the old d2i, i2d convention.

 *

 * The EXTERN type uses a new style d2i/i2d.

 * The new style should be used where possible

 * because it avoids things like the d2i IMPLICIT
@@ -625,8 +621,6 @@ struct ASN1_ITEM_st { 


# define ASN1_ITYPE_CHOICE               0x2



# define ASN1_ITYPE_COMPAT               0x3



# define ASN1_ITYPE_EXTERN               0x4



# define ASN1_ITYPE_MSTRING              0x5
@@ -677,13 +671,6 @@ typedef int ASN1_primitive_print(BIO *out, ASN1_VALUE **pval, 
                                 const ASN1_ITEM *it, int indent,

                                 const ASN1_PCTX *pctx);



typedef struct ASN1_COMPAT_FUNCS_st {

    ASN1_new_func *asn1_new;

    ASN1_free_func *asn1_free;

    ASN1_d2i_func *asn1_d2i;

    ASN1_i2d_func *asn1_i2d;

} ASN1_COMPAT_FUNCS;



typedef struct ASN1_EXTERN_FUNCS_st {

    void *app_data;

    ASN1_ex_new_func *asn1_ex_new;
@@ -786,27 +773,6 @@ typedef struct ASN1_STREAM_ARG_st { 
                                        ASN1_ITYPE_MSTRING, mask, NULL, 0, NULL, sizeof(ASN1_STRING), #itname \

                                ASN1_ITEM_end(itname)



/* Macro to implement an ASN1_ITEM in terms of old style funcs */



# define IMPLEMENT_COMPAT_ASN1(sname) IMPLEMENT_COMPAT_ASN1_type(sname, V_ASN1_SEQUENCE)



# define IMPLEMENT_COMPAT_ASN1_type(sname, tag) \

        static const ASN1_COMPAT_FUNCS sname##_ff = { \

                (ASN1_new_func *)sname##_new, \

                (ASN1_free_func *)sname##_free, \

                (ASN1_d2i_func *)d2i_##sname, \

                (ASN1_i2d_func *)i2d_##sname, \

        }; \

        ASN1_ITEM_start(sname) \

                ASN1_ITYPE_COMPAT, \

                tag, \

                NULL, \

                0, \

                &sname##_ff, \

                0, \

                #sname \

        ASN1_ITEM_end(sname)



# define IMPLEMENT_EXTERN_ASN1(sname, tag, fptrs) \

        ASN1_ITEM_start(sname) \

                ASN1_ITYPE_EXTERN, \

crypto/asn1/tasn_dec.c

+2 −64
Original line number Diff line number Diff line
@@ -167,19 +167,17 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len, 
                     int tag, int aclass, char opt, ASN1_TLC *ctx)

{

    const ASN1_TEMPLATE *tt, *errtt = NULL;

    const ASN1_COMPAT_FUNCS *cf;

    const ASN1_EXTERN_FUNCS *ef;

    const ASN1_AUX *aux = it->funcs;

    ASN1_aux_cb *asn1_cb;

    const unsigned char *p = NULL, *q;

    unsigned char *wp = NULL;   /* BIG FAT WARNING! BREAKS CONST WHERE USED */

    unsigned char imphack = 0, oclass;

    unsigned char oclass;

    char seq_eoc, seq_nolen, cst, isopt;

    long tmplen;

    int i;

    int otag;

    int ret = 0;

    ASN1_VALUE **pchptr, *ptmpval;

    ASN1_VALUE **pchptr;

    if (!pval)

        return 0;

    if (aux && aux->asn1_cb)
@@ -240,66 +238,6 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len, 
        ef = it->funcs;

        return ef->asn1_ex_d2i(pval, in, len, it, tag, aclass, opt, ctx);



    case ASN1_ITYPE_COMPAT:

        /* we must resort to old style evil hackery */

        cf = it->funcs;



        /* If OPTIONAL see if it is there */

        if (opt) {

            int exptag;

            p = *in;

            if (tag == -1)

                exptag = it->utype;

            else

                exptag = tag;

            /*

             * Don't care about anything other than presence of expected tag

             */



            ret = asn1_check_tlen(NULL, NULL, NULL, NULL, NULL,

                                  &p, len, exptag, aclass, 1, ctx);

            if (!ret) {

                ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ERR_R_NESTED_ASN1_ERROR);

                goto err;

            }

            if (ret == -1)

                return -1;

        }



        /*

         * This is the old style evil hack IMPLICIT handling: since the

         * underlying code is expecting a tag and class other than the one

         * present we change the buffer temporarily then change it back

         * afterwards. This doesn't and never did work for tags > 30. Yes

         * this is *horrible* but it is only needed for old style d2i which

         * will hopefully not be around for much longer. FIXME: should copy

         * the buffer then modify it so the input buffer can be const: we

         * should *always* copy because the old style d2i might modify the

         * buffer.

         */



        if (tag != -1) {

            wp = *(unsigned char **)in;

            imphack = *wp;

            if (p == NULL) {

                ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ERR_R_NESTED_ASN1_ERROR);

                goto err;

            }

            *wp = (unsigned char)((*p & V_ASN1_CONSTRUCTED)

                                  | it->utype);

        }



        ptmpval = cf->asn1_d2i(pval, in, len);



        if (tag != -1)

            *wp = imphack;



        if (ptmpval)

            return 1;



        ASN1err(ASN1_F_ASN1_ITEM_EX_D2I, ERR_R_NESTED_ASN1_ERROR);

        goto err;



    case ASN1_ITYPE_CHOICE:

        if (asn1_cb && !asn1_cb(ASN1_OP_D2I_PRE, pval, it, NULL))

            goto auxerr;

crypto/asn1/tasn_enc.c

+0 −16
Original line number Diff line number Diff line
@@ -127,9 +127,7 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out, 
                     const ASN1_ITEM *it, int tag, int aclass)

{

    const ASN1_TEMPLATE *tt = NULL;

    unsigned char *p = NULL;

    int i, seqcontlen, seqlen, ndef = 1;

    const ASN1_COMPAT_FUNCS *cf;

    const ASN1_EXTERN_FUNCS *ef;

    const ASN1_AUX *aux = it->funcs;

    ASN1_aux_cb *asn1_cb = 0;
@@ -172,20 +170,6 @@ int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out, 
        ef = it->funcs;

        return ef->asn1_ex_i2d(pval, out, it, tag, aclass);



    case ASN1_ITYPE_COMPAT:

        /* old style hackery... */

        cf = it->funcs;

        if (out)

            p = *out;

        i = cf->asn1_i2d(*pval, out);

        /*

         * Fixup for IMPLICIT tag: note this messes up for tags > 30, but so

         * did the old code. Tags > 30 are very rare anyway.

         */

        if (out && (tag != -1))

            *p = aclass | tag | (*p & V_ASN1_CONSTRUCTED);

        return i;



    case ASN1_ITYPE_NDEF_SEQUENCE:

        /* Use indefinite length constructed if requested */

        if (aclass & ASN1_TFLG_NDEF)

crypto/asn1/tasn_fre.c

+0 −7
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, 
{

    const ASN1_TEMPLATE *tt = NULL, *seqtt;

    const ASN1_EXTERN_FUNCS *ef;

    const ASN1_COMPAT_FUNCS *cf;

    const ASN1_AUX *aux = it->funcs;

    ASN1_aux_cb *asn1_cb;

    int i;
@@ -129,12 +128,6 @@ static void asn1_item_combine_free(ASN1_VALUE **pval, const ASN1_ITEM *it, 
        }

        break;



    case ASN1_ITYPE_COMPAT:

        cf = it->funcs;

        if (cf && cf->asn1_free)

            cf->asn1_free(*pval);

        break;



    case ASN1_ITYPE_EXTERN:

        ef = it->funcs;

        if (ef && ef->asn1_ex_free)

crypto/asn1/tasn_new.c

+0 −11
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, 
                                    int combine)

{

    const ASN1_TEMPLATE *tt = NULL;

    const ASN1_COMPAT_FUNCS *cf;

    const ASN1_EXTERN_FUNCS *ef;

    const ASN1_AUX *aux = it->funcs;

    ASN1_aux_cb *asn1_cb;
@@ -118,15 +117,6 @@ static int asn1_item_ex_combine_new(ASN1_VALUE **pval, const ASN1_ITEM *it, 
        }

        break;



    case ASN1_ITYPE_COMPAT:

        cf = it->funcs;

        if (cf && cf->asn1_new) {

            *pval = cf->asn1_new();

            if (!*pval)

                goto memerr;

        }

        break;



    case ASN1_ITYPE_PRIMITIVE:

        if (it->templates) {

            if (!ASN1_template_new(pval, it->templates))
@@ -245,7 +235,6 @@ static void asn1_item_clear(ASN1_VALUE **pval, const ASN1_ITEM *it) 
        asn1_primitive_clear(pval, it);

        break;



    case ASN1_ITYPE_COMPAT:

    case ASN1_ITYPE_CHOICE:

    case ASN1_ITYPE_SEQUENCE:

    case ASN1_ITYPE_NDEF_SEQUENCE: