Merging changes from devel to master for the CV2X#3 plugtest

Merging changes from devel to master for the CV2X#3 plugtest

Merge request reports

Loading
+36 −7
Changes for ccsrc/Protocols/Security/security_services.cc: 36 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -189,19 +189,19 @@ int security_services::process_ieee_1609_dot2_signed_data(const Ieee1609Dot2::Si

  // Check p2pcdLearningRequest keys if present
  if (header_info.p2pcdLearningRequest().is_present()) {
    loggers::get_instance().error("security_services::process_ieee_1609_dot2_signed_data: p2pcdLearningRequest not supported yet");
    loggers::get_instance().warning("security_services::process_ieee_1609_dot2_signed_data: p2pcdLearningRequest not supported yet");
    // TODO Not supported by C-ITS Protocol
  }

  // Check missingCrlIdentifier keys if present
  if (header_info.missingCrlIdentifier().is_present()) {
    loggers::get_instance().error("security_services::process_ieee_1609_dot2_signed_data: missingCrlIdentifier not supported yet");
    loggers::get_instance().warning("security_services::process_ieee_1609_dot2_signed_data: missingCrlIdentifier not supported yet");
    // TODO Not supported by C-ITS Protocol
  }

  // Check encryption keys if present
  if (header_info.encryptionKey().is_present()) {
    loggers::get_instance().error("security_services::process_ieee_1609_dot2_signed_data: encryptionKey not supported yet");
    loggers::get_instance().warning("security_services::process_ieee_1609_dot2_signed_data: encryptionKey not supported yet");
    // TODO Not supported by C-ITS Protocol
  }

@@ -219,7 +219,7 @@ int security_services::process_ieee_1609_dot2_signed_data(const Ieee1609Dot2::Si

  // Check requested certificate
  if (header_info.requestedCertificate().is_present()) {
    loggers::get_instance().error("security_services::process_ieee_1609_dot2_signed_data: requestedCertificate not supported yet");
    // loggers::get_instance().error("security_services::process_ieee_1609_dot2_signed_data: requestedCertificate not supported yet");
    // TODO Not supported by C-ITS Protocol
  }

@@ -1268,7 +1268,7 @@ int security_services::extract_verification_keys(const Ieee1609Dot2::Certificate
      p_public_key_x         = p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ecdsaNistP256().uncompressedP256().x();
      p_public_key_y         = p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ecdsaNistP256().uncompressedP256().y();
    } else {
      loggers::get_instance().error("security_services::extract_verification_keys: Unsupported VerificationKey");
      loggers::get_instance().error("security_services::extract_verification_keys: Unsupported ecdsaNistP256 VerificationKey point type %d", p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ecdsaNistP256().get_selection());
      return -1;
    }
  } else if (p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ischosen(Ieee1609Dot2BaseTypes::PublicVerificationKey::ALT_ecdsaBrainpoolP256r1)) {
@@ -1290,7 +1290,13 @@ int security_services::extract_verification_keys(const Ieee1609Dot2::Certificate
                 Ieee1609Dot2BaseTypes::EccP256CurvePoint::ALT_uncompressedP256)) {
      p_public_key_x = p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ecdsaBrainpoolP256r1().uncompressedP256().x();
      p_public_key_y = p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ecdsaBrainpoolP256r1().uncompressedP256().y();
    } else {
      loggers::get_instance().error("security_services::extract_verification_keys: Unsupported ecdsaBrainpoolP256r1 VerificationKey point type %d", p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ecdsaBrainpoolP256r1().get_selection());
      return -1;
    }
  } else if (p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ischosen(Ieee1609Dot2BaseTypes::PublicVerificationKey::ALT_ecdsaBrainpoolP384r1)) {
    if (p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ecdsaBrainpoolP384r1().ischosen(
                 Ieee1609Dot2BaseTypes::EccP384CurvePoint::ALT_compressed__y__0)) {
      p_public_comp_key = p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ecdsaBrainpoolP384r1().compressed__y__0();
      security_ecc ecc(ec_elliptic_curves::brainpool_p_384_r1, p_public_comp_key, ecc_compressed_mode::compressed_y_0);
      p_public_key_x         = ecc.public_key_x();
@@ -1308,11 +1314,34 @@ int security_services::extract_verification_keys(const Ieee1609Dot2::Certificate
      p_public_key_x = p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ecdsaBrainpoolP384r1().uncompressedP384().x();
      p_public_key_y = p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ecdsaBrainpoolP384r1().uncompressedP384().y();
    } else {
      loggers::get_instance().error("security_services::extract_verification_keys: Unsupported VerificationKey");
      loggers::get_instance().error("security_services::extract_verification_keys: Unsupported ecdsaBrainpoolP384r1 VerificationKey point type %d", p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ecdsaBrainpoolP384r1().get_selection());
      return -1;
    }
  } else if (p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ischosen(Ieee1609Dot2BaseTypes::PublicVerificationKey::ALT_ecdsaNistP384)) {
    if (p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ecdsaNistP384().ischosen(
                 Ieee1609Dot2BaseTypes::EccP384CurvePoint::ALT_compressed__y__0)) {
      p_public_comp_key = p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ecdsaNistP384().compressed__y__0();
      security_ecc ecc(ec_elliptic_curves::nist_p_384, p_public_comp_key, ecc_compressed_mode::compressed_y_0);
      p_public_key_x         = ecc.public_key_x();
      p_public_key_y         = ecc.public_key_y();
      p_public_comp_key_mode = INTEGER(0);
    } else if (p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ecdsaNistP384().ischosen(
                 Ieee1609Dot2BaseTypes::EccP384CurvePoint::ALT_compressed__y__1)) {
      p_public_comp_key = p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ecdsaNistP384().compressed__y__1();
      security_ecc ecc(ec_elliptic_curves::nist_p_384, p_public_comp_key, ecc_compressed_mode::compressed_y_1);
      p_public_key_x         = ecc.public_key_x();
      p_public_key_y         = ecc.public_key_y();
      p_public_comp_key_mode = INTEGER(1);
    } else if (p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ecdsaNistP384().ischosen(
                 Ieee1609Dot2BaseTypes::EccP384CurvePoint::ALT_uncompressedP384)) {
      p_public_key_x = p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ecdsaNistP384().uncompressedP384().x();
      p_public_key_y = p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ecdsaNistP384().uncompressedP384().y();
    } else {
      loggers::get_instance().error("security_services::extract_verification_keys: Unsupported ecdsaNistP384 VerificationKey point type %d", p_cert.toBeSigned().verifyKeyIndicator().verificationKey().ecdsaNistP384().get_selection());
      return -1;
    }
  } else {
    loggers::get_instance().error("security_services::extract_verification_keys: Unsupported VerificationKey");
    loggers::get_instance().error("security_services::extract_verification_keys: Unsupported VerificationKey curve %d", p_cert.toBeSigned().verifyKeyIndicator().verificationKey().get_selection());
    return -1;
  }

+1 −1
Changes for data/certificates/profiles/CERT_IUT_A_RCA.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@
			<aid value="101"/>  <!-- not allocated -->
			<aid value="102"/>  <!-- not allocated -->
		</attribute>
		<attribute type="its_aid_list" minChainLength="1">
		<attribute type="its_aid_list" minChainLength="2">
			<aid value="CRT-REQ">01 FE/FF 01</aid> <!-- Cert request: any -->
		</attribute>
		<attribute type="its_aid_ssp_list">
+2
Changes for data/certificates/profiles/CERT_IUT_C1_AT.xml: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -27,10 +27,12 @@
	</subject>
	<validity>
		<restriction type="time" start="+0d" end="+365d"/>
		<restriction type="region">
			<rectangle>
				<location latitude="+10km" longitude="-10km"/>
				<location latitude="+5km" longitude="-5km" />
			</rectangle>
		</restriction>
	</validity>
	<signature algorithm="0"/>
</certificate>
+46
Changes for data/certificates/profiles/CERT_IUT_C2_AA.xml: 46 added lines, 0 removed lines.
Original line number Diff line number Diff line
<certificate>
	<version>3</version>
	<signer type="digest" name="CERT_IUT_C_RCA"/>
	<subject type="AA" name="">
		<!-- verification_key -->
		<attribute type="verification_key">
			<public_key algorithm="ecdsa_nistp256_with_sha256">
				<ecc_point type="compressed"/>
			</public_key>
		</attribute>
		<!-- encryption_key -->
		<attribute type="encryption_key">
			<public_key sym_alg="0" algorithm="0">
				><ecc_point type="compressed"/>
			</public_key>
		</attribute>
		<!-- assurance_level -->
		<attribute type="assurance_level">
			<assurance level="4" confidence="0"/>
		</attribute>
		<!-- its_aid_list -->
		<attribute type="its_aid_list">
			<aid value="CAM"/>  <!--CAM-->
			<aid value="DENM"/>  <!--DENM-->
			<aid value="SPAT"/> <!-- TLM / SPAT -->
			<aid value="MAP"/> <!-- RLT / MAP-->
			<aid value="IVI"/> <!-- IVI -->
			<aid value="SREM"/> <!-- TLC REQUEST-->
			<aid value="SSEM"/> <!-- TLC RESPONSE -->
			<aid value="GN-MGMT"/> <!-- GN-MGMT -->
		</attribute>
		<attribute type="its_aid_ssp_list">
			<ssp aid="CRT-REQ">01 32</ssp> <!-- Cert request:  -->
		</attribute>
	</subject>
	<validity>
		<restriction type="time" start="-365d" end="+730d"/>
		<restriction type="region">
			<rectangle>
				<location latitude="+5km" longitude="-5km"/>
				<location latitude="+5km" longitude="-5km" />
			</rectangle>
		</restriction>
	</validity>
	<signature algorithm="0"/>
</certificate>
+35
Changes for data/certificates/profiles/CERT_IUT_C2_AT.xml: 35 added lines, 0 removed lines.
Original line number Diff line number Diff line
<certificate>
	<version>3</version>
	<signer type="digest" name="CERT_IUT_C2_AA"/>
	<subject type="AT" name="">
		<!-- verification_key -->
		<attribute type="verification_key">
			<public_key algorithm="0">
				<ecc_point type="compressed"/>
			</public_key>
		</attribute>
		<!-- encryption_key -->
		<attribute type="encryption_key">
			<public_key sym_alg="0" algorithm="0">
				><ecc_point type="compressed"/>
			</public_key>
		</attribute>
		<!-- assurance_level -->
		<attribute type="assurance_level">
			<assurance level="3"/>
		</attribute>
		<!-- its_aid_ssp_list -->
		<attribute type="its_aid_ssp_list">
			<ssp aid="CAM">01 FF FC</ssp>  <!-- CAM -->
			<ssp aid="DENM">01 FF FF FF</ssp>  <!-- DENM -->
			<ssp aid="GN-MGMT"></ssp> <!--ssp aid="GN-MGMT">00</ssp-->  <!-- GN-MGMT -->
		</attribute>
	</subject>
	<validity>
		<restriction type="time" start="+0d" end="+365d"/>
		<restriction type="region">
			<none/>
		</restriction>
	</validity>
	<signature algorithm="0"/>
</certificate>
Loading
Loading