ASN1 INTEGER refactor. (6c5b6cb0) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

crypto/asn1/Makefile

+4 −20

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@ GENERAL=Makefile README
		LIB=$(TOP)/libcrypto.a
		LIBSRC= a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \
		a_print.c a_type.c a_dup.c a_d2i_fp.c a_i2d_fp.c \
		a_enum.c a_utf8.c a_sign.c a_digest.c a_verify.c a_mbstr.c a_strex.c \
		a_utf8.c a_sign.c a_digest.c a_verify.c a_mbstr.c a_strex.c \
		x_algor.c x_val.c x_pubkey.c x_sig.c x_req.c x_bignum.c \
		x_long.c x_x509.c x_x509a.c x_crl.c x_info.c x_spki.c nsseq.c \
		x_nx509.c d2i_pu.c d2i_pr.c i2d_pu.c i2d_pr.c\
		@@ -25,13 +25,13 @@ 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 bio_asn1.c bio_ndef.c asn_mime.c \
		x_pkey.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
		LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \
		a_print.o a_type.o a_dup.o a_d2i_fp.o a_i2d_fp.o \
		a_enum.o a_utf8.o a_sign.o a_digest.o a_verify.o a_mbstr.o a_strex.o \
		a_utf8.o a_sign.o a_digest.o a_verify.o a_mbstr.o a_strex.o \
		x_algor.o x_val.o x_pubkey.o x_sig.o x_req.o x_bignum.o \
		x_long.o x_x509.o x_x509a.o x_crl.o x_info.o x_spki.o nsseq.o \
		x_nx509.o d2i_pu.o d2i_pr.o i2d_pu.o i2d_pr.o \
		@@ -39,7 +39,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 bio_asn1.o bio_ndef.o asn_mime.o \
		x_pkey.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
		@@ -133,14 +133,6 @@ a_dup.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
		a_dup.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
		a_dup.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h
		a_dup.o: a_dup.c
		a_enum.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
		a_enum.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
		a_enum.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
		a_enum.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
		a_enum.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
		a_enum.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
		a_enum.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
		a_enum.o: ../include/internal/cryptlib.h a_enum.c
		a_gentm.o: ../../e_os.h ../../include/openssl/asn1.h
		a_gentm.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
		a_gentm.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
		@@ -441,14 +433,6 @@ evp_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
		evp_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
		evp_asn1.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h
		evp_asn1.o: evp_asn1.c
		f_enum.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
		f_enum.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
		f_enum.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
		f_enum.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
		f_enum.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
		f_enum.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
		f_enum.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h
		f_enum.o: f_enum.c
		f_int.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
		f_int.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
		f_int.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

crypto/asn1/a_enum.c

deleted100644 → 0

+0 −179

Original line number	Diff line number	Diff line
		/* crypto/asn1/a_enum.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 "internal/cryptlib.h"
		#include <openssl/asn1.h>
		#include <openssl/bn.h>

		/*
		* Code for ENUMERATED type: identical to INTEGER apart from a different tag.
		* for comments on encoding see a_int.c
		*/

		int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v)
		{
		int j, k;
		unsigned int i;
		unsigned char buf[sizeof(long) + 1];
		long d;

		a->type = V_ASN1_ENUMERATED;
		if (a->length < (int)(sizeof(long) + 1)) {
		OPENSSL_free(a->data);
		if ((a->data = OPENSSL_malloc(sizeof(long) + 1)) != NULL)
		memset(a->data, 0, sizeof(long) + 1);
		}
		if (a->data == NULL) {
		ASN1err(ASN1_F_ASN1_ENUMERATED_SET, ERR_R_MALLOC_FAILURE);
		return (0);
		}
		d = v;
		if (d < 0) {
		d = -d;
		a->type = V_ASN1_NEG_ENUMERATED;
		}

		for (i = 0; i < sizeof(long); i++) {
		if (d == 0)
		break;
		buf[i] = (int)d & 0xff;
		d >>= 8;
		}
		j = 0;
		for (k = i - 1; k >= 0; k--)
		a->data[j++] = buf[k];
		a->length = j;
		return (1);
		}

		long ASN1_ENUMERATED_get(ASN1_ENUMERATED *a)
		{
		int neg = 0, i;
		long r = 0;

		if (a == NULL)
		return (0L);
		i = a->type;
		if (i == V_ASN1_NEG_ENUMERATED)
		neg = 1;
		else if (i != V_ASN1_ENUMERATED)
		return -1;

		if (a->length > (int)sizeof(long)) {
		/* hmm... a bit ugly */
		return (0xffffffffL);
		}
		if (a->data == NULL)
		return 0;

		for (i = 0; i < a->length; i++) {
		r <<= 8;
		r \|= (unsigned char)a->data[i];
		}
		if (neg)
		r = -r;
		return (r);
		}

		ASN1_ENUMERATED BN_to_ASN1_ENUMERATED(BIGNUM bn, ASN1_ENUMERATED *ai)
		{
		ASN1_ENUMERATED *ret;
		int len, j;

		if (ai == NULL)
		ret = ASN1_ENUMERATED_new();
		else
		ret = ai;
		if (ret == NULL) {
		ASN1err(ASN1_F_BN_TO_ASN1_ENUMERATED, ERR_R_NESTED_ASN1_ERROR);
		goto err;
		}
		if (BN_is_negative(bn))
		ret->type = V_ASN1_NEG_ENUMERATED;
		else
		ret->type = V_ASN1_ENUMERATED;
		j = BN_num_bits(bn);
		len = ((j == 0) ? 0 : ((j / 8) + 1));
		if (ret->length < len + 4) {
		unsigned char *new_data = OPENSSL_realloc(ret->data, len + 4);
		if (!new_data) {
		ASN1err(ASN1_F_BN_TO_ASN1_ENUMERATED, ERR_R_MALLOC_FAILURE);
		goto err;
		}
		ret->data = new_data;
		}

		ret->length = BN_bn2bin(bn, ret->data);
		return (ret);
		err:
		if (ret != ai)
		ASN1_ENUMERATED_free(ret);
		return (NULL);
		}

		BIGNUM ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED ai, BIGNUM *bn)
		{
		BIGNUM *ret;

		if ((ret = BN_bin2bn(ai->data, ai->length, bn)) == NULL)
		ASN1err(ASN1_F_ASN1_ENUMERATED_TO_BN, ASN1_R_BN_LIB);
		else if (ai->type == V_ASN1_NEG_ENUMERATED)
		BN_set_negative(ret, 1);
		return (ret);
		}

crypto/asn1/a_int.c

+359 −181

File changed.

Preview size limit exceeded, changes collapsed.

crypto/asn1/asn1_err.c

+13 −2

Original line number	Diff line number	Diff line
		/* crypto/asn1/asn1_err.c */
		/* ====================================================================
		* Copyright (c) 1999-2014 The OpenSSL Project. All rights reserved.
		* Copyright (c) 1999-2015 The OpenSSL Project. All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		@@ -93,7 +93,9 @@ static ERR_STRING_DATA ASN1_str_functs[] = {
		{ERR_FUNC(ASN1_F_ASN1_GENERALIZEDTIME_ADJ), "ASN1_GENERALIZEDTIME_adj"},
		{ERR_FUNC(ASN1_F_ASN1_GENERALIZEDTIME_SET), "ASN1_GENERALIZEDTIME_set"},
		{ERR_FUNC(ASN1_F_ASN1_GENERATE_V3), "ASN1_generate_v3"},
		{ERR_FUNC(ASN1_F_ASN1_GET_INT64), "ASN1_GET_INT64"},
		{ERR_FUNC(ASN1_F_ASN1_GET_OBJECT), "ASN1_get_object"},
		{ERR_FUNC(ASN1_F_ASN1_GET_UINT64), "ASN1_GET_UINT64"},
		{ERR_FUNC(ASN1_F_ASN1_HEADER_NEW), "ASN1_HEADER_NEW"},
		{ERR_FUNC(ASN1_F_ASN1_I2D_BIO), "ASN1_i2d_bio"},
		{ERR_FUNC(ASN1_F_ASN1_I2D_FP), "ASN1_i2d_fp"},
		@@ -101,8 +103,8 @@ static ERR_STRING_DATA ASN1_str_functs[] = {
		{ERR_FUNC(ASN1_F_ASN1_INTEGER_TO_BN), "ASN1_INTEGER_to_BN"},
		{ERR_FUNC(ASN1_F_ASN1_ITEM_D2I_FP), "ASN1_item_d2i_fp"},
		{ERR_FUNC(ASN1_F_ASN1_ITEM_DUP), "ASN1_item_dup"},
		{ERR_FUNC(ASN1_F_ASN1_ITEM_EX_NEW), "ASN1_ITEM_EX_NEW"},
		{ERR_FUNC(ASN1_F_ASN1_ITEM_EX_D2I), "ASN1_ITEM_EX_D2I"},
		{ERR_FUNC(ASN1_F_ASN1_ITEM_EX_NEW), "ASN1_ITEM_EX_NEW"},
		{ERR_FUNC(ASN1_F_ASN1_ITEM_I2D_BIO), "ASN1_item_i2d_bio"},
		{ERR_FUNC(ASN1_F_ASN1_ITEM_I2D_FP), "ASN1_item_i2d_fp"},
		{ERR_FUNC(ASN1_F_ASN1_ITEM_PACK), "ASN1_item_pack"},
		@@ -121,8 +123,10 @@ static ERR_STRING_DATA ASN1_str_functs[] = {
		{ERR_FUNC(ASN1_F_ASN1_SEQ_UNPACK), "ASN1_seq_unpack"},
		{ERR_FUNC(ASN1_F_ASN1_SIGN), "ASN1_sign"},
		{ERR_FUNC(ASN1_F_ASN1_STR2TYPE), "ASN1_STR2TYPE"},
		{ERR_FUNC(ASN1_F_ASN1_STRING_GET_INT64), "ASN1_STRING_GET_INT64"},
		{ERR_FUNC(ASN1_F_ASN1_STRING_SET), "ASN1_STRING_set"},
		{ERR_FUNC(ASN1_F_ASN1_STRING_TABLE_ADD), "ASN1_STRING_TABLE_add"},
		{ERR_FUNC(ASN1_F_ASN1_STRING_TO_BN), "ASN1_STRING_TO_BN"},
		{ERR_FUNC(ASN1_F_ASN1_STRING_TYPE_NEW), "ASN1_STRING_type_new"},
		{ERR_FUNC(ASN1_F_ASN1_TEMPLATE_EX_D2I), "ASN1_TEMPLATE_EX_D2I"},
		{ERR_FUNC(ASN1_F_ASN1_TEMPLATE_NEW), "ASN1_TEMPLATE_NEW"},
		@@ -142,9 +146,11 @@ static ERR_STRING_DATA ASN1_str_functs[] = {
		{ERR_FUNC(ASN1_F_BITSTR_CB), "BITSTR_CB"},
		{ERR_FUNC(ASN1_F_BN_TO_ASN1_ENUMERATED), "BN_to_ASN1_ENUMERATED"},
		{ERR_FUNC(ASN1_F_BN_TO_ASN1_INTEGER), "BN_to_ASN1_INTEGER"},
		{ERR_FUNC(ASN1_F_BN_TO_ASN1_STRING), "BN_TO_ASN1_STRING"},
		{ERR_FUNC(ASN1_F_C2I_ASN1_BIT_STRING), "c2i_ASN1_BIT_STRING"},
		{ERR_FUNC(ASN1_F_C2I_ASN1_INTEGER), "c2i_ASN1_INTEGER"},
		{ERR_FUNC(ASN1_F_C2I_ASN1_OBJECT), "c2i_ASN1_OBJECT"},
		{ERR_FUNC(ASN1_F_C2I_IBUF), "C2I_IBUF"},
		{ERR_FUNC(ASN1_F_COLLECT_DATA), "COLLECT_DATA"},
		{ERR_FUNC(ASN1_F_D2I_ASN1_BIT_STRING), "D2I_ASN1_BIT_STRING"},
		{ERR_FUNC(ASN1_F_D2I_ASN1_BOOLEAN), "d2i_ASN1_BOOLEAN"},
		@@ -252,8 +258,10 @@ static ERR_STRING_DATA ASN1_str_reasons[] = {
		{ERR_REASON(ASN1_R_ILLEGAL_OPTIONAL_ANY), "illegal optional any"},
		{ERR_REASON(ASN1_R_ILLEGAL_OPTIONS_ON_ITEM_TEMPLATE),
		"illegal options on item template"},
		{ERR_REASON(ASN1_R_ILLEGAL_PADDING), "illegal padding"},
		{ERR_REASON(ASN1_R_ILLEGAL_TAGGED_ANY), "illegal tagged any"},
		{ERR_REASON(ASN1_R_ILLEGAL_TIME_VALUE), "illegal time value"},
		{ERR_REASON(ASN1_R_ILLEGAL_ZERO_CONTENT), "illegal zero content"},
		{ERR_REASON(ASN1_R_INTEGER_NOT_ASCII_FORMAT), "integer not ascii format"},
		{ERR_REASON(ASN1_R_INTEGER_TOO_LARGE_FOR_LONG),
		"integer too large for long"},
		@@ -314,7 +322,9 @@ static ERR_STRING_DATA ASN1_str_reasons[] = {
		{ERR_REASON(ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD),
		"the asn1 object identifier is not known for this md"},
		{ERR_REASON(ASN1_R_TIME_NOT_ASCII_FORMAT), "time not ascii format"},
		{ERR_REASON(ASN1_R_TOO_LARGE), "too large"},
		{ERR_REASON(ASN1_R_TOO_LONG), "too long"},
		{ERR_REASON(ASN1_R_TOO_SMALL), "too small"},
		{ERR_REASON(ASN1_R_TYPE_NOT_CONSTRUCTED), "type not constructed"},
		{ERR_REASON(ASN1_R_TYPE_NOT_PRIMITIVE), "type not primitive"},
		{ERR_REASON(ASN1_R_UNABLE_TO_DECODE_RSA_KEY), "unable to decode rsa key"},
		@@ -339,6 +349,7 @@ static ERR_STRING_DATA ASN1_str_reasons[] = {
		{ERR_REASON(ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE),
		"unsupported public key type"},
		{ERR_REASON(ASN1_R_UNSUPPORTED_TYPE), "unsupported type"},
		{ERR_REASON(ASN1_R_WRONG_INTEGER_TYPE), "wrong integer type"},
		{ERR_REASON(ASN1_R_WRONG_PUBLIC_KEY_TYPE), "wrong public key type"},
		{ERR_REASON(ASN1_R_WRONG_TAG), "wrong tag"},
		{ERR_REASON(ASN1_R_WRONG_TYPE), "wrong type"},

crypto/asn1/f_enum.c

deleted100644 → 0

+0 −193

Original line number	Diff line number	Diff line
		/* crypto/asn1/f_enum.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 "internal/cryptlib.h"
		#include <openssl/buffer.h>
		#include <openssl/asn1.h>

		/* Based on a_int.c: equivalent ENUMERATED functions */

		int i2a_ASN1_ENUMERATED(BIO bp, ASN1_ENUMERATED a)
		{
		int i, n = 0;
		static const char *h = "0123456789ABCDEF";
		char buf[2];

		if (a == NULL)
		return (0);

		if (a->length == 0) {
		if (BIO_write(bp, "00", 2) != 2)
		goto err;
		n = 2;
		} else {
		for (i = 0; i < a->length; i++) {
		if ((i != 0) && (i % 35 == 0)) {
		if (BIO_write(bp, "\\\n", 2) != 2)
		goto err;
		n += 2;
		}
		buf[0] = h[((unsigned char)a->data[i] >> 4) & 0x0f];
		buf[1] = h[((unsigned char)a->data[i]) & 0x0f];
		if (BIO_write(bp, buf, 2) != 2)
		goto err;
		n += 2;
		}
		}
		return (n);
		err:
		return (-1);
		}

		int a2i_ASN1_ENUMERATED(BIO bp, ASN1_ENUMERATED bs, char *buf, int size)
		{
		int i, j, k, m, n, again, bufsize;
		unsigned char s = NULL, sp;
		unsigned char *bufp;
		int num = 0, slen = 0, first = 1;

		bs->type = V_ASN1_ENUMERATED;

		bufsize = BIO_gets(bp, buf, size);
		for (;;) {
		if (bufsize < 1)
		goto err;
		i = bufsize;
		if (buf[i - 1] == '\n')
		buf[--i] = '\0';
		if (i == 0)
		goto err;
		if (buf[i - 1] == '\r')
		buf[--i] = '\0';
		if (i == 0)
		goto err;
		again = (buf[i - 1] == '\\');

		for (j = 0; j < i; j++) {
		if (!(((buf[j] >= '0') && (buf[j] <= '9')) \|\|
		((buf[j] >= 'a') && (buf[j] <= 'f')) \|\|
		((buf[j] >= 'A') && (buf[j] <= 'F')))) {
		i = j;
		break;
		}
		}
		buf[i] = '\0';
		/*
		* We have now cleared all the crap off the end of the line
		*/
		if (i < 2)
		goto err;

		bufp = (unsigned char *)buf;
		if (first) {
		first = 0;
		if ((bufp[0] == '0') && (buf[1] == '0')) {
		bufp += 2;
		i -= 2;
		}
		}
		k = 0;
		i -= again;
		if (i % 2 != 0) {
		ASN1err(ASN1_F_A2I_ASN1_ENUMERATED, ASN1_R_ODD_NUMBER_OF_CHARS);
		return 0;
		}
		i /= 2;
		if (num + i > slen) {
		sp = OPENSSL_realloc(s, (unsigned int)num + i * 2);
		if (sp == NULL) {
		ASN1err(ASN1_F_A2I_ASN1_ENUMERATED, ERR_R_MALLOC_FAILURE);
		OPENSSL_free(s);
		return 0;
		}
		s = sp;
		slen = num + i * 2;
		}
		for (j = 0; j < i; j++, k += 2) {
		for (n = 0; n < 2; n++) {
		m = bufp[k + n];
		if ((m >= '0') && (m <= '9'))
		m -= '0';
		else if ((m >= 'a') && (m <= 'f'))
		m = m - 'a' + 10;
		else if ((m >= 'A') && (m <= 'F'))
		m = m - 'A' + 10;
		else {
		ASN1err(ASN1_F_A2I_ASN1_ENUMERATED,
		ASN1_R_NON_HEX_CHARACTERS);
		return 0;
		}
		s[num + j] <<= 4;
		s[num + j] \|= m;
		}
		}
		num += i;
		if (again)
		bufsize = BIO_gets(bp, buf, size);
		else
		break;
		}
		bs->length = num;
		bs->data = s;
		return 1;

		err:
		ASN1err(ASN1_F_A2I_ASN1_ENUMERATED, ASN1_R_SHORT_LINE);
		return 0;
		}