ttcn/Pki/LibItsPki_Pixits.ttcn

@@ -52,6 +52,14 @@ module LibItsPki_Pixits {
    */
   modulepar SecurityAlg PX_VE_ALG := e_nist_p256;
   
+  modulepar Int16 PX_GENERATED_CERTIFICATE_DURATION := 120;
+
+  modulepar SubjectAssurance PX_GENERATED_CERTIFICATE_SUBJECT_ASSURENCE_LEVEL := '00'O;
+
+  modulepar CountryOnly PX_GENERATED_CERTIFICATE_REGION_COUNTRY_1 := 250;
+
+  modulepar CountryOnly PX_GENERATED_CERTIFICATE_REGION_COUNTRY_2 := 380;
+
   modulepar octetstring PX_INNER_EC_CERTFICATE_BITMAP_SSP_SCR := '01C0'O;
 
   modulepar octetstring PX_INNER_EC_CERTFICATE_INCORRECT_BITMAP_SSP_SCR := '01FF'O;

ttcn/Security/LibItsSecurity_Functions.ttcn

@@ -2331,6 +2331,28 @@ module LibItsSecurity_Functions {
                 return true;
             } // End of function f_getCertificateFromHashedId3
             
+            function f_getCertificateIssuer(
+                                            in IssuerIdentifier p_issuer
+            ) return HashedId8 {
+                if (ischosen(p_issuer.sha256AndDigest)) {
+                    return p_issuer.sha256AndDigest;
+                } else if (ischosen(p_issuer.sha256AndDigest)) {
+                    return p_issuer.sha256AndDigest;
+                }
+                return int2oct(0, 8);
+            }
+            
+            function f_getHashAlgorithm(
+                                        in IssuerIdentifier p_issuer
+            ) return HashAlgorithm {
+                if (ischosen(p_issuer.sha256AndDigest)) {
+                    return sha256;
+                } else if (ischosen(p_issuer.sha256AndDigest)) {
+                    return sha384;
+                }
+                return p_issuer.self_;
+            }
+            
             /**
             * @desc    Read the signing private key for the specified certificate
             * @param   p_keysId            the keys identifier

ttcn/Security/LibItsSecurity_Pixits.ttcn

@@ -42,9 +42,9 @@ module LibItsSecurity_Pixits {
     modulepar Psid 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: 2
+     * @desc Invalid protocol version. Default: 3
      */
-    modulepar UInt8 PX_WRONG_PROTOCOL_VERSION := 2;
+    modulepar UInt8 PX_WRONG_PROTOCOL_VERSION := 3;
     
     /**
      * @desc Invalid WGS longitude
@@ -56,22 +56,4 @@ module LibItsSecurity_Pixits {
      */
     modulepar SecLatitude PX_WGSLATITUDE := 0;
     
-    /**
-     * @desc Invalid digest. Default: 1
-     */
-    modulepar HashedId8 PX_OTHER_CERT_DIGEST := '0000000000000000'O;
-    
-    /**
-     * @desc AES-128-CCM nonce public key
-     */
-    modulepar Oct12 PX_ENCRYPTIONPARAMETERS_AES_128_CCM_NONCE := 'C0FFEEDECAC0FFEEDECA0000'O;
-
-    modulepar CountryOnly PX_GENERATED_CERTIFICATE_REGION_COUNTRY_1 := 250;
-    
-    modulepar CountryOnly PX_GENERATED_CERTIFICATE_REGION_COUNTRY_2 := 380;
-
-    modulepar Int16 PX_GENERATED_CERTIFICATE_DURATION := 120;
-
-    modulepar SubjectAssurance PX_GENERATED_CERTIFICATE_SUBJECT_ASSURENCE_LEVEL := '00'O;
-
 } // End of module LibItsSecurity_Pixits