WeekSTF507: Week #3

.  Terminated review of existing Send TPs for Certificate profiles
.  Terminated review of existing  RECV CAM profiles
.  Added new RCs for RECV CAM profiles done
.  Started review of RECV DENM profiles

ttcn/GeoNetworking/LibItsGeoNetworking_Templates.ttcn

@@ -2329,7 +2329,7 @@ module LibItsGeoNetworking_Templates {
 				        return bit2oct(encvalue(p_gnPayload.decodedPayload.btpPacket.payload));
             		}
             		
-            		return p_gnPayload.rawPayload;
+            		return valueof(p_gnPayload.rawPayload);
             	}
             }
             

ttcn/Security/LibItsSecurity_Pixits.ttcn3

@@ -39,4 +39,19 @@ module LibItsSecurity_Pixits {
      */
     modulepar UInt8 PX_WRONG_PROTOCOL_VERSION := 1;
     
+    /**
+     * @desc Invalid protocol version. Default: 1
+     */
+    modulepar WGSLongitude PX_WGSLONGITUDE := 0;
+    
+    /**
+     * @desc Invalid protocol version. Default: 1
+     */
+    modulepar WGSLatitude PX_WGSLATITUDE := 0;
+    
+    /**
+     * @desc Invalid protocol version. Default: 1
+     */
+    modulepar HashedId8 PX_OTHER_CERT_DIGEST := '0000000000000000'O;
+    
 } // End of module LibItsSecurity_Pixits
\ No newline at end of file

ttcn/Security/LibItsSecurity_Templates.ttcn3

@@ -376,6 +376,22 @@ module LibItsSecurity_Templates {
                     } // End of field signerInfo
                 } // End of template m_signerInfo_certificates
                 
+                template (value) SignerInfo m_signerInfo_other_certificates(
+                                                                            in template (value) CertificateWithAlgo p_certificateWithAlgo
+                ) := {
+                    type_         := e_certificate_digest_with_other_algorithm,
+                    signerInfo    := {
+                        certificateWithAlgo := p_certificateWithAlgo
+                    } // End of field signerInfo
+                } // End of template m_signerInfo_other_certificates
+                
+                template (value) CertificateWithAlgo m_certificateWithAlgo_ecdsa(
+                                                                                 in template (value) HashedId8 p_digest
+                ) := {
+                    algorithm := e_ecdsa_nistp256_with_sha256,
+                    digest := p_digest
+                } // End of m_certificateWithAlgo
+                
             } // End of group signerInfos
             
             /**
@@ -401,7 +417,7 @@ module LibItsSecurity_Templates {
                                                             in template (value) Int13 p_duration
             ) := {
                 unit        := e_seconds,
-                duration    := p_duration
+                duration_   := p_duration
             } // End of template m_duration_in_seconds
             
             /**
@@ -577,7 +593,7 @@ module LibItsSecurity_Templates {
                     type_           := e_uncompressed,
                     x               := p_x,
                     y               := {
-                    	y := p_y
+                        y := p_y
                     }
                 } // End of template mw_eccPointecdsa_nistp256_with_sha256_uncompressed
                 
@@ -613,7 +629,7 @@ module LibItsSecurity_Templates {
                     signerInfo    := {
                         certificates := p_certificates
                     } // End of field signerInfo
-                } // End of template m_signerInfo_certificates
+                } // End of template mw_signerInfo_certificates
                 
             } // End of group signerInfos
             
@@ -676,7 +692,7 @@ module LibItsSecurity_Templates {
                                                                in template (present) Int13 p_duration
             ) := {
                 unit        := e_seconds,
-                duration    := p_duration
+                duration_   := p_duration
             } // End of template mw_duration_in_seconds
             
             /**
@@ -1875,7 +1891,7 @@ module LibItsSecurity_Templates {
                                                           in template (present) SubjectInfo p_subject_info := ?,
                                                           in template (present) SubjectAttributes p_subject_attributes := ?,
                                                           in template (present) ValidityRestrictions p_validity_restrictions := ?,
-                                                          in template (present) Signature p_signature :=?
+                                                          in template (present) Signature p_signature := ?
             ) := {
                 version                 := c_certificate_version,
                 signer_info             := p_signer_info,
@@ -1889,7 +1905,7 @@ module LibItsSecurity_Templates {
                                                           in template (present) SignerInfo p_signer_info := ?,
                                                           in template (present) SubjectAttributes p_subject_attributes := ?,
                                                           in template (present) ValidityRestrictions p_validity_restrictions := ?,
-                                                          in template (present) Signature p_signature :=?
+                                                          in template (present) Signature p_signature := ?
             ) := {
                 version                 := c_certificate_version,
                 signer_info             := p_signer_info,

ttcn/Security/LibItsSecurity_TestSystem.ttcn3

@@ -44,6 +44,8 @@ module LibItsSecurity_TestSystem {
             const charstring cc_taCert_G  := "CERT_TS_G_AT"; /** to be defined */
             const charstring cc_taCert_EC := "CERT_TS_A_EC"; /** Certificate with a subject type indicating 'enrolment_credentials', to be used when secured messages are sent from TA to IUT */
             const charstring cc_taCert_AA := "CERT_TS_A_AA"; /** Certificate with a subject type indicating 'authorisation_authority', to be used when secured messages are sent from TA to IUT */
+            const charstring cc_taCert_EA := "CERT_TS_A_EA"; /** Certificate with a subject type indicating 'enrolment_authority', to be used when secured messages are sent from TA to IUT */
+            const charstring cc_taCert_CA := "CERT_TS_A_CA"; /** Certificate with a subject type indicating 'root_ca', to be used when secured messages are sent from TA to IUT */
             // Test Adapter certificates & private keys - Inoportune behavior
             const charstring cc_taCert_B_BO  := "CERT_TS_B_BO_AT"; /** Certificate with a circular region, the IUT position is outside of the region */
             const charstring cc_taCert_C_BO  := "CERT_TS_C_BO_AT"; /** Certificate with a rectangular region, the IUT position is outside of the region */

ttcn/Security/LibItsSecurity_TypesAndValues.ttcn3

@@ -252,13 +252,13 @@ module LibItsSecurity_TypesAndValues {
         
         /**
          * @desc Defines the duration of a time span (e.g. a certificate's validity)
-         * @member unit     Units of the duration
-         * @member duration The duration of a time span
+         * @member unit         Units of the duration
+         * @member duration_    The duration of a time span
          * @see Draft ETSI TS 103 097 V1.1.14 Clause 4.2.17  Duration
          */
         type record Duration {
             DurationUnitType    unit,
-            Int13               duration
+            Int13               duration_
         } // End of type Duration
         
         /**
@@ -934,6 +934,13 @@ module LibItsSecurity_TypesAndValues {
             ValidityRestrictions    validity_restrictions
         } // End of type ToBeSignedCertificate
         
+        type record CertificatesCachingItem {
+            HashedId8   hashedId8,
+            Certificate certificate
+        }
+        type record of CertificatesCachingItem CertificatesCaching;
+        
+        
     } // End of group profileCertificates 
     
     group taConfiguration {