Support routines for ASN1 scanning function, doesn't do much yet. (d7d5a55d) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

crypto/asn1/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ LIBSRC= a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \
		x_nx509.c d2i_pu.c d2i_pr.c i2d_pu.c i2d_pr.c\
		t_req.c t_x509.c t_x509a.c t_crl.c t_pkey.c t_spki.c t_bitst.c \
		tasn_new.c tasn_fre.c tasn_enc.c tasn_dec.c tasn_utl.c tasn_typ.c \
		tasn_prn.c ameth_lib.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 \
		@@ -38,7 +38,7 @@ LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \
		x_nx509.o d2i_pu.o d2i_pr.o i2d_pu.o i2d_pr.o \
		t_req.o t_x509.o t_x509a.o t_crl.o t_pkey.o t_spki.o t_bitst.o \
		tasn_new.o tasn_fre.o tasn_enc.o tasn_dec.o tasn_utl.o tasn_typ.o \
		tasn_prn.o ameth_lib.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 \

crypto/asn1/a_verify.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,6 @@
		#include <time.h>

		#include "cryptlib.h"
		#include "asn1_locl.h"

		#ifndef NO_SYS_TYPES_H
		# include <sys/types.h>
		@@ -71,6 +70,7 @@
		#include <openssl/objects.h>
		#include <openssl/buffer.h>
		#include <openssl/evp.h>
		#include "asn1_locl.h"

		#ifndef NO_ASN1_OLD

crypto/asn1/asn1.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -1130,6 +1130,14 @@ void ASN1_PCTX_set_oid_flags(ASN1_PCTX *p, unsigned long flags);
		unsigned long ASN1_PCTX_get_str_flags(ASN1_PCTX *p);
		void ASN1_PCTX_set_str_flags(ASN1_PCTX *p, unsigned long flags);

		ASN1_SCTX ASN1_SCTX_new(int (scan_cb)(ASN1_SCTX *ctx));
		void ASN1_SCTX_free(ASN1_SCTX *p);
		const ASN1_ITEM ASN1_SCTX_get_item(ASN1_SCTX p);
		const ASN1_TEMPLATE * ASN1_SCTX_get_template(ASN1_SCTX *p);
		unsigned long ASN1_SCTX_get_flags(ASN1_SCTX *p);
		void ASN1_SCTX_set_app_data(ASN1_SCTX p, void data);
		void ASN1_SCTX_get_app_data(ASN1_SCTX p);

		BIO_METHOD *BIO_f_asn1(void);

		BIO BIO_new_NDEF(BIO out, ASN1_VALUE val, const ASN1_ITEM it);

crypto/asn1/asn1_locl.h

+26 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,32 @@ struct asn1_pctx_st
		unsigned long str_flags;
		} /* ASN1_PCTX */;

		/* ASN1 scan context structure */

		struct asn1_sctx_st
		{
		/* The ASN1_ITEM associated with this field */
		const ASN1_ITEM *it;
		/* If ASN1_TEMPLATE associated with this field */
		const ASN1_TEMPLATE *tt;
		/* Various flags associated with field and context */
		unsigned long flags;
		/* If SEQUENCE OF or SET OF, field index */
		int skidx;
		/* ASN1 depth of field */
		int depth;
		/* Structure and field name */
		const char sname, fname;
		/* If a primitive type the type of underlying field */
		int prim_type;
		/* The field value itself */
		ASN1_VALUE **field;
		/* Callback to pass information to */
		int (scan_cb)(ASN1_SCTX ctx);
		/* Context specific application data */
		void *app_data;
		} /* ASN1_SCTX */;

		/* ASN1 public key method structure */

		struct evp_pkey_asn1_method_st

crypto/asn1/tasn_scn.c

0 → 100644

+117 −0

Original line number	Diff line number	Diff line
		/* tasn_scn.c */
		/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
		* project 2010.
		*/
		/* ====================================================================
		* Copyright (c) 2010 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
		* are met:
		*
		* 1. Redistributions of source code must retain the above 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 acknowledgment:
		* "This product includes software developed by the OpenSSL Project
		* for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
		*
		* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
		* endorse or promote products derived from this software without
		* prior written permission. For written permission, please contact
		* licensing@OpenSSL.org.
		*
		* 5. Products derived from this software may not be called "OpenSSL"
		* nor may "OpenSSL" appear in their names without prior written
		* permission of the OpenSSL Project.
		*
		* 6. Redistributions of any form whatsoever must retain the following
		* acknowledgment:
		* "This product includes software developed by the OpenSSL Project
		* for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
		*
		* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
		* EXPRESSED 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 OpenSSL PROJECT OR
		* ITS 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.
		* ====================================================================
		*
		* This product includes cryptographic software written by Eric Young
		* (eay@cryptsoft.com). This product includes software written by Tim
		* Hudson (tjh@cryptsoft.com).
		*
		*/


		#include <stddef.h>
		#include "cryptlib.h"
		#include <openssl/asn1.h>
		#include <openssl/asn1t.h>
		#include <openssl/objects.h>
		#include <openssl/buffer.h>
		#include <openssl/err.h>
		#include <openssl/x509v3.h>
		#include "asn1_locl.h"

		/* General ASN1 structure recursive scanner: iterate through all
		* fields passing details to a callback.
		*/

		ASN1_SCTX ASN1_SCTX_new(int (scan_cb)(ASN1_SCTX *ctx))
		{
		ASN1_SCTX *ret;
		ret = OPENSSL_malloc(sizeof(ASN1_SCTX));
		if (ret == NULL)
		{
		ASN1err(ASN1_F_ASN1_PCTX_NEW, ERR_R_MALLOC_FAILURE);
		return NULL;
		}
		ret->scan_cb = scan_cb;
		return ret;
		}

		void ASN1_SCTX_free(ASN1_SCTX *p)
		{
		OPENSSL_free(p);
		}

		const ASN1_ITEM ASN1_SCTX_get_item(ASN1_SCTX p)
		{
		return p->it;
		}

		const ASN1_TEMPLATE * ASN1_SCTX_get_template(ASN1_SCTX *p)
		{
		return p->tt;
		}

		unsigned long ASN1_SCTX_get_flags(ASN1_SCTX *p)
		{
		return p->flags;
		}

		void ASN1_SCTX_set_app_data(ASN1_SCTX p, void data)
		{
		p->app_data = data;
		}

		void ASN1_SCTX_get_app_data(ASN1_SCTX p)
		{
		return p->app_data;
		}