Commit 44b7441b authored by Yann Garcia's avatar Yann Garcia
Browse files

Enhance virtualization/docker scripts

parent 8b0349e1

etc/AtsPki/AtsPki_Microsec.cfg_

+17 −9
Original line number Original line Diff line number Diff line
@@ -64,12 +64,19 @@ LibItsPki_Pics.PICS_ITS_S_SIGN_NISTP256_PUBLIC_KEY := '038038f5490cd5a58ff5465d3 
#LibItsPki_Pixits.PX_EC_ALG_FOR_EC_SIGN := e_brainpool_p256_r1 # e_nist_p256, e_sm2_p256 or e_brainpool_p256_r1

#LibItsPki_Pixits.PX_EC_ALG_FOR_EC_SIGN := e_brainpool_p256_r1 # e_nist_p256, e_sm2_p256 or e_brainpool_p256_r1

#LibItsPki_Pixits.PX_EC_ALG_FOR_ATV     := e_brainpool_p256_r1 # e_nist_p256, e_sm2_p256 or e_brainpool_p256_r1

#LibItsPki_Pixits.PX_EC_ALG_FOR_ATV     := e_brainpool_p256_r1 # e_nist_p256, e_sm2_p256 or e_brainpool_p256_r1





# Certificate duration in seconds

LibItsPki_Pixits.PX_GENERATED_CERTIFICATE_DURATION := 7*24*3600 # One week duration, in seconds



# ITS-S message's SSPs

LibItsPki_Pixits.PX_INNER_EC_CERTFICATE_BITMAP_SSP_CAM  := '01FFFC'O

LibItsPki_Pixits.PX_INNER_EC_CERTFICATE_BITMAP_SSP_DENM := '01FFFFFF'O



# Certificate areas tests

# Certificate areas tests

LibItsSecurity_Pics.PICS_SEC_CIRCULAR_REGION    := false

LibItsSecurity_Pics.PICS_SEC_CIRCULAR_REGION    := false

LibItsSecurity_Pics.PICS_SEC_RECTANGULAR_REGION := true

LibItsSecurity_Pics.PICS_SEC_RECTANGULAR_REGION := true





# BFK

# BFK

LibItsSecurity_Pics.PICS_SEC_BFK_AUTH                   := true

LibItsSecurity_Pics.PICS_SEC_BFK_AUTH                   := false

LibItsSecurity_Pics.PICS_SECPKI_ORIGINAL_BFK_KEY        := true

LibItsSecurity_Pics.PICS_SECPKI_ORIGINAL_BFK_KEY        := true

LibItsSecurity_Pics.PICS_SECPKI_UNIFIED_BFK_KEY         := false

LibItsSecurity_Pics.PICS_SECPKI_UNIFIED_BFK_KEY         := false

LibItsSecurity_Pics.PICS_SECPKI_COMPACT_UNIFIED_BFK_KEY := false

LibItsSecurity_Pics.PICS_SECPKI_COMPACT_UNIFIED_BFK_KEY := false
@@ -79,10 +86,10 @@ LibItsSecurity_Pics.PICS_SECPKI_COMPACT_UNIFIED_BFK_KEY := false 
# you want to log into the file or display on console (standard error).

# you want to log into the file or display on console (standard error).





LogFile := "../logs/AtsPki/%e.%h-%r.%s"

LogFile := "../logs/AtsPki/%e.%h-%r.%s"

FileMask := LOG_ALL | USER | DEBUG | MATCHING

#FileMask := LOG_ALL | USER | DEBUG | MATCHING

ConsoleMask := LOG_ALL | USER | DEBUG | MATCHING

#ConsoleMask := LOG_ALL | USER | DEBUG | MATCHING

#FileMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP

FileMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP | PORTEVENT | TIMEROP | TESTCASE

#ConsoleMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP

ConsoleMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP | PORTEVENT | TIMEROP | TESTCASE

LogSourceInfo := Stack

LogSourceInfo := Stack

LogEntityName:= Yes

LogEntityName:= Yes

LogEventTypes:= Yes

LogEventTypes:= Yes
@@ -99,6 +106,7 @@ system.httpCaPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/ 




[EXECUTE]

[EXECUTE]

# Config:

# Config:

#   LibItsSecurity_Pics.PICS_SEC_BFK_AUTH     := false

#   LibItsPki_Pics.PICS_SIMULATE_EA_ENTITY    := false # CERT_TS_A_EA shall be trusted by the PKI

#   LibItsPki_Pics.PICS_SIMULATE_EA_ENTITY    := false # CERT_TS_A_EA shall be trusted by the PKI

#   LibItsPki_Pics.PICS_TS_EA_CERTIFICATE_ID  := PKI EA cert

#   LibItsPki_Pics.PICS_TS_EA_CERTIFICATE_ID  := PKI EA cert

#   LibItsPki_Pics.PICS_TS_AA_CERTIFICATE_ID  := "CERT_TS_A_AA" # CERT_TS_A_AA & CERT_IUT_A_RCA shall be trusted by the PKI

#   LibItsPki_Pics.PICS_TS_AA_CERTIFICATE_ID  := "CERT_TS_A_AA" # CERT_TS_A_AA & CERT_IUT_A_RCA shall be trusted by the PKI
@@ -170,7 +178,7 @@ system.httpCaPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/ 
#   LibItsSecurity_Pics.PICS_SECPKI_ORIGINAL_BFK_KEY        := true

#   LibItsSecurity_Pics.PICS_SECPKI_ORIGINAL_BFK_KEY        := true

# Check that the EA sends the butterfly authorization respond message after receiving of the butterfly authorization request

# Check that the EA sends the butterfly authorization respond message after receiving of the butterfly authorization request

# Check that this message is signed with EA certificate

# Check that this message is signed with EA certificate

#ItsPki_TestCases.TC_SECPKI_EA_BFK_AUTH_01_BV

ItsPki_TestCases.TC_SECPKI_EA_BFK_AUTH_01_BV

# Check that the butterfly authorization respond message, sent by EA, contains all necessary fields

# Check that the butterfly authorization respond message, sent by EA, contains all necessary fields

#ItsPki_TestCases.TC_SECPKI_EA_BFK_AUTH_02_BV

#ItsPki_TestCases.TC_SECPKI_EA_BFK_AUTH_02_BV

# Check that the EA sends butterfly certificate request message after receiving of the butterfly authorization request

# Check that the EA sends butterfly certificate request message after receiving of the butterfly authorization request
@@ -182,7 +190,7 @@ system.httpCaPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/ 
# Check that the butterfly certificate request message contains expanded cocoon key

# Check that the butterfly certificate request message contains expanded cocoon key

#ItsPki_TestCases.TC_SECPKI_EA_BFK_AUTH_05_BV

#ItsPki_TestCases.TC_SECPKI_EA_BFK_AUTH_05_BV

# Check that the butterfly certificate request message sent by EA to AA  contains all required elements

# Check that the butterfly certificate request message sent by EA to AA  contains all required elements

ItsPki_TestCases.TC_SECPKI_EA_BFK_AUTH_06_BV

#ItsPki_TestCases.TC_SECPKI_EA_BFK_AUTH_06_BV





# The EtsiTs103097Data-Encrypted is build with the component recipients containing one instance of RecipientInfo of choice pskRecipInfo, which contains the HashedId8 of the symmetric key used by the ITS-S to encrypt the AuthorizationRequest message to which the response is built and the component ciphertext containing the encrypted representation of the EtsiTs103097Data-Signed. The encryption uses a ETSI TS 103 097 [3] approved algorithm

# The EtsiTs103097Data-Encrypted is build with the component recipients containing one instance of RecipientInfo of choice pskRecipInfo, which contains the HashedId8 of the symmetric key used by the ITS-S to encrypt the AuthorizationRequest message to which the response is built and the component ciphertext containing the encrypted representation of the EtsiTs103097Data-Signed. The encryption uses a ETSI TS 103 097 [3] approved algorithm

#ItsPki_TestCases.TC_SECPKI_EA_AUTHVAL_01_BV

#ItsPki_TestCases.TC_SECPKI_EA_AUTHVAL_01_BV

AtsPki @ c148ec09

Compare facdaff6 to c148ec09
Original line number Original line Diff line number Diff line 
Subproject commit facdaff61bf3d3876f2accf45fef50d3ccf0ea4b
 
Subproject commit c148ec0980f14bc36a74b80aa6cfc83ff8b8d817

AtsSecurity @ dd305e71

Compare f958cd95 to dd305e71
Original line number Original line Diff line number Diff line 
Subproject commit f958cd9517897d535602a8049516f58a58ce9f3b
 
Subproject commit dd305e715a9dbc79a465dd8990010e56a18c602d

virtualization/docker/Dockerfile

+0 −5
Original line number Original line Diff line number Diff line
@@ -36,11 +36,6 @@ ENV TTCN3_DIR=/home/etsi/frameworks/titan/titan.core/Install 
ENV PATH=$TTCN3_DIR/bin:$PATH \

ENV PATH=$TTCN3_DIR/bin:$PATH \

    LD_LIBRARY_PATH=$TTCN3_DIR/lib:$LD_LIBRARY_PATH

    LD_LIBRARY_PATH=$TTCN3_DIR/lib:$LD_LIBRARY_PATH





# Workaround for issue in Settings.cc

RUN \

    sed --in-place '623s/NULL/false/' ./compiler2/Setting.cc \

    && sed --in-place '639s/NULL/false/' ./compiler2/Setting.cc || exit 1



# Set flags & Build Titan

# Set flags & Build Titan

RUN \

RUN \

    echo "ALPINE_LINUX=yes" > Makefile.personal && \

    echo "ALPINE_LINUX=yes" > Makefile.personal && \

virtualization/docker/docker-entrypoint.sh

+3 −0
Original line number Original line Diff line number Diff line 
#!/usr/bin/env bash

#!/usr/bin/env bash





set -euo pipefail

set -euo pipefail

set +vx





usage() {

usage() {

	echo "No command specified. Available commands:"

	echo "No command specified. Available commands:"
@@ -12,6 +13,8 @@ usage() { 
	echo "e.g. docker-run.sh build Security # To build the AtsSecurity test suite"

	echo "e.g. docker-run.sh build Security # To build the AtsSecurity test suite"

}

}





cli="${GEN_DIR}/bin/TS.ITS_r2"



commands="help,build,clean,ip,list,modulepar,ping,rebuild,build-run,run,version"

commands="help,build,clean,ip,list,modulepar,ping,rebuild,build-run,run,version"





if [ $# == 0 ]; then

if [ $# == 0 ]; then