Skip to content
GitLab
Commit 5eeb619d authored by Yann Garcia's avatar Yann Garcia
Browse files

Resolve conflict from merge

parents c14b2e57 e7bd6454
Hide whitespace changes
Inline Side-by-side
ttcn/Pki/LibItsPki_Functions.ttcn
View file @ 5eeb619d
......@@ -3111,7 +3111,7 @@ module LibItsPki_Functions {
log(">>> f_sign_dc_ctl");
f_readSigningKey(p_issuer_certificate_id, v_private_key)
f_readSigningKey(p_issuer_certificate_id, v_private_key);
f_getCertificateHash(p_issuer_certificate_id, v_issuer);
// Encode the main data structure
......
ttcn/Security/LibItsSecurity_TypesAndValues.ttcn
View file @ 5eeb619d
......@@ -14,7 +14,7 @@ module LibItsSecurity_TypesAndValues {
// LibCommon
import from LibCommon_BasicTypesAndValues all;
import from LibCommon_DataStrings all;
// LibItsCommon
import from LibItsCommon_Pixits all;
......@@ -22,24 +22,23 @@ module LibItsSecurity_TypesAndValues {
import from IEEE1609dot2BaseTypes language "ASN.1:1997" all;
import from IEEE1609dot2 language "ASN.1:1997" all;
import from EtsiTs103097Module language "ASN.1:1997" all;
/**
* @desc Sequence of HashedId8
*/
type record of HashedId8 HashedId8s;
// Test Adapter certificates & private keys - Valid behavior
const charstring cc_taCert_A := PX_CERT_FOR_TS; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT */
const charstring cc_taCert_A_AA := "CERT_TS_A_AA";
const charstring cc_taCert_A_EA := "CERT_TS_A_EA";
const charstring cc_taCert_A1 := "CERT_TS_A_A1_AT"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT */
const charstring cc_taCert_A2 := "CERT_TS_A_A2_AT"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT */
const charstring cc_taCert_A3 := "CERT_TS_A_A3_AT"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT */
const charstring cc_taCert_B := "CERT_TS_B_AT"; /** Default certificate, with circular region, to be used when secured messages are sent from TA to IUT */
const charstring cc_taCert_B1 := "CERT_TS_B_1_AT";
const charstring cc_taCert_A1 := "CERT_TS_A_A1_AT"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT */
const charstring cc_taCert_A2 := "CERT_TS_A_A2_AT"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT */
const charstring cc_taCert_A3 := "CERT_TS_A_A3_AT"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT */
const charstring cc_taCert_B := "CERT_TS_B_AT"; /** Default certificate, with circular region, to be used when secured messages are sent from TA to IUT */
const charstring cc_taCert_B1 := "CERT_TS_B_1_AT";
const charstring cc_taCert_B_AA := "CERT_TS_B_1_AA";
const charstring cc_taCert_C := "CERT_TS_C_AT"; /** Certificate with a rectangular region, to be used when secured messages are sent from TA to IUT */
const charstring cc_taCert_C1 := "CERT_TS_C1_AT"; /** Certificate with a rectangular region, to be used when secured messages are sent from TA to IUT */
const charstring cc_taCert_C := "CERT_TS_C_AT"; /** Certificate with a rectangular region, to be used when secured messages are sent from TA to IUT */
const charstring cc_taCert_C1 := "CERT_TS_C1_AT"; /** Certificate with a rectangular region, to be used when secured messages are sent from TA to IUT */
const charstring cc_taCert_CA1 := "CERT_TS_CA1_AT"; /** Certificate with a rectangular region, to be used when secured messages are sent from TA to IUT */
const charstring cc_taCert_D := "CERT_TS_D_AT"; /** Certificate with a polygonal region, to be used when secured messages are sent from TA to IUT */
const charstring cc_taCert_E := "CERT_TS_E_AT"; /** Certificate with a region identifier, to be used when secured messages are sent from TA to IUT */
......@@ -142,20 +141,29 @@ module LibItsSecurity_TypesAndValues {
const charstring cc_taCert1901_BO := "CERT_TS_19_01_BO_AT"; /** Check that IUT discards a SecuredMessage if the reserved region type has been used in region validity restriction of the AT certificate */
// IUT certificates & private keys
const charstring cc_taCert_CA2 := "CERT_IUT_CA2_AT";
const charstring cc_taCert_CA3 := "CERT_IUT_CA3_AT";
const charstring cc_taCert_CC_AA := "CERT_IUT_CC_AA";
const charstring cc_iutCert_A := "CERT_IUT_A_AT"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT */
const charstring cc_iutCert_A_AA := "CERT_IUT_A_AA"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT - NistP256*/
const charstring cc_iutCert_A_N := "CERT_IUT_A_N_AT";
const charstring cc_iutCert_C1 := "CERT_IUT_C1_AT";
const charstring cc_iutCert_CA1 := "CERT_IUT_CA1_AT";
const charstring cc_iutCert_CA2 := "CERT_IUT_CA2_AT";
const charstring cc_iutCert_C3 := "CERT_IUT_C3_AA";
const charstring cc_iutCert_CA3 := "CERT_IUT_CA3_AT";
const charstring cc_iutCert_CA_AA := "CERT_IUT_CA_AA";
const charstring cc_iutCert_CC_AA := "CERT_IUT_CC_AA";
const charstring cc_iutCert_A := "CERT_IUT_A_AT"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT */
const charstring cc_iutCert_A1 := "CERT_IUT_A1_AT";
const charstring cc_iutCert_A2 := "CERT_IUT_A2_AT";
const charstring cc_iutCert_A3 := "CERT_IUT_A3_AT";
const charstring cc_iutCert_A4 := "CERT_IUT_A4_AT";
const charstring cc_iutCert_A_AA := "CERT_IUT_A_AA"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT - NistP256*/
const charstring cc_iutCert_A_N := "CERT_IUT_A_N_AT";
const charstring cc_iutCert_A_B_N := "CERT_IUT_A_B_N_AT";
const charstring cc_iutCert_A_B := "CERT_IUT_A_B_AT"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT - BrainpoolP256r1*/
const charstring cc_iutCert_A_B3 := "CERT_IUT_A_B3_AT"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT - BrainpoolP384r1*/
const charstring cc_iutCert_B := "CERT_IUT_B_AT"; /** Default certificate, with circular region, to be used when secured messages are sent from TA to IUT */
const charstring cc_iutCert_C := "CERT_IUT_C_AT"; /** Certificate with a rectangular region, to be used when secured messages are sent from TA to IUT */
const charstring cc_iutCert_D := "CERT_IUT_D_AT"; /** Certificate with a polygonal region, to be used when secured messages are sent from TA to IUT */
const charstring cc_iutCert_E := "CERT_IUT_E_AT"; /** Certificate with a region identifier, to be used when secured messages are sent from TA to IUT */
const charstring cc_iutCert_F := "CERT_IUT_F_AT"; /** Certificate with a subject type indicating 'enrolment_credentials', to be used when secured messages are sent from TA to IUT */
const charstring cc_iutCert_A_B := "CERT_IUT_A_B_AT"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT - BrainpoolP256r1*/
const charstring cc_iutCert_A_B3 := "CERT_IUT_A_B3_AT"; /** Default certificate, without region validity restriction, to be used when secured messages are sent from TA to IUT - BrainpoolP384r1*/
const charstring cc_iutCert_A_B3_N := "CERT_IUT_A_B3_N_AT";
const charstring cc_iutCert_B := "CERT_IUT_B_AT"; /** Default certificate, with circular region, to be used when secured messages are sent from TA to IUT */
const charstring cc_iutCert_C := "CERT_IUT_C_AT"; /** Certificate with a rectangular region, to be used when secured messages are sent from TA to IUT */
const charstring cc_iutCert_D := "CERT_IUT_D_AT"; /** Certificate with a polygonal region, to be used when secured messages are sent from TA to IUT */
const charstring cc_iutCert_E := "CERT_IUT_E_AT"; /** Certificate with a region identifier, to be used when secured messages are sent from TA to IUT */
const charstring cc_iutCert_F := "CERT_IUT_F_AT"; /** Certificate with a subject type indicating 'enrolment_credentials', to be used when secured messages are sent from TA to IUT */
/**
* @desc Specification of basic format elements
......@@ -183,8 +191,6 @@ module LibItsSecurity_TypesAndValues {
Bit1 noPassingForTrucks,
Bit1 speedLimit,
Bit18 reserved
} with {
variant "FIELDORDER(msb)"
} // End of type SspCAM
/**
......@@ -242,8 +248,6 @@ module LibItsSecurity_TypesAndValues {
Bit1 signalViolation,
Bit1 dangerousSituation,
Bit8 reserved
} with {
variant "FIELDORDER(msb)"
} // End of type SspDENM
} // End of group certificateSpecification
......@@ -255,7 +259,7 @@ module LibItsSecurity_TypesAndValues {
group profileCertificates {
type record CertificatesCachingItem {
HashedId8 hashedId8,
HashedId8 hashedId8,
EtsiTs103097Certificate certificate
}
type record of CertificatesCachingItem CertificatesCaching;
......@@ -267,7 +271,7 @@ module LibItsSecurity_TypesAndValues {
e_brainpool_256,
e_brainpool_384
}
group taConfiguration {
/**
......@@ -280,12 +284,12 @@ module LibItsSecurity_TypesAndValues {
* @member location 3D location associated to each configuration
*/
/*type record TaConfig {
Oct32 signingPrivateKey,
Oct32 encryptPrivateKey,
Oct32 signingPrivateKey,
Oct32 encryptPrivateKey,
EtsiTs103097Certificate caCertificate,
EtsiTs103097Certificate aaCertificate,
EtsiTs103097Certificate atCertificate,
ThreeDLocation location
ThreeDLocation location
}*/ // End of type TaConfig
/**
......@@ -303,6 +307,5 @@ module LibItsSecurity_TypesAndValues {
} // End of group utPrimitives
} with {
variant ""
encode "LibItsSecurity"
} // End of module LibItsSecurity_TypesAndValues
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment