Merge Dirk's changes (ee4147b5) · Commits · TTCN-3 Libraries / LibIts

ttcn/Security/LibItsSecurity_Functions.ttcn3

+12 −24

Original line number	Original line	Diff line number	Diff line
	@@ -521,8 +521,7 @@ module LibItsSecurity_Functions {
	m_signerInfo_certificate(		m_signerInfo_certificate(
	v_atCertificate		v_atCertificate
	)));		)));
	}		} else if (valueof(p_signerInfoType) == e_certificate_chain) { // Add the AT certificate + AA Certificate
	if (valueof(p_signerInfoType) == e_certificate_chain) { // Add the AT certificate + AA Certificate
	v_signerInfo := valueof(		v_signerInfo := valueof(
	m_header_field_signer_info(		m_header_field_signer_info(
	m_signerInfo_certificates(		m_signerInfo_certificates(
	@@ -532,8 +531,7 @@ module LibItsSecurity_Functions {
	}		}
	)		)
	));		));
	}		} else if (valueof(p_signerInfoType) == e_certificate_digest_with_sha256) { // Add the AT certificate digest
	if (valueof(p_signerInfoType) == e_certificate_digest_with_sha256) { // Add the AT certificate digest
	v_signerInfo := valueof(		v_signerInfo := valueof(
	m_header_field_signer_info(		m_header_field_signer_info(
	m_signerInfo_digest(		m_signerInfo_digest(
	@@ -610,8 +608,7 @@ module LibItsSecurity_Functions {
	m_signerInfo_certificate(		m_signerInfo_certificate(
	v_atCertificate		v_atCertificate
	)));		)));
	}		} else if (valueof(p_signerInfoType) == e_certificate_chain) { // Add the AT certificate + AA Certificate
	if (valueof(p_signerInfoType) == e_certificate_chain) { // Add the AT certificate + AA Certificate
	v_signerInfo := valueof(		v_signerInfo := valueof(
	m_header_field_signer_info(		m_header_field_signer_info(
	m_signerInfo_certificates(		m_signerInfo_certificates(
	@@ -621,8 +618,7 @@ module LibItsSecurity_Functions {
	}		}
	)		)
	));		));
	}		} else if (valueof(p_signerInfoType) == e_certificate_digest_with_sha256) { // Add the AT certificate digest
	if (valueof(p_signerInfoType) == e_certificate_digest_with_sha256) { // Add the AT certificate digest
	v_signerInfo := valueof(		v_signerInfo := valueof(
	m_header_field_signer_info(		m_header_field_signer_info(
	m_signerInfo_digest(		m_signerInfo_digest(
	@@ -680,8 +676,7 @@ module LibItsSecurity_Functions {
	m_signerInfo_certificate(		m_signerInfo_certificate(
	v_atCertificate		v_atCertificate
	)));		)));
	}		} else if (valueof(p_signerInfoType) == e_certificate_chain) { // Add the AT certificate + AA Certificate
	if (valueof(p_signerInfoType) == e_certificate_chain) { // Add the AT certificate + AA Certificate
	v_signerInfo := valueof(		v_signerInfo := valueof(
	m_header_field_signer_info(		m_header_field_signer_info(
	m_signerInfo_certificates(		m_signerInfo_certificates(
	@@ -691,8 +686,7 @@ module LibItsSecurity_Functions {
	}		}
	)		)
	));		));
	}		} else if (valueof(p_signerInfoType) == e_certificate_digest_with_sha256) { // Add the AT certificate digest
	if (valueof(p_signerInfoType) == e_certificate_digest_with_sha256) { // Add the AT certificate digest
	v_signerInfo := valueof(		v_signerInfo := valueof(
	m_header_field_signer_info(		m_header_field_signer_info(
	m_signerInfo_digest(		m_signerInfo_digest(
	@@ -759,8 +753,7 @@ module LibItsSecurity_Functions {
	m_signerInfo_certificate(		m_signerInfo_certificate(
	v_atCertificate		v_atCertificate
	)));		)));
	}		} else if (valueof(p_signerInfoType) == e_certificate_chain) { // Add the AT certificate + AA Certificate
	if (valueof(p_signerInfoType) == e_certificate_chain) { // Add the AT certificate + AA Certificate
	v_signerInfo := valueof(		v_signerInfo := valueof(
	m_header_field_signer_info(		m_header_field_signer_info(
	m_signerInfo_certificates(		m_signerInfo_certificates(
	@@ -770,8 +763,7 @@ module LibItsSecurity_Functions {
	}		}
	)		)
	));		));
	}		} else if (valueof(p_signerInfoType) == e_certificate_digest_with_sha256) { // Add the AT certificate digest
	if (valueof(p_signerInfoType) == e_certificate_digest_with_sha256) { // Add the AT certificate digest
	v_signerInfo := valueof(		v_signerInfo := valueof(
	m_header_field_signer_info(		m_header_field_signer_info(
	m_signerInfo_digest(		m_signerInfo_digest(
	@@ -831,8 +823,7 @@ module LibItsSecurity_Functions {
	m_signerInfo_certificate(		m_signerInfo_certificate(
	v_atCertificate		v_atCertificate
	)));		)));
	}		} else if (valueof(p_signerInfoType) == e_certificate_chain) { // Add the AT certificate + AA Certificate
	if (valueof(p_signerInfoType) == e_certificate_chain) { // Add the AT certificate + AA Certificate
	v_signerInfo := valueof(		v_signerInfo := valueof(
	m_header_field_signer_info(		m_header_field_signer_info(
	m_signerInfo_certificates(		m_signerInfo_certificates(
	@@ -842,8 +833,7 @@ module LibItsSecurity_Functions {
	}		}
	)		)
	));		));
	}		} else if (valueof(p_signerInfoType) == e_certificate_digest_with_sha256) { // Add the AT certificate digest
	if (valueof(p_signerInfoType) == e_certificate_digest_with_sha256) { // Add the AT certificate digest
	v_signerInfo := valueof(		v_signerInfo := valueof(
	m_header_field_signer_info(		m_header_field_signer_info(
	m_signerInfo_digest(		m_signerInfo_digest(
	@@ -908,8 +898,7 @@ module LibItsSecurity_Functions {
	m_signerInfo_certificate(		m_signerInfo_certificate(
	v_atCertificate		v_atCertificate
	)));		)));
	}		} else if (valueof(p_signerInfoType) == e_certificate_chain) { // Add the AT certificate + AA Certificate
	if (valueof(p_signerInfoType) == e_certificate_chain) { // Add the AT certificate + AA Certificate
	v_signerInfo := valueof(		v_signerInfo := valueof(
	m_header_field_signer_info(		m_header_field_signer_info(
	m_signerInfo_certificates(		m_signerInfo_certificates(
	@@ -919,8 +908,7 @@ module LibItsSecurity_Functions {
	}		}
	)		)
	));		));
	}		} else if (valueof(p_signerInfoType) == e_certificate_digest_with_sha256) { // Add the AT certificate digest
	if (valueof(p_signerInfoType) == e_certificate_digest_with_sha256) { // Add the AT certificate digest
	v_signerInfo := valueof(		v_signerInfo := valueof(
	m_header_field_signer_info(		m_header_field_signer_info(
	m_signerInfo_digest(		m_signerInfo_digest(

ttcn/Security/LibItsSecurity_Pixits.ttcn3

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -33,7 +33,7 @@ module LibItsSecurity_Pixits {
	/**		/**
	* @desc ITS-AID value for other profile. Default: 38		* @desc ITS-AID value for other profile. Default: 38
	*/		*/
	modulepar IntX PX_OTHER_ITS_AID := 38;		modulepar IntX PX_OTHER_ITS_AID := 141; // Assign to GN-MGMT, Other than CA, DEN, MAP, SPAT, IVI, SRE, SSE & GN-MGMT: 38

	/**		/**
	* @desc Invalid protocol version. Default: 1		* @desc Invalid protocol version. Default: 1

Admin message