Commit 0f7e7d94 authored by garciay's avatar garciay
Browse files

Major security bugs fixed for signature. Encryption to do.

parent b616c4f2

ttcn/Pki/LibItsPki_Templates.ttcn

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/**

 *  @author   ETSI / STF545

 *  @version  $URL$

 *            $Id$

 *  @desc     Module containing templates for IT PKI Protocol

 *  @copyright   ETSI Copyright Notification

 *               No part may be reproduced except as authorized by written permission.

 *               The copyright and the foregoing restriction extend to reproduction in all media.

 *               All rights reserved.

 *

 */

module LibItsPki_Templates {

    

    // LibIts

    import from IEEE1609dot2BaseTypes language "ASN.1:1997" all;

    import from IEEE1609dot2 language "ASN.1:1997" all;

    import from EtsiTs102941BaseTypes language "ASN.1:1997" all;

    import from EtsiTs102941TypesEnrolment language "ASN.1:1997" all;

    import from EtsiTs102941MessagesItss language "ASN.1:1997" all;

    import from EtsiTs103097Module language "ASN.1:1997" all;

    

    // LibItsCommon

    import from LibItsCommon_TypesAndValues all;

    import from LibItsCommon_Functions all;

    import from LibItsCommon_TypesAndValues all;

    import from LibItsCommon_ASN1_NamedNumbers all;

    

    // LibItsSecurity

    import from LibItsSecurity_Templates all;

    

    template (value) EnrolmentRequestMessage m_enrolmentRequestMessage(

                                                                       in template (value) EncryptedData p_encryptedData

    ) modifies m_etsiTs103097Data_encrypted := {

    } // End of template m_enrolmentRequestMessage

    

    template (value) EtsiTs102941DataContent m_enrolmentRequest(

                                                                in template (value) InnerEcRequestSignedForPop p_enrolmentRequest

    ) := {

        enrolmentRequest := p_enrolmentRequest

    } // End of template m_enrolmentRequest

    

    template (value) InnerEcRequest m_innerEcRequest(

                                                     in template (value) charstring p_itsId,

                                                     in template (value) PublicKeys p_publicKeys,

                                                     in template (value) CertificateSubjectAttributes p_requestedSubjectAttributes //(WITH COMPONENTS{certIssuePermissions ABSENT}),

    ) := {

        itsId                      := p_itsId,

        certificateFormat          := 1,

        publicKeys                 := p_publicKeys,

        requestedSubjectAttributes := p_requestedSubjectAttributes

    } // End of template m_innerEcRequest

    

} // End of module LibItsPki_Templates
 
 No newline at end of file

ttcn/Pki/LibItsPki_TestSystem.ttcn

+1 −4
Original line number Diff line number Diff line
@@ -17,12 +17,9 @@ module LibItsPki_TestSystem { 
    // LibIts

    import from IEEE1609dot2BaseTypes language "ASN.1:1997" all;

    import from IEEE1609dot2 language "ASN.1:1997" all;

    import from EtsiTs103097Module language "ASN.1:1997" all;

    import from EtsiTs102941MessagesCa language "ASN.1:1997" all;

    import from EtsiTs102941BaseTypes language "ASN.1:1997" all;

    import from EtsiTs102941TypesEnrolment language "ASN.1:1997" all;

    import from EtsiTs102941TypesAuthorization language "ASN.1:1997" all;

    import from EtsiTs102941TrustLists language "ASN.1:1997" all;

    import from EtsiTs102941MessagesItss language "ASN.1:1997" all;

    import from EtsiTs103097Module language "ASN.1:1997" all;

    

    // LibItsPki