Commit 94ab40c0 authored by Denis Filatov's avatar Denis Filatov
Browse files

Merge branch 'release2' of https://forge.etsi.org/rep/ITS/itscertgen into release2 

fix windows build
parents 65f0055e f1500e9d

certgen/CERT_IUT_C1_AT.xml

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
<certificate>

	<version>3</version>

	<signer type="digest" name="CERT_IUT_CC_AA"/>

	<subject type="AT" name="">

		<!-- verification_key -->

		<attribute type="verification_key">

			<public_key algorithm="0">

				<ecc_point type="compressed"/>

			</public_key>

		</attribute>

		<!-- encryption_key -->

		<attribute type="encryption_key">

			<public_key sym_alg="0" algorithm="0">

				><ecc_point type="compressed"/>

			</public_key>

		</attribute>

		<!-- assurance_level -->

		<attribute type="assurance_level">

			<assurance level="3"/>

		</attribute>

		<!-- its_aid_ssp_list -->

		<attribute type="its_aid_ssp_list">

			<ssp aid="CAM">01 FF FC</ssp>  <!-- CAM -->

			<ssp aid="DENM">01 FF FF FF</ssp>  <!-- DENM -->

			<ssp aid="GN-MGMT"></ssp> <!--ssp aid="GN-MGMT">00</ssp-->  <!-- GN-MGMT -->

		</attribute>

	</subject>

	<validity>

		<restriction type="time" start="+0d" end="+365d"/>

			<rectangle>

				<location latitude="+10km" longitude="-10km"/>

				<location latitude="+5km" longitude="-5km" />

			</rectangle>

	</validity>

	<signature algorithm="0"/>

</certificate>

certgen/applink.c

+2 −0
Original line number Diff line number Diff line 
#ifndef _CRT_SECURE_NO_WARNINGS

#define _CRT_SECURE_NO_WARNINGS

#endif

#define APPLINK_STDIN	1

#define APPLINK_STDOUT	2

#define APPLINK_STDERR	3

certgen/asn1certgen.xslt

+89 −37
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ 
                xmlns:date="http://exslt.org/dates-and-times"

                extension-element-prefixes="date"                

                >

 <xsl:variable name="base-time"       select="concat(date:year(date:date()), '-01-01')"/>

 <xsl:variable name="local-region"    select="250"/>

 <xsl:variable name="base-latitude"   select="436169490.0"/>

 <xsl:variable name="base-longitude"  select="70533080.0"/>

 <xsl:param    name="base-time"       select="concat(date:year(date:date()), '-01-01')"/>

 <xsl:param    name="local-region"    select="250"/>

 <xsl:param    name="base-latitude"   select="436169490.0"/>

 <xsl:param    name="base-longitude"  select="70533080.0"/>

<!--

 <xsl:variable name="base-latitude"   select="0"/>

 <xsl:variable name="base-longitude"  select="0"/>
@@ -36,8 +36,36 @@ 
 <xsl:variable name="AID-GPC"     select="540802"/>

 <xsl:variable name="AID-CPM"     select="639"/>

 <xsl:variable name="AID-VRU"     select="638"/>

 <xsl:variable name="AID-VAM"     select="638"/>

 <xsl:variable name="AID-SA"      select="540801"/>



 <xsl:template name="AID-name2value">

  <xsl:param name="aid" />

  <xsl:choose>

   <xsl:when test="$aid = 'CAM'" ><xsl:value-of select="$AID-CAM"/></xsl:when>

   <xsl:when test="$aid = 'DENM'"><xsl:value-of select="$AID-DENM"/></xsl:when>

   <xsl:when test="$aid = 'TLM'" ><xsl:value-of select="$AID-SPAT"/></xsl:when>

   <xsl:when test="$aid = 'SPAT'"><xsl:value-of select="$AID-SPAT"/></xsl:when>

   <xsl:when test="$aid = 'RLT'" ><xsl:value-of select="$AID-MAP"/></xsl:when>

   <xsl:when test="$aid = 'MAP'" ><xsl:value-of select="$AID-MAP"/></xsl:when>

   <xsl:when test="$aid = 'IVI' "><xsl:value-of select="$AID-IVI"/></xsl:when>

   <xsl:when test="$aid = 'TLC'" ><xsl:value-of select="$AID-SREM"/></xsl:when>

   <xsl:when test="$aid = 'SREM'"><xsl:value-of select="$AID-SREM"/></xsl:when>

   <xsl:when test="$aid = 'SSEM'"><xsl:value-of select="$AID-SSEM"/></xsl:when>

   <xsl:when test="$aid = 'GPC'" ><xsl:value-of select="$AID-GPC"/></xsl:when>

   <xsl:when test="$aid = 'RTCMEM'" ><xsl:value-of select="$AID-GPC"/></xsl:when>

   <xsl:when test="$aid = 'CPM'" ><xsl:value-of select="$AID-CPM"/></xsl:when>

   <xsl:when test="$aid = 'CPS'" ><xsl:value-of select="$AID-CPM"/></xsl:when>

   <xsl:when test="$aid = 'VRU'" ><xsl:value-of select="$AID-VAM"/></xsl:when>

   <xsl:when test="$aid = 'VAM'" ><xsl:value-of select="$AID-VAM"/></xsl:when>

   <xsl:when test="$aid = 'CRT-REQ'"><xsl:value-of select="$AID-CRT-REQ"/></xsl:when>

   <xsl:when test="$aid = 'CRL'" ><xsl:value-of select="$AID-CRL"/></xsl:when>

   <xsl:when test="$aid = 'CTL'" ><xsl:value-of select="$AID-CTL"/></xsl:when>

   <xsl:when test="$aid = 'GN-MGMT'"><xsl:value-of select="$AID-GN-MGMT"/></xsl:when>

   <xsl:otherwise><xsl:value-of select="$aid"/></xsl:otherwise>

  </xsl:choose>

 </xsl:template>

 

 <xsl:template match = "/">

  <xsl:apply-templates select="certificate"/>

 </xsl:template>
@@ -109,6 +137,7 @@ 
   <xsl:choose>

    <xsl:when test="@type = 'ROOT'">0</xsl:when>

    <xsl:when test="@type = 'AA'">00110010</xsl:when>

    <xsl:when test="@type = 'MA'">00110010</xsl:when>

    <xsl:when test="@type = 'TLM'">0</xsl:when>

    <xsl:when test="@type = 'EA'">00001110</xsl:when>

    <xsl:when test="@type = 'EC'">11000000</xsl:when>
@@ -121,6 +150,7 @@ 
   <xsl:choose>

    <xsl:when test="@type = 'ROOT'">11111110</xsl:when>

    <xsl:when test="@type = 'AA'">0</xsl:when>

    <xsl:when test="@type = 'MA'">0</xsl:when>

    <xsl:when test="@type = 'TLM'">0</xsl:when>

    <xsl:when test="@type = 'EA'">11000000</xsl:when>

    <xsl:when test="@type = 'EC'">0</xsl:when>
@@ -144,10 +174,10 @@ 
   <xsl:apply-templates select="../validity/restriction[@type='time']"/>

   <xsl:apply-templates mode="region" select="../validity/restriction[@type='region']"/>

   <xsl:apply-templates select="attribute[@type='assurance_level']"/>

   <xsl:apply-templates select="attribute[@type='its_aid_ssp_list']"/>

   <xsl:if test="attribute[@type='its_aid_list']">

   <xsl:apply-templates select="attribute[@type='its_aid_ssp_list' or @type='app_aid_list']"/>

   <xsl:if test="attribute[@type='its_aid_list' or @type='issuing_aid_list']">

    <certIssuePermissions>

     <xsl:apply-templates select="attribute[@type='its_aid_list']">

     <xsl:apply-templates select="attribute[@type='its_aid_list'  or @type='issuing_aid_list']">

      <xsl:with-param name="certType" select="@type"/>

     </xsl:apply-templates>

    </certIssuePermissions>
@@ -177,42 +207,52 @@ 
  <xsl:comment>level=<xsl:value-of select="$level"/> confidence=<xsl:value-of select="$confidence"/> </xsl:comment>

 </xsl:template>

 

 <xsl:template match="attribute[@type='its_aid_list']">

 <xsl:template match="attribute[@type='its_aid_list' or @type='issuing_aid_list']">

  <xsl:param name="certType"/>

   <PsidGroupPermissions>

    <subjectPermissions>

     <xsl:choose>

      <xsl:when test="@all or aid[@value='all'] or aid[@all]">

       <all/>

      </xsl:when>

      <xsl:otherwise>

       <explicit>

        <xsl:apply-templates mode="certIssuePermissions" select="aid">

         <xsl:with-param name="certType" select="$certType"/>

        </xsl:apply-templates>

       </explicit>

      </xsl:otherwise>

     </xsl:choose>

    </subjectPermissions>

    <minChainLength>

    <xsl:choose>

      <xsl:when test="@minChainLength"><xsl:value-of select="@minChainLength"/></xsl:when>

      <xsl:when test="$certType = 'ROOT'">2</xsl:when>

      <xsl:otherwise>1</xsl:otherwise>

     <xsl:when test="@minChainLength and not(@minChainLength='1')">

       <minChainLength><xsl:value-of select="@minChainLength"/></minChainLength>

     </xsl:when>

     <xsl:when test="@minLength and not(@minLength='1')">

       <minChainLength><xsl:value-of select="@minLength"/></minChainLength>

     </xsl:when>

     <xsl:when test="$certType = 'ROOT'">2

       <minChainLength>2</minChainLength>

     </xsl:when>

    </xsl:choose>

    </minChainLength>

    <chainLengthRange>

    <xsl:choose>

      <xsl:when test="$certType = 'ROOT'">0</xsl:when>

      <xsl:otherwise>0</xsl:otherwise>

     <xsl:when test="@chainLengthRange and not(@chainLengthRange='0')">

       <chainLengthRange><xsl:value-of select="@chainLengthRange"/></chainLengthRange>

     </xsl:when>

     <xsl:when test="@lengthRange and not(@lengthRange='0')">

       <chainLengthRange><xsl:value-of select="@lengthRange"/></chainLengthRange>

     </xsl:when>

    </xsl:choose>

    </chainLengthRange>

    <eeType>

    <xsl:choose>

     <xsl:when test="@eeType = 'enrol' or @eeType = '40'">

        <xsl:text>01000000</xsl:text>

       <eeType><xsl:text>01000000</xsl:text></eeType>

     </xsl:when>

     <xsl:when test="@eeType = 'app' or @eeType = '80'">

        <xsl:text>10000000</xsl:text>

     </xsl:when>

     <xsl:otherwise>

        <xsl:text>11000000</xsl:text>

       <eeType><xsl:text>11000000</xsl:text></eeType> <!-- all -->

     </xsl:otherwise>

    </xsl:choose>

    </eeType>

   </PsidGroupPermissions>

 </xsl:template>
@@ -238,6 +278,8 @@ 
    <xsl:when test="@value = 'TLC' or @value=$AID-SREM or @value='SREM'">02 FF FF E0</xsl:when>

    <xsl:when test="@value = 'SSEM' or @value=$AID-SSEM">01</xsl:when>

    <xsl:when test="@value = 'GPC' or @value=$AID-GPC">01</xsl:when>

    <xsl:when test="@value = 'CPM' or @value=$AID-CPM">01</xsl:when>

    <xsl:when test="@value = 'VAM' or @value=$AID-VAM">01</xsl:when>

    <xsl:when test="@value = 'CRT-REQ' or @value = $AID-CRT-REQ">

     <xsl:choose>

      <xsl:when test="$certType = 'ROOT'">01 FE</xsl:when>
@@ -267,6 +309,8 @@ 
    <xsl:when test="@value = 'TLC' or @value=$AID-SREM or @value='SREM'">FF 00 00 1F</xsl:when>

    <xsl:when test="@value = 'SSEM' or @value=$AID-SSEM">FF</xsl:when>

    <xsl:when test="@value = 'GPC' or @value=$AID-GPC">FF</xsl:when>

    <xsl:when test="@value = 'CPM' or @value=$AID-CPM">FF</xsl:when>

    <xsl:when test="@value = 'VAM' or @value=$AID-VAM">FF</xsl:when>

    <xsl:when test="@value = 'CRT-REQ' or @value = $AID-CRT-REQ">

     <xsl:choose>

      <xsl:when test="$certType = 'ROOT'">FF 01</xsl:when>
@@ -279,6 +323,10 @@ 
  <PsidSspRange>

   <xsl:comment><xsl:value-of select="@value"/></xsl:comment>

   <psid>

    <xsl:call-template name="AID-name2value">

      <xsl:with-param name="aid" select="@value"/>

    </xsl:call-template>     

<!--

    <xsl:choose>

     <xsl:when test="@value = 'CAM' "><xsl:value-of select="$AID-CAM"/></xsl:when>

     <xsl:when test="@value = 'DENM' "><xsl:value-of select="$AID-DENM"/></xsl:when>
@@ -288,12 +336,15 @@ 
     <xsl:when test="@value = 'TLC' or @value = 'SREM'"><xsl:value-of select="$AID-SREM"/></xsl:when>

     <xsl:when test="@value = 'SSEM'"><xsl:value-of select="$AID-SSEM"/></xsl:when>

     <xsl:when test="@value = 'GPC'"><xsl:value-of select="$AID-GPC"/></xsl:when>

     <xsl:when test="@value = 'CPM'"><xsl:value-of select="$AID-CPM"/></xsl:when>

     <xsl:when test="@value = 'VAM'"><xsl:value-of select="$AID-VAM"/></xsl:when>

     <xsl:when test="@value = 'CRT-REQ'"><xsl:value-of select="$AID-CRT-REQ"/></xsl:when>

     <xsl:when test="@value = 'CRL'"><xsl:value-of select="$AID-CRL"/></xsl:when>

     <xsl:when test="@value = 'CTL'"><xsl:value-of select="$AID-CTL"/></xsl:when>

     <xsl:when test="@value = 'GN-MGMT'"><xsl:value-of select="$AID-GN-MGMT"/></xsl:when>

     <xsl:otherwise><xsl:value-of select="@value"/></xsl:otherwise>

    </xsl:choose>

-->

   </psid>

   <xsl:if test="string-length($SSPValue) &gt; 0">

    <sspRange>
@@ -306,7 +357,7 @@ 
  </PsidSspRange>

 </xsl:template>



 <xsl:template match="attribute[@type='its_aid_ssp_list']">

 <xsl:template match="attribute[@type='its_aid_ssp_list' or @type='app_aid_list']">

   <appPermissions>

    <xsl:apply-templates mode="appPermissions" select="ssp"/>

   </appPermissions>
@@ -325,6 +376,8 @@ 
      <xsl:when test="@aid = 'TLC' or @aid = 'SREM'"><xsl:value-of select="$AID-SREM"/></xsl:when>

      <xsl:when test="@aid = 'SSEM'"><xsl:value-of select="$AID-SSEM"/></xsl:when>

      <xsl:when test="@aid = 'GPC'"><xsl:value-of select="$AID-GPC"/></xsl:when>

      <xsl:when test="@aid = 'CPM'"><xsl:value-of select="$AID-CPM"/></xsl:when>

      <xsl:when test="@aid = 'VAM'"><xsl:value-of select="$AID-VAM"/></xsl:when>

      <xsl:when test="@aid = 'CRT-REQ'"><xsl:value-of select="$AID-CRT-REQ"/></xsl:when>

      <xsl:when test="@aid = 'CRL'"><xsl:value-of select="$AID-CRL"/></xsl:when>

      <xsl:when test="@aid = 'CTL'"><xsl:value-of select="$AID-CTL"/></xsl:when>
@@ -749,7 +802,6 @@ 
   <sSig/>

  </xsl:template>





  <xsl:template name="ConvertDecToHex">

    <xsl:param name="index" />

    <xsl:if test="$index > 0">

certgen/asncodec.vcxproj

+4 −4
Original line number Diff line number Diff line
@@ -861,26 +861,26 @@ 
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <UseDebugLibraries>true</UseDebugLibraries>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v143</PlatformToolset>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <UseDebugLibraries>true</UseDebugLibraries>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v143</PlatformToolset>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <UseDebugLibraries>false</UseDebugLibraries>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v143</PlatformToolset>

    <WholeProgramOptimization>true</WholeProgramOptimization>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

    <ConfigurationType>StaticLibrary</ConfigurationType>

    <UseDebugLibraries>false</UseDebugLibraries>

    <PlatformToolset>v142</PlatformToolset>

    <PlatformToolset>v143</PlatformToolset>

    <WholeProgramOptimization>true</WholeProgramOptimization>

    <CharacterSet>MultiByte</CharacterSet>

  </PropertyGroup>

certgen/asncodec/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ ASN1CDIR ?= ../../../../asn1c-fillabs2 


ifeq (,$(ASN1C))

 ifneq (,$(ASN1CDIR))

  ASN1C := $(ASN1CDIR)/asn1c/.libs/asn1c -S $(ASN1CDIR)/skeletons

  ASN1C := $(ASN1CDIR)/asn1c/asn1c -S $(ASN1CDIR)/skeletons

 else

  ASN1C := asn1c

 endif
@@ -32,7 +32,7 @@ endif 
ASN1C_ARGS := -no-gen-BER -no-gen-JER -no-gen-UPER -no-gen-APER -no-gen-random-fill -no-gen-example



ASN1_SRC := \

	$(TS102941_DIR)/EtsiTs102941MessagesCA.asn \

	$(TS102941_DIR)/EtsiTs102941MessagesCa.asn \

	$(TS102941_DIR)/EtsiTs102941TrustLists.asn \

	$(TS102941_DIR)/EtsiTs102941TypesAuthorization.asn \

	$(TS102941_DIR)/EtsiTs102941TypesAuthorizationValidation.asn \
@@ -42,8 +42,8 @@ ASN1_SRC := \ 
	$(TS102941_DIR)/EtsiTs102941TypesLinkCertificate.asn \

    $(TS103097_DIR)/EtsiTs103097Module.asn \

    $(TS103097_DIR)/EtsiTs103097ExtensionModule.asn \

    $(IEEE1609_2_DIR)/IEEE1609dot2.asn \

    $(IEEE1609_2_DIR)/IEEE1609dot2BaseTypes.asn \

    $(IEEE1609_2_DIR)/Ieee1609Dot2.asn \

    $(IEEE1609_2_DIR)/Ieee1609Dot2BaseTypes.asn \

    $(IEEE1609_2_DIR)/Ieee1609Dot2Crl.asn \

    $(IEEE1609_2_DIR)/Ieee1609Dot2CrlBaseTypes.asn \

    $(IEEE1609_2_1_DIR)/Ieee1609Dot2Dot1AcaEeInterface.asn \