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

Remove {i2d,d2i}_ASN1_BOOLEAN 



Remove {i2d,d2i}_ASN1_BOOLEAN.

Rewrite single occurrence of d2i_ASN1_BOOLEAN in asn1_parse2

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent f422a514

crypto/asn1/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ LIBSRC= a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \ 
	tasn_new.c tasn_fre.c tasn_enc.c tasn_dec.c tasn_utl.c tasn_typ.c \

	tasn_prn.c tasn_scn.c ameth_lib.c \

	f_int.c f_string.c n_pkey.c \

	f_enum.c x_pkey.c a_bool.c x_exten.c bio_asn1.c bio_ndef.c asn_mime.c \

	f_enum.c x_pkey.c x_exten.c bio_asn1.c bio_ndef.c asn_mime.c \

	asn1_gen.c asn1_par.c asn1_lib.c asn1_err.c a_strnid.c \

	evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c asn_moid.c \

	asn_mstbl.c
@@ -41,7 +41,7 @@ LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \ 
	tasn_new.o tasn_fre.o tasn_enc.o tasn_dec.o tasn_utl.o tasn_typ.o \

	tasn_prn.o tasn_scn.o ameth_lib.o \

	f_int.o f_string.o n_pkey.o \

	f_enum.o x_pkey.o a_bool.o x_exten.o bio_asn1.o bio_ndef.o asn_mime.o \

	f_enum.o x_pkey.o x_exten.o bio_asn1.o bio_ndef.o asn_mime.o \

	asn1_gen.o asn1_par.o asn1_lib.o asn1_err.o a_strnid.o \

	evp_asn1.o asn_pack.o p5_pbe.o p5_pbev2.o p8_pkey.o asn_moid.o \

	asn_mstbl.o

crypto/asn1/a_bool.c

deleted100644 → 0
+0 −111
Original line number Diff line number Diff line 
/* crypto/asn1/a_bool.c */

/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

 * All rights reserved.

 *

 * This package is an SSL implementation written

 * by Eric Young (eay@cryptsoft.com).

 * The implementation was written so as to conform with Netscapes SSL.

 *

 * This library is free for commercial and non-commercial use as long as

 * the following conditions are aheared to.  The following conditions

 * apply to all code found in this distribution, be it the RC4, RSA,

 * lhash, DES, etc., code; not just the SSL code.  The SSL documentation

 * included with this distribution is covered by the same copyright terms

 * except that the holder is Tim Hudson (tjh@cryptsoft.com).

 *

 * Copyright remains Eric Young's, and as such any Copyright notices in

 * the code are not to be removed.

 * If this package is used in a product, Eric Young should be given attribution

 * as the author of the parts of the library used.

 * This can be in the form of a textual message at program startup or

 * in documentation (online or textual) provided with the package.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 * 1. Redistributions of source code must retain the copyright

 *    notice, this list of conditions and the following disclaimer.

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in the

 *    documentation and/or other materials provided with the distribution.

 * 3. All advertising materials mentioning features or use of this software

 *    must display the following acknowledgement:

 *    "This product includes cryptographic software written by

 *     Eric Young (eay@cryptsoft.com)"

 *    The word 'cryptographic' can be left out if the rouines from the library

 *    being used are not cryptographic related :-).

 * 4. If you include any Windows specific code (or a derivative thereof) from

 *    the apps directory (application code) you must include an acknowledgement:

 *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"

 *

 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND

 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE

 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

 * SUCH DAMAGE.

 *

 * The licence and distribution terms for any publically available version or

 * derivative of this code cannot be changed.  i.e. this code cannot simply be

 * copied and put under another distribution licence

 * [including the GNU Public Licence.]

 */



#include <stdio.h>

#include "cryptlib.h"

#include <openssl/asn1t.h>



int i2d_ASN1_BOOLEAN(int a, unsigned char **pp)

{

    int r;

    unsigned char *p;



    r = ASN1_object_size(0, 1, V_ASN1_BOOLEAN);

    if (pp == NULL)

        return (r);

    p = *pp;



    ASN1_put_object(&p, 0, 1, V_ASN1_BOOLEAN, V_ASN1_UNIVERSAL);

    *(p++) = (unsigned char)a;

    *pp = p;

    return (r);

}



int d2i_ASN1_BOOLEAN(int *a, const unsigned char **pp, long length)

{

    int ret = -1;

    const unsigned char *p;

    long len;

    int inf, tag, xclass;

    int i = 0;



    p = *pp;

    inf = ASN1_get_object(&p, &len, &tag, &xclass, length);

    if (inf & 0x80) {

        i = ASN1_R_BAD_OBJECT_HEADER;

        goto err;

    }



    if (tag != V_ASN1_BOOLEAN) {

        i = ASN1_R_EXPECTING_A_BOOLEAN;

        goto err;

    }



    if (len != 1) {

        i = ASN1_R_BOOLEAN_IS_WRONG_LENGTH;

        goto err;

    }

    ret = (int)*(p++);

    if (a != NULL)

        (*a) = ret;

    *pp = p;

    return (ret);

 err:

    ASN1err(ASN1_F_D2I_ASN1_BOOLEAN, i);

    return (ret);

}

crypto/asn1/asn1.h

+0 −3
Original line number Diff line number Diff line
@@ -654,9 +654,6 @@ int ASN1_BIT_STRING_num_asc(char *name, BIT_STRING_BITNAME *tbl); 
int ASN1_BIT_STRING_set_asc(ASN1_BIT_STRING *bs, char *name, int value,

                            BIT_STRING_BITNAME *tbl);



int i2d_ASN1_BOOLEAN(int a, unsigned char **pp);

int d2i_ASN1_BOOLEAN(int *a, const unsigned char **pp, long length);



DECLARE_ASN1_FUNCTIONS(ASN1_INTEGER)

int i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp);

ASN1_INTEGER *c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp,

crypto/asn1/asn1_par.c

+2 −6
Original line number Diff line number Diff line
@@ -215,15 +215,11 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, 
                        goto end;

                }

            } else if (tag == V_ASN1_BOOLEAN) {

                int ii;



                opp = op;

                ii = d2i_ASN1_BOOLEAN(NULL, &opp, len + hl);

                if (ii < 0) {

                if (len != 1) {

                    if (BIO_write(bp, "Bad boolean\n", 12) <= 0)

                        goto end;

                }

                BIO_printf(bp, ":%d", ii);

                BIO_printf(bp, ":%u", p[0]);

            } else if (tag == V_ASN1_BMPSTRING) {

                /* do the BMP thang */

            } else if (tag == V_ASN1_OCTET_STRING) {