Commit e0250cb2 authored Mar 17, 2016 by garciay

STF507 week#11: Enforce f_waitForCertificate

                Build with TCT3

parent 077f7a79

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2453,10 +2453,12 @@ module LibItsGeoNetworking_Functions {
	var SignerInfo v_si;		var SignerInfo v_si;

	if (f_getMsgSignerInfo(v_recv, v_si) == true) {		if (f_getMsgSignerInfo(v_recv, v_si) == true) {
			if (ischosen(v_si.signerInfo.certificate)) {
	p_cert := v_si.signerInfo.certificate;		p_cert := v_si.signerInfo.certificate;
	v_ret := true;		v_ret := true;
	}		}
	}		}
			}
	} // End of 'alt' statement		} // End of 'alt' statement

	return v_ret;		return v_ret;

ttcn/Security/LibItsSecurity_Functions.ttcn3

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1839,15 +1839,15 @@ module LibItsSecurity_Functions {
	var integer v_counter := 0;		var integer v_counter := 0;

	// Convert rectangular regions to polygons and check polygons		// Convert rectangular regions to polygons and check polygons
	p_region[0] := p_rectangular_region.northwest;		p_region[0] := valueof(p_rectangular_region.northwest);
	p_region[1] := {		p_region[1] := {
	p_rectangular_region.northwest.latitude + p_rectangular_region.southeast.latitude,		valueof(p_rectangular_region.northwest.latitude) + valueof(p_rectangular_region.southeast.latitude),
	p_rectangular_region.northwest.longitude		valueof(p_rectangular_region.northwest.longitude)
	};		};
	p_region[2] := p_rectangular_region.southeast;		p_region[2] := valueof(p_rectangular_region.southeast);
	p_region[3] := {		p_region[3] := {
	p_rectangular_region.northwest.latitude,		valueof(p_rectangular_region.northwest.latitude),
	p_rectangular_region.northwest.longitude + p_rectangular_region.southeast.longitude		valueof(p_rectangular_region.northwest.longitude) + valueof(p_rectangular_region.southeast.longitude)
	};		};
	log("f_convertRectangularRegionIntoPolygonalRegion: DEBUG: Northwest location is invalid in rect ", p_region);		log("f_convertRectangularRegionIntoPolygonalRegion: DEBUG: Northwest location is invalid in rect ", p_region);