(bc37d996) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

CHANGES

+3 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,9 @@
		*) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7
		+) applies to 0.9.7 only

		+) New experimental application configuration code.
		[Steve Henson]

		*) New 'shared_ldflag' column in Configure platform table.
		[Richard Levitte]

crypto/asn1/Makefile.ssl

+2 −2

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ LIBSRC= a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \
		f_int.c f_string.c n_pkey.c \
		f_enum.c a_hdr.c x_pkey.c a_bool.c x_exten.c \
		asn1_par.c asn1_lib.c asn1_err.c a_meth.c a_bytes.c a_strnid.c \
		evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c
		evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c asn_moid.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_enum.o a_utf8.o a_sign.o a_digest.o a_verify.o a_mbstr.o a_strex.o \
		@@ -46,7 +46,7 @@ LIBOBJ= a_object.o a_bitstr.o a_utctm.o a_gentm.o a_time.o a_int.o a_octet.o \
		f_int.o f_string.o n_pkey.o \
		f_enum.o a_hdr.o x_pkey.o a_bool.o x_exten.o \
		asn1_par.o asn1_lib.o asn1_err.o a_meth.o a_bytes.o a_strnid.o \
		evp_asn1.o asn_pack.o p5_pbe.o p5_pbev2.o p8_pkey.o
		evp_asn1.o asn_pack.o p5_pbe.o p5_pbev2.o p8_pkey.o asn_moid.o

		SRC= $(LIBSRC)

crypto/asn1/asn1.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -933,6 +933,7 @@ void ASN1_item_free(ASN1_VALUE val, const ASN1_ITEM it);
		ASN1_VALUE * ASN1_item_d2i(ASN1_VALUE val, unsigned char in, long len, const ASN1_ITEM *it);
		int ASN1_item_i2d(ASN1_VALUE val, unsigned char out, const ASN1_ITEM it);

		void ASN1_add_oid_module(void);

		/* BEGIN ERROR CODES */
		/* The following lines are auto generated by the script mkerr.pl. Any changes

crypto/asn1/asn_moid.c

0 → 100644

+85 −0

Original line number	Diff line number	Diff line
		/* asn_moid.c */
		/* Written by Stephen Henson (shenson@bigfoot.com) for the OpenSSL
		* project 2001.
		*/
		/* ====================================================================
		* Copyright (c) 2001 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 <stdio.h>
		#include <openssl/crypto.h>
		#include "cryptlib.h"
		#include <openssl/conf.h>
		#include <openssl/dso.h>
		#include <openssl/x509.h>

		/* Simple ASN1 OID module: add all objects in a given section */

		/* NOTE: doesn't do anything other than print debug messages yet... */
		static int oid_module_init(CONF_IMODULE md, CONF cnf)
		{
		fprintf(stderr, "Called oid_module_init: name %s, value %s\n",
		CONF_imodule_get_name(md), CONF_imodule_get_value(md));
		return 1;
		}

		static void oid_module_finish(CONF_IMODULE *md)
		{
		fprintf(stderr, "Called oid_module_finish: name %s, value %s\n",
		CONF_imodule_get_name(md), CONF_imodule_get_value(md));
		}

		void ASN1_add_oid_module(void)
		{
		CONF_module_add("oid_section", oid_module_init, oid_module_finish);
		}

crypto/conf/Makefile.ssl

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,9 +23,9 @@ TEST=
		APPS=

		LIB=$(TOP)/libcrypto.a
		LIBSRC= conf_err.c conf_lib.c conf_api.c conf_def.c
		LIBSRC= conf_err.c conf_lib.c conf_api.c conf_def.c conf_mod.c conf_mall.c

		LIBOBJ= conf_err.o conf_lib.o conf_api.o conf_def.o
		LIBOBJ= conf_err.o conf_lib.o conf_api.o conf_def.o conf_mod.o conf_mall.o

		SRC= $(LIBSRC)