Commit f18433d9 authored Sep 11, 2014 by filatov

Add f_isIdentifiedRegionInside (TODO)

Add default params for mw_subject_attribute_XXX

parent b1542c3a

ttcn/Security/LibItsSecurity_Functions.ttcn3

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8,6 +8,7 @@
	module LibItsSecurity_Functions {		module LibItsSecurity_Functions {

	// Libcommon		// Libcommon
			import from LibCommon_BasicTypesAndValues all;
	import from LibCommon_DataStrings all;		import from LibCommon_DataStrings all;

	// LibItsCommon		// LibItsCommon
	@@ -744,6 +745,13 @@ module LibItsSecurity_Functions {
	// TODO: call external function		// TODO: call external function
	return true;		return true;
	}		}

			function f_isIdentifiedRegionInside(in template (value) UInt16 p_parent,
			in template (value) UInt16 p_region
			) return boolean {
			// TODO: call external function
			return p_parent == p_region;
			}
	}		}

	} // End of module LibItsSecurity_Functions		} // End of module LibItsSecurity_Functions
			No newline at end of file

ttcn/Security/LibItsSecurity_Templates.ttcn3

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1661,7 +1661,7 @@ module LibItsSecurity_Templates {
	group subjectAttribute {		group subjectAttribute {

	template (present) SubjectAttribute mw_subject_attribute_verification_key(		template (present) SubjectAttribute mw_subject_attribute_verification_key(
	in template (present) PublicKey p_key		in template (present) PublicKey p_key := ?
	) := {		) := {
	type_ := e_verification_key,		type_ := e_verification_key,
	attribute := {		attribute := {
	@@ -1670,16 +1670,16 @@ module LibItsSecurity_Templates {
	} // End of template mw_subject_attribute_verification_key		} // End of template mw_subject_attribute_verification_key

	template (present) SubjectAttribute mw_subject_attribute_encryption_key(		template (present) SubjectAttribute mw_subject_attribute_encryption_key(
	in template (present) EccPoint p_rv		in template (present) EccPoint p_rv := ?
	) := {		) := {
	type_ := e_verification_key,		type_ := e_encryption_key,
	attribute := {		attribute := {
	rv := p_rv		rv := p_rv
	}		}
	} // End of template mw_subject_attribute_encryption_key		} // End of template mw_subject_attribute_encryption_key

	template (present) SubjectAttribute mw_subject_attribute_assurance_level(		template (present) SubjectAttribute mw_subject_attribute_assurance_level(
	in template (present) SubjectAssurance p_assurance_level		in template (present) SubjectAssurance p_assurance_level := ?
	) := {		) := {
	type_ := e_assurance_level,		type_ := e_assurance_level,
	attribute := {		attribute := {
	@@ -1688,7 +1688,7 @@ module LibItsSecurity_Templates {
	} // End of template mw_subject_attribute_assurance_level		} // End of template mw_subject_attribute_assurance_level

	template (present) SubjectAttribute mw_subject_attribute_reconstruction_value(		template (present) SubjectAttribute mw_subject_attribute_reconstruction_value(
	in template (present) IntXs p_its_aid_list		in template (present) IntXs p_its_aid_list := ?
	) := {		) := {
	type_ := e_reconstruction_value,		type_ := e_reconstruction_value,
	attribute := {		attribute := {