Commit 755c231a authored by garciay's avatar garciay
Browse files

STF538: Start Certificate TPs implementation

parent 1d3e9918
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -264,9 +264,9 @@ module LibItsSecurity_Functions {
        ) return HashedId8 {
        ) return HashedId8 {
            var octetstring v_hash;
            var octetstring v_hash;
            
            
            if (PICS_HASH_ALGORITHM == sha256) {
            if (PICS_SEC_SHA256) {
                v_hash := f_calculateDigestSha256FromCertificate(p_cert);
                v_hash := f_calculateDigestSha256FromCertificate(p_cert);
            } if (PICS_HASH_ALGORITHM == sha384) {
            } if (PICS_SEC_SHA384) {
                v_hash := f_calculateDigestSha384FromCertificate(p_cert);
                v_hash := f_calculateDigestSha384FromCertificate(p_cert);
            } 
            } 
            
            
+30 −14
Original line number Original line Diff line number Diff line
@@ -19,14 +19,30 @@ module LibItsSecurity_Pics {
    // LibItsSecurity
    // LibItsSecurity
    import from LibItsSecurity_TypesAndValues all;
    import from LibItsSecurity_TypesAndValues all;
    
    
    modulepar HashAlgorithm PICS_HASH_ALGORITHM := sha256;
    /**
     * Does the IUT support SHA-256 digest
     */
    modulepar boolean PICS_SEC_SHA256 := true;
    
    /**
     * Does the IUT support SHA-384 digest
     */
    modulepar boolean PICS_SEC_SHA384 := true;
    
    
    modulepar SignAlgorithm PICS_SIGN_ALGORITHM := e_nistp_256;
    /**
     * Does the IUT support NIST P256 algorithm
     */
    modulepar boolean PICS_SEC_NIST_P256 := true;
    
    /**
     * Does the IUT support Brainpool P256r1 algorithm
     */
    modulepar boolean PICS_SEC_BRAINPOOL_P256R1 := false;
    
    
    /**
    /**
     * Is the IUT support Brainpool algorithm
     * Does the IUT support Brainpool P384r1 algorithm
     */
     */
    modulepar boolean PICS_BRAINPOOL_SUPPORT := false;
    modulepar boolean PICS_SEC_BRAINPOOL_P384R1 := false;
    
    
    /**
    /**
     * Is the IUT able to distribute AT certificates
     * Is the IUT able to distribute AT certificates
@@ -46,32 +62,32 @@ module LibItsSecurity_Pics {
    /**
    /**
     * Is the IUT support circular region geographical restriction
     * Is the IUT support circular region geographical restriction
     */
     */
    modulepar boolean PICS_USE_CIRCULAR_REGION := true;
    modulepar boolean PICS_SEC_CIRCULAR_REGION := true;
    
    
    /**
    /**
     * Is the IUT support rectangular region geographical restriction
     * Does the IUT support rectangular region geographical restriction
     */
     */
    modulepar boolean PICS_USE_RECTANGULAR_REGION := true;
    modulepar boolean PICS_SEC_RECTANGULAR_REGION := true;
    
    
    /**
    /**
     * Is the IUT support polygonal region geographical restriction
     * Does the IUT support polygonal region geographical restriction
     */
     */
    modulepar boolean PICS_USE_POLYGONAL_REGION := true;
    modulepar boolean PICS_SEC_POLYGONAL_REGION := true;
    
    
    /**
    /**
     * Is the IUT support identified region geographical restriction
     * Is the IUT support identified region geographical restriction
     */
     */
    modulepar boolean PICS_USE_IDENTIFIED_REGION := true;
    modulepar boolean PICS_SEC_IDENTIFIED_REGION := true;
    
    
    /**
    /**
     * Is the IUT support identified region/UN geographical restriction
     * Does the IUT support identified region/UN geographical restriction
     */
     */
    modulepar boolean PICS_USE_UN_STATS_REGION_DICTIONARY := true;
    modulepar boolean PICS_SEC_UN_STATS_REGION_DICTIONARY := true;
    
    
    /**
    /**
     * Is the IUT support identified region/ISO31661 geographical restriction
     * Does the IUT support identified region/ISO31661 geographical restriction
     */
     */
    modulepar boolean PICS_USE_ISO31661_REGION_DICTIONARY := true;
    modulepar boolean PICS_ISO31661_REGION_DICTIONARY := true;
    
    
    /**
    /**
     * Does the IUT support ITS-AID for Generic profile?
     * Does the IUT support ITS-AID for Generic profile?
+19 −17
Original line number Original line Diff line number Diff line
@@ -326,7 +326,7 @@ module LibItsSecurity_Templates {
             * @param p_southeast  Lower rigth corner
             * @param p_southeast  Lower rigth corner
             * @see Draft ETSI TS 103 097 V1.3.1 Clause 4.2.21  GeographicRegion
             * @see Draft ETSI TS 103 097 V1.3.1 Clause 4.2.21  GeographicRegion
             */
             */
            template (value) GeographicRegion m_geographicRegion_rectangle(
            template (value) GeographicRegion m_geographicRegion_rectangular(
                                                                             in template (value) TwoDLocation p_northwest,
                                                                             in template (value) TwoDLocation p_northwest,
                                                                             in template (value) TwoDLocation p_southeast
                                                                             in template (value) TwoDLocation p_southeast
            ) := {
            ) := {
@@ -336,7 +336,7 @@ module LibItsSecurity_Templates {
                        southEast := p_southeast 
                        southEast := p_southeast 
                    }
                    }
                }
                }
            } // End of template m_geographicRegion_rectangle
            } // End of template m_geographicRegion_rectangular
            
            
            /**
            /**
             * @desc Send template polygonial geographic region
             * @desc Send template polygonial geographic region
@@ -496,16 +496,8 @@ module LibItsSecurity_Templates {
             * @param p_southeast  Lower rigth corner
             * @param p_southeast  Lower rigth corner
             * @see Draft ETSI TS 103 097 V1.3.1 Clause 4.2.21  GeographicRegion
             * @see Draft ETSI TS 103 097 V1.3.1 Clause 4.2.21  GeographicRegion
             */
             */
            template (present) GeographicRegion mw_geographicRegion_rectangular(
            template (present) GeographicRegion mw_geographicRegion_rectangular := {
                                                                                in template (present) TwoDLocation p_northwest := ?,
                rectangularRegion := ?
                                                                                in template (present) TwoDLocation p_southeast := ?
            ) := {
                rectangularRegion := {
                    {
                        northWest := p_northwest,
                        southEast := p_southeast 
                    }
                }
            } // End of template mw_geographicRegion_rectangular
            } // End of template mw_geographicRegion_rectangular
            
            
            /**
            /**
@@ -1332,13 +1324,23 @@ module LibItsSecurity_Templates {
            region                 := p_region,
            region                 := p_region,
            assuranceLevel         := p_assuranceLevel,
            assuranceLevel         := p_assuranceLevel,
            appPermissions         := p_appPermissions,
            appPermissions         := p_appPermissions,
            certIssuePermissions   := *,
            certIssuePermissions   := omit,
            certRequestPermissions := *, 
            certRequestPermissions := omit, 
            canRequestRollover     := *,
            canRequestRollover     := omit,
            encryptionKey          := p_encryptionKey,
            encryptionKey          := p_encryptionKey,
            verifyKeyIndicator     := p_verifyKeyIndicator
            verifyKeyIndicator     := p_verifyKeyIndicator
        } // End of template mw_toBeSignedCertificate_aa
        } // End of template mw_toBeSignedCertificate_aa
        
        
        template (present) CertificateId mw_certificateId_name(
                                                               template (present) charstring p_name := ?
        ) := {
            name := p_name
        } // End of template mw_certificateId_name
        
        template (present) CertificateId mw_certificateId_none := {
            none_ := NULL
        } // End of template mw_certificateId_none
        
        /**
        /**
         * @desc Send template for ToBeSignedCertificate with AT restrictions
         * @desc Send template for ToBeSignedCertificate with AT restrictions
         * @see ETSI TS 103 097 V1.3.1 Clause 7.2.1 Authorization tickets
         * @see ETSI TS 103 097 V1.3.1 Clause 7.2.1 Authorization tickets