Commit 4298fee5 authored by Denis Filatov's avatar Denis Filatov
Browse files

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

parents 6d5e3554 d7e83ce8

certgen/asn1certgen.xslt

+2 −0
Original line number Original line Diff line number Diff line
@@ -137,6 +137,7 @@ 
   <xsl:choose>

   <xsl:choose>

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

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

    <xsl:when test="@type = 'AA'">00110010</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 = 'TLM'">0</xsl:when>

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

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

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

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

   <xsl:choose>

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

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

    <xsl:when test="@type = 'AA'">0</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 = 'TLM'">0</xsl:when>

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

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

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

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

certgen/certgen.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -302,16 +302,19 @@ int main(int argc, char ** argv) 
	//_setup_default_time();

	//_setup_default_time();





	//parse options

	//parse options

	argc = coptions(argc, argv, COPT_HELP_NOVALUES , _options);

	argc = coptions(argc, argv, COPT_NOAUTOHELP , _options);

	if(argc < 2){

	if(argc < 2){

		if(argc<0 && (((int)0)-argc)<((sizeof(_options)/sizeof(_options[0]))-1)){

		if(argc<0 && (((int)0)-argc)<((sizeof(_options)/sizeof(_options[0]))-1)){

			printf("Unknown option %s\n", argv[0-argc]);

			printf("Unknown option %s\n", argv[0-argc]);

		}

		}



		if(COPT_EHELP != argc){

			const char * a = strrchr(argv[0], '/');

			const char * a = strrchr(argv[0], '/');

			if (a == NULL) a = argv[0];

			if (a == NULL) a = argv[0];

			coptions_help(stdout, a, COPT_HELP_NOVALUES, _options, "<xer> [signer] [count]");

			coptions_help(stdout, a, COPT_HELP_NOVALUES, _options, "<xer> [signer] [count]");

			return -1;

			return -1;

		}

		}

	}





	if (_searchPath == NULL) _searchPath = _outPath;

	if (_searchPath == NULL) _searchPath = _outPath;

	if (_keyPath == NULL)    _keyPath    = _outPath;

	if (_keyPath == NULL)    _keyPath    = _outPath;