Support for policy constraints. (f80153e2) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

CHANGES

+3 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,9 @@

		Changes between 0.9.7a and 0.9.8 [xx XXX xxxx]

		*) Support for policyConstraints certificate extension.
		[Steve Henson]

		*) Support for policyMappings certificate extension.
		[Steve Henson]

crypto/x509v3/Makefile.ssl

+2 −2

Original line number	Diff line number	Diff line
		@@ -26,11 +26,11 @@ 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_enum.c v3_sxnet.c v3_cpols.c v3_crld.c v3_purp.c v3_info.c \
		v3_ocsp.c v3_akeya.c v3_pmaps.c
		v3_ocsp.c v3_akeya.c v3_pmaps.c v3_pcons.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_enum.o v3_sxnet.o v3_cpols.o v3_crld.o v3_purp.o v3_info.o \
		v3_ocsp.o v3_akeya.o v3_pmaps.o
		v3_ocsp.o v3_akeya.o v3_pmaps.o v3_pcons.o

		SRC= $(LIBSRC)

crypto/x509v3/ext_dat.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ extern X509V3_EXT_METHOD v3_crl_num, v3_crl_reason, v3_crl_invdate, v3_cpols, v3
		extern X509V3_EXT_METHOD v3_ocsp_nonce, v3_ocsp_accresp, v3_ocsp_acutoff;
		extern X509V3_EXT_METHOD v3_ocsp_crlid, v3_ocsp_nocheck, v3_ocsp_serviceloc;
		extern X509V3_EXT_METHOD v3_crl_hold;
		extern X509V3_EXT_METHOD v3_policy_mappings;
		extern X509V3_EXT_METHOD v3_policy_mappings, v3_policy_constraints;

		/* This table will be searched using OBJ_bsearch so it must kept in
		* order of the ext_nid values.
		@@ -105,6 +105,7 @@ static X509V3_EXT_METHOD *standard_exts[] = {
		&v3_ocsp_serviceloc,
		#endif
		&v3_sinfo,
		&v3_policy_constraints,
		#ifndef OPENSSL_NO_OCSP
		&v3_crl_hold,
		#endif

crypto/x509v3/v3_conf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -134,7 +134,7 @@ static X509_EXTENSION do_ext_nconf(CONF conf, X509V3_CTX *ctx, int ext_nid,
		{
		if(*value == '@') nval = NCONF_get_section(conf, value + 1);
		else nval = X509V3_parse_list(value);
		if(!nval)
		if(sk_CONF_VALUE_num(nval) <= 0)
		{
		X509V3err(X509V3_F_X509V3_EXT_CONF,X509V3_R_INVALID_EXTENSION_STRING);
		ERR_add_error_data(4, "name=", OBJ_nid2sn(ext_nid), ",section=", value);

crypto/x509v3/v3_pcons.c

0 → 100644

+136 −0

Original line number	Diff line number	Diff line
		/* v3_pcons.c */
		/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
		* project.
		*/
		/* ====================================================================
		* Copyright (c) 2003 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 "cryptlib.h"
		#include <openssl/asn1.h>
		#include <openssl/asn1t.h>
		#include <openssl/conf.h>
		#include <openssl/x509v3.h>

		static STACK_OF(CONF_VALUE) i2v_POLICY_CONSTRAINTS(X509V3_EXT_METHOD method,
		void bcons, STACK_OF(CONF_VALUE) extlist);
		static void v2i_POLICY_CONSTRAINTS(X509V3_EXT_METHOD method,
		X509V3_CTX ctx, STACK_OF(CONF_VALUE) values);

		X509V3_EXT_METHOD v3_policy_constraints = {
		NID_policy_constraints, 0,
		ASN1_ITEM_ref(POLICY_CONSTRAINTS),
		0,0,0,0,
		0,0,
		i2v_POLICY_CONSTRAINTS,
		v2i_POLICY_CONSTRAINTS,
		NULL,NULL,
		NULL
		};

		ASN1_SEQUENCE(POLICY_CONSTRAINTS) = {
		ASN1_OPT(POLICY_CONSTRAINTS, requireExplicitPolicy, ASN1_INTEGER),
		ASN1_OPT(POLICY_CONSTRAINTS, inhibitPolicyMapping, ASN1_INTEGER)
		} ASN1_SEQUENCE_END(POLICY_CONSTRAINTS)

		IMPLEMENT_ASN1_ALLOC_FUNCTIONS(POLICY_CONSTRAINTS)


		static STACK_OF(CONF_VALUE) i2v_POLICY_CONSTRAINTS(X509V3_EXT_METHOD method,
		void a, STACK_OF(CONF_VALUE) extlist)
		{
		POLICY_CONSTRAINTS *pcons = a;
		X509V3_add_value_int("Require Explicit Policy",
		pcons->requireExplicitPolicy, &extlist);
		X509V3_add_value_int("Inhibit Policy Mapping",
		pcons->inhibitPolicyMapping, &extlist);
		return extlist;
		}

		static void v2i_POLICY_CONSTRAINTS(X509V3_EXT_METHOD method,
		X509V3_CTX ctx, STACK_OF(CONF_VALUE) values)
		{
		POLICY_CONSTRAINTS *pcons=NULL;
		CONF_VALUE *val;
		int i;
		if(!(pcons = POLICY_CONSTRAINTS_new())) {
		X509V3err(X509V3_F_V2I_POLICY_CONSTRAINTS, ERR_R_MALLOC_FAILURE);
		return NULL;
		}
		for(i = 0; i < sk_CONF_VALUE_num(values); i++) {
		val = sk_CONF_VALUE_value(values, i);
		if(!strcmp(val->name, "requireExplicitPolicy")) {
		if(!X509V3_get_value_int(val,
		&pcons->requireExplicitPolicy)) goto err;
		} else if(!strcmp(val->name, "inhibitPolicyMapping")) {
		if(!X509V3_get_value_int(val,
		&pcons->inhibitPolicyMapping)) goto err;
		} else {
		X509V3err(X509V3_F_V2I_POLICY_CONSTRAINTS, X509V3_R_INVALID_NAME);
		X509V3_conf_err(val);
		goto err;
		}
		}
		if (!pcons->inhibitPolicyMapping && !pcons->requireExplicitPolicy) {
		X509V3err(X509V3_F_V2I_POLICY_CONSTRAINTS, X509V3_R_ILLEGAL_EMPTY_EXTENSION);
		goto err;
		}

		return pcons;
		err:
		POLICY_CONSTRAINTS_free(pcons);
		return NULL;
		}