Commits (7)
ASN1_SRC := $(wildcard *.asn)
ASN1_PDU := Ieee1609Dot2Data Certificate
#ASN1_KNOWN := DATE
#ASN1CDIR ?= $(USERPROFILE)/Work/asn1c-fillabs
ifneq (,$(ASN1CDIR))
ASN1C := $(ASN1CDIR)/asn1c/.libs/asn1c -S $(ASN1CDIR)/skeletons
else
ASN1C := asn1c
endif
.PHONY: validate doc build
validate: iso build
doc: docs
python3 asn2md.py -o docs $(ASN1_SRC)
iso docs:
mkdir -p $@
build: $(ASN1_SRC) $(ASN1_SRC_VALIDATE)
$(ASN1C) -E -F -fcompound-names $(addprefix -fknown-extern-type=,$(ASN1_KNOWN)) $(addprefix -pdu=,$(ASN1_PDU)) $^ >/dev/null
variables:
GIT_SUBMODULE_STRATEGY: normal
image: danya25/asn1c:0.0.5
validate:
stage: test
script: make -f .gitlab-ci.mk validate
only:
changes:
- "asn/*.asn"
documentation:
stage: deploy
script:
- curl --header "PRIVATE-TOKEN:$CI_DOC_TOKEN" https://forge.etsi.org/rep/api/v4/projects/592/repository/files/asn2md.py?ref=master | python3 -c "import sys, json, base64; open('asn2md.py', 'wb').write(base64.b64decode(json.load(sys.stdin)['content']))"
- make -f .gitlab-ci.mk doc
- >
if [ -z "$(git status --untracked-files=no --porcelain)" ]; then
echo "No changes found";
else
git add docs/*.md &&
git commit -m "Documentation update" &&
git remote rm origin && git remote add origin https://oauth2:$CI_DOC_TOKEN@forge.etsi.org/rep/$CI_PROJECT_PATH.git &&
git push origin HEAD:$CI_COMMIT_REF_NAME;
fi
only:
changes:
- "asn/*.asn"
......@@ -10,7 +10,7 @@
Ieee1609Dot2 {iso(1) identified-organization(3) ieee(111)
standards-association-numbered-series-standards(2) wave-stds(1609)
dot2(2) base (1) schema (1) major-version-2(2) minor-version-3(3)}
dot2(2) base (1) schema (1) major-version-2(2) minor-version-4(4)}
DEFINITIONS AUTOMATIC TAGS ::= BEGIN
......@@ -51,13 +51,12 @@ IMPORTS
ValidityPeriod
FROM Ieee1609Dot2BaseTypes {iso(1) identified-organization(3) ieee(111)
standards-association-numbered-series-standards(2) wave-stds(1609) dot2(2)
base(1) base-types(2) major-version-2(2) minor-version-2(2)}
--WITH SUCCESSORS
EtsiOriginatingHeaderInfoExtension
FROM EtsiTs103097ExtensionModule {itu-t(0) identified-organization(4)
etsi(0) itsDomain(5) wg5(5) secHeaders(103097) extension(2)
version1(1)}
version-1(1) minor-version-1(1)}
--WITH SUCCESSORS
;
......@@ -105,7 +104,8 @@ FROM EtsiTs103097ExtensionModule {itu-t(0) identified-organization(4)
signedData SignedData,
encryptedData EncryptedData,
signedCertificateRequest Opaque,
...
...,
signedX509CertificateRequest Opaque
}
/**
......@@ -1051,7 +1051,8 @@ FROM EtsiTs103097ExtensionModule {itu-t(0) identified-organization(4)
canRequestRollover NULL OPTIONAL,
encryptionKey PublicEncryptionKey OPTIONAL,
verifyKeyIndicator VerificationKeyIndicator,
...
...,
flags BIT STRING {cubk (0)} (SIZE (8)) OPTIONAL
}
(WITH COMPONENTS { ..., appPermissions PRESENT} |
WITH COMPONENTS { ..., certIssuePermissions PRESENT} |
......
......@@ -10,7 +10,7 @@
Ieee1609Dot2BaseTypes {iso(1) identified-organization(3) ieee(111)
standards-association-numbered-series-standards(2) wave-stds(1609) dot2(2)
base(1) base-types(2) major-version-2(2) minor-version-2(2)}
base(1) base-types(2) major-version-2(2) minor-version-3(3)}
DEFINITIONS AUTOMATIC TAGS ::= BEGIN
......@@ -657,7 +657,8 @@ EXPORTS ALL;
ecdsaNistP256Signature EcdsaP256Signature,
ecdsaBrainpoolP256r1Signature EcdsaP256Signature,
...,
ecdsaBrainpoolP384r1Signature EcdsaP384Signature
ecdsaBrainpoolP384r1Signature EcdsaP384Signature,
ecdsaNistP384Signature EcdsaP384Signature
}
/**
......@@ -923,7 +924,8 @@ EXPORTS ALL;
ecdsaNistP256 EccP256CurvePoint,
ecdsaBrainpoolP256r1 EccP256CurvePoint,
...,
ecdsaBrainpoolP384r1 EccP384CurvePoint
ecdsaBrainpoolP384r1 EccP384CurvePoint,
ecdsaNistP384 EccP384CurvePoint
}
/**
......
......@@ -2,6 +2,6 @@
___!!! This is a testing branch to be used with the ETSI test suite !!!___
The module was published as a part of delivery **[ETSI TS 103 097 v1.4.1](http://www.etsi.org/deliver/etsi_ts/103000_103099/103097/01.04.01_60/ts_103097v010401p.pdf)**
The module was published as a part of delivery **[ETSI TS 103 097 v2.1.1](http://www.etsi.org/deliver/etsi_ts/103000_103099/103097/02.01.01_60/ts_103097v020101p.pdf)**
The module contains extensions published with IEEE 1609.2.1