Remove old ASN.1 code. (f422a514) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

crypto/asn1/Makefile

+4 −20

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ APPS=

		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_set.c a_dup.c a_d2i_fp.c a_i2d_fp.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 \
		x_algor.c x_val.c x_pubkey.c x_sig.c x_req.c x_bignum.c \
		x_long.c x_name.c x_x509.c x_x509a.c x_crl.c x_info.c x_spki.c nsseq.c \
		@@ -28,11 +28,11 @@ LIBSRC= a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.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 \
		asn1_gen.c asn1_par.c asn1_lib.c asn1_err.c a_bytes.c a_strnid.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_set.o a_dup.o a_d2i_fp.o a_i2d_fp.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 \
		x_algor.o x_val.o x_pubkey.o x_sig.o x_req.o x_bignum.o \
		x_long.o x_name.o x_x509.o x_x509a.o x_crl.o x_info.o x_spki.o nsseq.o \
		@@ -42,7 +42,7 @@ LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.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 \
		asn1_gen.o asn1_par.o asn1_lib.o asn1_err.o a_bytes.o a_strnid.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

		@@ -125,14 +125,6 @@ a_bool.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
		a_bool.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
		a_bool.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
		a_bool.o: ../../include/openssl/symhacks.h ../cryptlib.h a_bool.c
		a_bytes.o: ../../e_os.h ../../include/openssl/asn1.h
		a_bytes.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
		a_bytes.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
		a_bytes.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
		a_bytes.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
		a_bytes.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
		a_bytes.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
		a_bytes.o: ../cryptlib.h a_bytes.c
		a_d2i_fp.o: ../../e_os.h ../../include/openssl/asn1.h
		a_d2i_fp.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
		a_d2i_fp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
		@@ -226,14 +218,6 @@ a_print.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
		a_print.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
		a_print.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
		a_print.o: ../cryptlib.h a_print.c
		a_set.o: ../../e_os.h ../../include/openssl/asn1.h
		a_set.o: ../../include/openssl/asn1_mac.h ../../include/openssl/bio.h
		a_set.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
		a_set.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
		a_set.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
		a_set.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
		a_set.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
		a_set.o: ../../include/openssl/symhacks.h ../cryptlib.h a_set.c
		a_sign.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h
		a_sign.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h
		a_sign.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

crypto/asn1/a_bitstr.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@

		int ASN1_BIT_STRING_set(ASN1_BIT_STRING x, unsigned char d, int len)
		{
		return M_ASN1_BIT_STRING_set(x, d, len);
		return ASN1_STRING_set(x, d, len);
		}

		int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING a, unsigned char *pp)
		@@ -136,7 +136,7 @@ ASN1_BIT_STRING c2i_ASN1_BIT_STRING(ASN1_BIT_STRING *a,
		}

		if ((a == NULL) \|\| ((*a) == NULL)) {
		if ((ret = M_ASN1_BIT_STRING_new()) == NULL)
		if ((ret = ASN1_BIT_STRING_new()) == NULL)
		return (NULL);
		} else
		ret = (*a);
		@@ -178,7 +178,7 @@ ASN1_BIT_STRING c2i_ASN1_BIT_STRING(ASN1_BIT_STRING *a,
		err:
		ASN1err(ASN1_F_C2I_ASN1_BIT_STRING, i);
		if ((ret != NULL) && ((a == NULL) \|\| (*a != ret)))
		M_ASN1_BIT_STRING_free(ret);
		ASN1_BIT_STRING_free(ret);
		return (NULL);
		}

crypto/asn1/a_bytes.c

deleted100644 → 0

+0 −306

Original line number	Diff line number	Diff line
		/* crypto/asn1/a_bytes.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/asn1.h>

		static int asn1_collate_primitive(ASN1_STRING a, ASN1_const_CTX c);
		/*
		* type is a 'bitmap' of acceptable string types.
		*/
		ASN1_STRING d2i_ASN1_type_bytes(ASN1_STRING a, const unsigned char *pp,
		long length, int type)
		{
		ASN1_STRING *ret = NULL;
		const unsigned char *p;
		unsigned char *s;
		long len;
		int inf, tag, xclass;
		int i = 0;

		p = *pp;
		inf = ASN1_get_object(&p, &len, &tag, &xclass, length);
		if (inf & 0x80)
		goto err;

		if (tag >= 32) {
		i = ASN1_R_TAG_VALUE_TOO_HIGH;
		goto err;
		}
		if (!(ASN1_tag2bit(tag) & type)) {
		i = ASN1_R_WRONG_TYPE;
		goto err;
		}

		/* If a bit-string, exit early */
		if (tag == V_ASN1_BIT_STRING)
		return (d2i_ASN1_BIT_STRING(a, pp, length));

		if ((a == NULL) \|\| ((*a) == NULL)) {
		if ((ret = ASN1_STRING_new()) == NULL)
		return (NULL);
		} else
		ret = (*a);

		if (len != 0) {
		s = (unsigned char *)OPENSSL_malloc((int)len + 1);
		if (s == NULL) {
		i = ERR_R_MALLOC_FAILURE;
		goto err;
		}
		memcpy(s, p, (int)len);
		s[len] = '\0';
		p += len;
		} else
		s = NULL;

		if (ret->data != NULL)
		OPENSSL_free(ret->data);
		ret->length = (int)len;
		ret->data = s;
		ret->type = tag;
		if (a != NULL)
		(*a) = ret;
		*pp = p;
		return (ret);
		err:
		ASN1err(ASN1_F_D2I_ASN1_TYPE_BYTES, i);
		if ((ret != NULL) && ((a == NULL) \|\| (*a != ret)))
		ASN1_STRING_free(ret);
		return (NULL);
		}

		int i2d_ASN1_bytes(ASN1_STRING a, unsigned char *pp, int tag, int xclass)
		{
		int ret, r, constructed;
		unsigned char *p;

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

		if (tag == V_ASN1_BIT_STRING)
		return (i2d_ASN1_BIT_STRING(a, pp));

		ret = a->length;
		r = ASN1_object_size(0, ret, tag);
		if (pp == NULL)
		return (r);
		p = *pp;

		if ((tag == V_ASN1_SEQUENCE) \|\| (tag == V_ASN1_SET))
		constructed = 1;
		else
		constructed = 0;
		ASN1_put_object(&p, constructed, ret, tag, xclass);
		memcpy(p, a->data, a->length);
		p += a->length;
		*pp = p;
		return (r);
		}

		ASN1_STRING d2i_ASN1_bytes(ASN1_STRING a, const unsigned char *pp,
		long length, int Ptag, int Pclass)
		{
		ASN1_STRING *ret = NULL;
		const unsigned char *p;
		unsigned char *s;
		long len;
		int inf, tag, xclass;
		int i = 0;

		if ((a == NULL) \|\| ((*a) == NULL)) {
		if ((ret = ASN1_STRING_new()) == NULL)
		return (NULL);
		} else
		ret = (*a);

		p = *pp;
		inf = ASN1_get_object(&p, &len, &tag, &xclass, length);
		if (inf & 0x80) {
		i = ASN1_R_BAD_OBJECT_HEADER;
		goto err;
		}

		if (tag != Ptag) {
		i = ASN1_R_WRONG_TAG;
		goto err;
		}

		if (inf & V_ASN1_CONSTRUCTED) {
		ASN1_const_CTX c;

		c.pp = pp;
		c.p = p;
		c.inf = inf;
		c.slen = len;
		c.tag = Ptag;
		c.xclass = Pclass;
		c.max = (length == 0) ? 0 : (p + length);
		if (!asn1_collate_primitive(ret, &c))
		goto err;
		else {
		p = c.p;
		}
		} else {
		if (len != 0) {
		if ((ret->length < len) \|\| (ret->data == NULL)) {
		if (ret->data != NULL)
		OPENSSL_free(ret->data);
		s = (unsigned char *)OPENSSL_malloc((int)len + 1);
		if (s == NULL) {
		i = ERR_R_MALLOC_FAILURE;
		goto err;
		}
		} else
		s = ret->data;
		memcpy(s, p, (int)len);
		s[len] = '\0';
		p += len;
		} else {
		s = NULL;
		if (ret->data != NULL)
		OPENSSL_free(ret->data);
		}

		ret->length = (int)len;
		ret->data = s;
		ret->type = Ptag;
		}

		if (a != NULL)
		(*a) = ret;
		*pp = p;
		return (ret);
		err:
		if ((ret != NULL) && ((a == NULL) \|\| (*a != ret)))
		ASN1_STRING_free(ret);
		ASN1err(ASN1_F_D2I_ASN1_BYTES, i);
		return (NULL);
		}

		/*
		* We are about to parse 0..n d2i_ASN1_bytes objects, we are to collapse them
		* into the one structure that is then returned
		*/
		/*
		* There have been a few bug fixes for this function from Paul Keogh
		* <paul.keogh@sse.ie>, many thanks to him
		*/
		static int asn1_collate_primitive(ASN1_STRING a, ASN1_const_CTX c)
		{
		ASN1_STRING *os = NULL;
		BUF_MEM b;
		int num;

		b.length = 0;
		b.max = 0;
		b.data = NULL;

		if (a == NULL) {
		c->error = ERR_R_PASSED_NULL_PARAMETER;
		goto err;
		}

		num = 0;
		for (;;) {
		if (c->inf & 1) {
		c->eos = ASN1_const_check_infinite_end(&c->p,
		(long)(c->max - c->p));
		if (c->eos)
		break;
		} else {
		if (c->slen <= 0)
		break;
		}

		c->q = c->p;
		if (d2i_ASN1_bytes(&os, &c->p, c->max - c->p, c->tag, c->xclass)
		== NULL) {
		c->error = ERR_R_ASN1_LIB;
		goto err;
		}

		if (!BUF_MEM_grow_clean(&b, num + os->length)) {
		c->error = ERR_R_BUF_LIB;
		goto err;
		}
		memcpy(&(b.data[num]), os->data, os->length);
		if (!(c->inf & 1))
		c->slen -= (c->p - c->q);
		num += os->length;
		}

		if (!asn1_const_Finish(c))
		goto err;

		a->length = num;
		if (a->data != NULL)
		OPENSSL_free(a->data);
		a->data = (unsigned char *)b.data;
		if (os != NULL)
		ASN1_STRING_free(os);
		return (1);
		err:
		ASN1err(ASN1_F_ASN1_COLLATE_PRIMITIVE, c->error);
		if (os != NULL)
		ASN1_STRING_free(os);
		if (b.data != NULL)
		OPENSSL_free(b.data);
		return (0);
		}

crypto/asn1/a_enum.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@ ASN1_ENUMERATED BN_to_ASN1_ENUMERATED(BIGNUM bn, ASN1_ENUMERATED *ai)
		int len, j;

		if (ai == NULL)
		ret = M_ASN1_ENUMERATED_new();
		ret = ASN1_ENUMERATED_new();
		else
		ret = ai;
		if (ret == NULL) {
		@@ -165,7 +165,7 @@ ASN1_ENUMERATED BN_to_ASN1_ENUMERATED(BIGNUM bn, ASN1_ENUMERATED *ai)
		return (ret);
		err:
		if (ret != ai)
		M_ASN1_ENUMERATED_free(ret);
		ASN1_ENUMERATED_free(ret);
		return (NULL);
		}

crypto/asn1/a_gentm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -223,7 +223,7 @@ ASN1_GENERALIZEDTIME ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME s,
		size_t len = 20;

		if (s == NULL)
		s = M_ASN1_GENERALIZEDTIME_new();
		s = ASN1_GENERALIZEDTIME_new();
		if (s == NULL)
		return (NULL);