Rebuild with Titan (940b00d4) · Commits · TTCN-3 Libraries / LibIts

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2612,7 +2612,7 @@ module LibItsGeoNetworking_Functions {
	[] a_securedMessageWithCertificate(v_recv) {		[] a_securedMessageWithCertificate(v_recv) {
	if(f_getMsgSignerInfo(v_recv, v_si)) {		if(f_getMsgSignerInfo(v_recv, v_si)) {
	if(f_getCertificateSignerInfo(v_si.signerInfo.certificate, v_si)) {		if(f_getCertificateSignerInfo(v_si.signerInfo.certificate, v_si)) {
	if(match (v_si.type_, e_certificate_digest_with_sha256)) {		if(v_si.type_ == e_certificate_digest_with_sha256) {
	f_sendCertificateRequest(v_si.signerInfo.digest, p_CamPayload);		f_sendCertificateRequest(v_si.signerInfo.digest, p_CamPayload);
	if(tc_ac.running) {		if(tc_ac.running) {
	tc_ac.stop;tc_ac.start;		tc_ac.stop;tc_ac.start;
	@@ -2643,7 +2643,7 @@ module LibItsGeoNetworking_Functions {
	tc_ac.stop;		tc_ac.stop;
	if(f_getMsgSignerInfo(v_recv, v_si)) {		if(f_getMsgSignerInfo(v_recv, v_si)) {
	if(f_getCertificateSignerInfo(v_si.signerInfo.certificate, v_si)) {		if(f_getCertificateSignerInfo(v_si.signerInfo.certificate, v_si)) {
	if(match (v_si.type_, e_certificate_digest_with_sha256)) {		if(v_si.type_ == e_certificate_digest_with_sha256) {
	f_sendCertificateRequest(v_si.signerInfo.digest, p_CamPayload);		f_sendCertificateRequest(v_si.signerInfo.digest, p_CamPayload);
	tc_ac.start;		tc_ac.start;
	repeat;		repeat;

ttcn/IVIM/LibItsIvim_Templates.ttcn

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -140,9 +140,9 @@ module LibItsIvim_Templates {
	template (omit) IVIManagementContainer.connectedIviStructures p_connectedIviStructures := omit,		template (omit) IVIManagementContainer.connectedIviStructures p_connectedIviStructures := omit,
	template (omit) IviStructure.optional_ p_optional_ := omit*/		template (omit) IviStructure.optional_ p_optional_ := omit*/
	) := {		) := {
	repetitionInterval := p_repetitionInterval,
	validFrom := p_validFrom,		validFrom := p_validFrom,
	validTo := p_validTo/*,		validTo := p_validTo/*,
			repetitionInterval := p_repetitionInterval,
	connectedIviStructures := p_connectedIviStructures,		connectedIviStructures := p_connectedIviStructures,
	optional_ := p_optional_*/		optional_ := p_optional_*/
	} // End of template m_utTriggerEvent		} // End of template m_utTriggerEvent

ttcn/Security/LibItsSecurity_Functions.ttcn3

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -1629,39 +1629,39 @@ module LibItsSecurity_Functions {
	v_cert_issuer_region_result := f_getCertificateValidityRestriction(p_cert_issuer, e_region, v_cert_issuer_region);		v_cert_issuer_region_result := f_getCertificateValidityRestriction(p_cert_issuer, e_region, v_cert_issuer_region);
	if (f_getCertificateValidityRestriction(p_cert, e_region, v_cert_region) == false) {		if (f_getCertificateValidityRestriction(p_cert, e_region, v_cert_region) == false) {
	if (v_cert_issuer_region_result == true) {		if (v_cert_issuer_region_result == true) {
	if (not match(v_cert_issuer_region.validity.region.region_type, e_none)) {		if (v_cert_issuer_region.validity.region.region_type != e_none) {
	return false;		return false;
	}		}
	}		}
	} else if (		} else if (
	(v_cert_issuer_region_result == true) and		(v_cert_issuer_region_result == true) and
	(not match(v_cert_issuer_region.validity.region.region_type, e_none))		(v_cert_issuer_region.validity.region.region_type != e_none)
	) {		) {
	if (match(v_cert_region.validity.region.region_type, e_circle)) {		if (v_cert_region.validity.region.region_type == e_circle) {
	if (match(v_cert_issuer_region.validity.region.region_type, e_circle)) {		if (v_cert_issuer_region.validity.region.region_type == e_circle) {
	// Check v_cert_region 'circle' is inside v_cert_issuer_region 'circle'		// Check v_cert_region 'circle' is inside v_cert_issuer_region 'circle'
	if (f_areCirclesInside(v_cert_region.validity.region.region.circular_region, v_cert_issuer_region.validity.region.region.circular_region) == false) {		if (f_areCirclesInside(v_cert_region.validity.region.region.circular_region, v_cert_issuer_region.validity.region.region.circular_region) == false) {
	log("* " & testcasename() & ": FAIL: Issuer and issuing certificates circle area does not match *");		log("* " & testcasename() & ": FAIL: Issuer and issuing certificates circle area does not match *");
	return false;		return false;
	}		}
	}		}
	} else if (match(v_cert_region.validity.region.region_type, e_rectangle)) {		} else if (v_cert_region.validity.region.region_type == e_rectangle) {
	if (match(v_cert_issuer_region.validity.region.region_type, e_rectangle)) {		if (v_cert_issuer_region.validity.region.region_type == e_rectangle) {
	// Check v_cert_region 'rectangle' is inside v_cert_issuer_region 'rectangle'		// Check v_cert_region 'rectangle' is inside v_cert_issuer_region 'rectangle'
	if (f_areRectanglesInside(v_cert_region.validity.region.region.rectangular_region, v_cert_issuer_region.validity.region.region.rectangular_region) == false) {		if (f_areRectanglesInside(v_cert_region.validity.region.region.rectangular_region, v_cert_issuer_region.validity.region.region.rectangular_region) == false) {
	log("* " & testcasename() & ": FAIL: Issuer and issuing certificates rectangle area does not match *");		log("* " & testcasename() & ": FAIL: Issuer and issuing certificates rectangle area does not match *");
	return false;		return false;
	}		}
	}		}
	} else if (match(v_cert_region.validity.region.region_type, e_polygon)) {		} else if (v_cert_region.validity.region.region_type == e_polygon) {
	if (match(v_cert_issuer_region.validity.region.region_type, e_polygon)) {		if (v_cert_issuer_region.validity.region.region_type == e_polygon) {
	// Check v_cert_region 'polygon' is inside v_cert_issuer_region 'polygon'		// Check v_cert_region 'polygon' is inside v_cert_issuer_region 'polygon'
	if (f_arePolygonsInside(v_cert_region.validity.region.region.polygonal_region, v_cert_issuer_region.validity.region.region.polygonal_region) == false) {		if (f_arePolygonsInside(v_cert_region.validity.region.region.polygonal_region, v_cert_issuer_region.validity.region.region.polygonal_region) == false) {
	log("* " & testcasename() & ": FAIL: Issuer and issuing certificates polygon area does not match *");		log("* " & testcasename() & ": FAIL: Issuer and issuing certificates polygon area does not match *");
	return false;		return false;
	}		}
	}		}
	} else if (match(v_cert_region.validity.region.region_type,e_id)) {		} else if (v_cert_region.validity.region.region_type == e_id) {
	// Check id_region		// Check id_region
	if (not match (v_cert_region.validity.region, mw_geographicRegion_identified(mw_identifiedRegion_iso3166_any))) {		if (not match (v_cert_region.validity.region, mw_geographicRegion_identified(mw_identifiedRegion_iso3166_any))) {
	log("* " & testcasename() & ": FAIL: Identified region is not conformed to ISO 3166-1 *");		log("* " & testcasename() & ": FAIL: Identified region is not conformed to ISO 3166-1 *");

Admin message