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

CHANGES

+8 −0

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

		+) Initial reduction of linker bloat: the use of some functions, such as
		PEM causes large amounts of unused functions to be linked in due to
		poor organisation. For example pem_all.c contains every PEM function
		which has a knock on effect of linking in large amounts of (unused)
		ASN1 code. Grouping together similar functions and splitting unrelated
		functions prevents this.
		[Steve Henson]

		*) Initialize static variable in crypto/dsa/dsa_lib.c explicitely to
		NULL, as at least on Solaris 8 this seems not to be done automatically
		(in contradiction to the requirements of the C standard).

crypto/pem/Makefile.ssl

+4 −2

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

		LIB=$(TOP)/libcrypto.a
		LIBSRC= pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c
		LIBSRC= pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c \
		pem_x509.c pem_xaux.c

		LIBOBJ= pem_sign.o pem_seal.o pem_info.o pem_lib.o pem_all.o pem_err.o
		LIBOBJ= pem_sign.o pem_seal.o pem_info.o pem_lib.o pem_all.o pem_err.o \
		pem_x509.o pem_xaux.o

		SRC= $(LIBSRC)

crypto/pem/pem_all.c

+1 −7

Original line number	Diff line number	Diff line
		@@ -72,10 +72,6 @@ static RSA pkey_get_rsa(EVP_PKEY key, RSA **rsa);
		static DSA pkey_get_dsa(EVP_PKEY key, DSA **dsa);
		#endif

		IMPLEMENT_PEM_rw(X509, X509, PEM_STRING_X509, X509)

		IMPLEMENT_PEM_rw(X509_AUX, X509, PEM_STRING_X509_TRUSTED, X509_AUX)

		IMPLEMENT_PEM_rw(X509_REQ, X509_REQ, PEM_STRING_X509_REQ, X509_REQ)

		IMPLEMENT_PEM_write(X509_REQ_NEW, X509_REQ, PEM_STRING_X509_REQ_OLD, X509_REQ)
		@@ -87,9 +83,6 @@ IMPLEMENT_PEM_rw(PKCS7, PKCS7, PEM_STRING_PKCS7, PKCS7)
		IMPLEMENT_PEM_rw(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE,
		PEM_STRING_X509, NETSCAPE_CERT_SEQUENCE)

		IMPLEMENT_PEM_rw(PKCS8, X509_SIG, PEM_STRING_PKCS8, X509_SIG)
		IMPLEMENT_PEM_rw(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO, PEM_STRING_PKCS8INF,
		PKCS8_PRIV_KEY_INFO)

		#ifndef OPENSSL_NO_RSA

		@@ -201,3 +194,4 @@ IMPLEMENT_PEM_read(PrivateKey, EVP_PKEY, PEM_STRING_EVP_PKEY, PrivateKey)
		IMPLEMENT_PEM_write_cb(PrivateKey, EVP_PKEY, ((x->type == EVP_PKEY_DSA)?PEM_STRING_DSA:PEM_STRING_RSA), PrivateKey)

		IMPLEMENT_PEM_rw(PUBKEY, EVP_PKEY, PEM_STRING_PUBLIC, PUBKEY)

crypto/pem/pem_lib.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -961,3 +961,7 @@ EVP_PKEY d2i_PKCS8PrivateKey_fp(FILE fp, EVP_PKEY *x, pem_password_cb cb, vo
		}

		#endif

		IMPLEMENT_PEM_rw(PKCS8, X509_SIG, PEM_STRING_PKCS8, X509_SIG)
		IMPLEMENT_PEM_rw(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO, PEM_STRING_PKCS8INF,
		PKCS8_PRIV_KEY_INFO)

crypto/pem/pem_x509.c

0 → 100644

+69 −0

Original line number	Diff line number	Diff line
		/* pem_x509.c */
		/* Written by Dr Stephen N 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>
		#undef SSLEAY_MACROS
		#include "cryptlib.h"
		#include <openssl/bio.h>
		#include <openssl/evp.h>
		#include <openssl/x509.h>
		#include <openssl/pkcs7.h>
		#include <openssl/pem.h>

		IMPLEMENT_PEM_rw(X509, X509, PEM_STRING_X509, X509)