Preliminary support for reason code CRL extension. (c74f1eb9) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

crypto/x509v3/Makefile.ssl

+2 −2

Original line number	Diff line number	Diff line
		@@ -24,10 +24,10 @@ APPS=
		LIB=$(TOP)/libcrypto.a
		LIBSRC= v3_bcons.c v3_bitst.c v3_conf.c v3_extku.c v3_ia5.c \
		v3_lib.c v3_prn.c v3_utl.c v3err.c v3_genn.c v3_alt.c v3_skey.c v3_akey.c \
		v3_pku.c v3_int.c
		v3_pku.c v3_int.c v3_enum.c
		LIBOBJ= v3_bcons.o v3_bitst.o v3_conf.o v3_extku.o v3_ia5.o v3_lib.o \
		v3_prn.o v3_utl.o v3err.o v3_genn.o v3_alt.o v3_skey.o v3_akey.o v3_pku.o \
		v3_int.o
		v3_int.o v3_enum.o

		SRC= $(LIBSRC)

crypto/x509v3/v3_enum.c

0 → 100644

+105 −0

Original line number	Diff line number	Diff line
		/* v3_enum.c */
		/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
		* project 1999.
		*/
		/* ====================================================================
		* Copyright (c) 1999 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 <stdlib.h>
		#include <pem.h>
		#include <err.h>
		#include "x509v3.h"

		static ASN1_ENUMERATED *asn1_enumerated_new();

		static ENUMERATED_NAMES crl_reasons[] = {
		{0, "Unspecified", "unspecified"},
		{1, "Key Compromise", "keyCompromise"},
		{2, "CA Compromise", "CACompromise"},
		{3, "Affiliation Changed", "affiliationChanged"},
		{4, "Superseded", "superseded"},
		{5, "Cessation Of Operation", "cessationOfOperation"},
		{6, "Certificate Hold", "certificateHold"},
		{8, "Remove From CRL", "removeFromCRL"},
		{-1, NULL, NULL}
		};

		X509V3_EXT_METHOD v3_crl_reason = {
		NID_crl_reason, 0,
		(X509V3_EXT_NEW)asn1_enumerated_new, ASN1_STRING_free,
		(X509V3_EXT_D2I)d2i_ASN1_ENUMERATED,
		i2d_ASN1_ENUMERATED,
		(X509V3_EXT_I2S)i2s_ASN1_ENUMERATED_TABLE,
		(X509V3_EXT_S2I)NULL,
		NULL, NULL, NULL, (char *)crl_reasons};


		static ASN1_ENUMERATED *asn1_enumerated_new()
		{
		return ASN1_ENUMERATED_new();
		}

		char *i2s_ASN1_ENUMERATED_TABLE(method, e)
		X509V3_EXT_METHOD *method;
		ASN1_ENUMERATED *e;
		{
		ENUMERATED_NAMES *enam;
		long strval;
		strval = ASN1_ENUMERATED_get(e);
		for(enam =(ENUMERATED_NAMES *)method->usr_data; enam->lname; enam++) {
		if(strval == enam->bitnum) return str_dup(enam->lname);
		}
		return i2s_ASN1_ENUMERATED(method, e);
		}

crypto/x509v3/v3_lib.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@ extern X509V3_EXT_METHOD v3_bcons, v3_nscert, v3_key_usage, v3_ext_ku;
		extern X509V3_EXT_METHOD v3_pkey_usage_period;
		extern X509V3_EXT_METHOD v3_ns_ia5_list[], v3_alt[], v3_skey_id, v3_akey_id;

		extern X509V3_EXT_METHOD v3_crl_num;
		extern X509V3_EXT_METHOD v3_crl_num, v3_crl_reason;

		int X509V3_add_standard_extensions()
		{
		@@ -164,6 +164,7 @@ int X509V3_add_standard_extensions()
		X509V3_EXT_add(&v3_akey_id);
		X509V3_EXT_add(&v3_pkey_usage_period);
		X509V3_EXT_add(&v3_crl_num);
		X509V3_EXT_add(&v3_crl_reason);
		return 1;
		}

crypto/x509v3/v3_utl.c

+16 −2

Original line number	Diff line number	Diff line
		@@ -65,10 +65,9 @@
		#include <err.h>
		#include "x509v3.h"

		static char * str_dup(char *str);
		static char strip_spaces(char name);

		static char *str_dup(str)
		char *str_dup(str)
		char *str;
		{
		char *tmp;
		@@ -133,6 +132,21 @@ STACK **extlist;
		return 1;
		}


		char *i2s_ASN1_ENUMERATED(method, a)
		X509V3_EXT_METHOD *method;
		ASN1_ENUMERATED *a;
		{
		BIGNUM *bntmp = NULL;
		char *strtmp = NULL;
		if(!a) return NULL;
		if(!(bntmp = ASN1_ENUMERATED_to_BN(a, NULL)) \|\|
		!(strtmp = BN_bn2dec(bntmp)) )
		X509V3err(X509V3_F_I2S_ASN1_ENUMERATED,ERR_R_MALLOC_FAILURE);
		BN_free(bntmp);
		return strtmp;
		}

		char *i2s_ASN1_INTEGER(method, a)
		X509V3_EXT_METHOD *method;
		ASN1_INTEGER *a;

crypto/x509v3/v3err.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,8 @@
		static ERR_STRING_DATA X509V3_str_functs[]=
		{
		{ERR_PACK(0,X509V3_F_HEX_TO_STRING,0), "hex_to_string"},
		{ERR_PACK(0,X509V3_F_I2S_ASN1_INTEGER,0), "I2S_ASN1_INTEGER"},
		{ERR_PACK(0,X509V3_F_I2S_ASN1_ENUMERATED,0), "I2S_ASN1_ENUMERATED"},
		{ERR_PACK(0,X509V3_F_I2S_ASN1_INTEGER,0), "i2s_ASN1_INTEGER"},
		{ERR_PACK(0,X509V3_F_S2I_ASN1_IA5STRING,0), "S2I_ASN1_IA5STRING"},
		{ERR_PACK(0,X509V3_F_S2I_ASN1_OCTET_STRING,0), "s2i_ASN1_OCTET_STRING"},
		{ERR_PACK(0,X509V3_F_S2I_ASN1_SKEY_ID,0), "S2I_ASN1_SKEY_ID"},