From 56ec94038be4e00a50a3d81a4cd3c433e3ff7821 Mon Sep 17 00:00:00 2001
From: Denis Filatov <dfilatov@free.fr>
Date: Mon, 15 Jun 2020 17:53:25 +0200
Subject: [PATCH] Ieee 1609.2b-2019

---
 IEEE1609dot2.asn          | 19 ++++++++++++-------
 IEEE1609dot2BaseTypes.asn |  7 ++++++-
 README.md                 |  8 ++++----
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/IEEE1609dot2.asn b/IEEE1609dot2.asn
index 9c876da..f6763d6 100755
--- a/IEEE1609dot2.asn
+++ b/IEEE1609dot2.asn
@@ -1,8 +1,8 @@
 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)}
+dot2(2) base(1) schema(1) major-version-2(2) minor-version-2(2)}
 
--- Minor version: 1
+-- Minor version: 2
 
 --******************************************************************************
 -- 
@@ -17,13 +17,14 @@ EXPORTS ALL;
 IMPORTS 
   CrlSeries,
   EccP256CurvePoint,
-  EciesP256EncryptedKey,
+  EncryptedDataEncryptionKey,
   EncryptionKey,
   GeographicRegion,
   GroupLinkageValue,
   HashAlgorithm,
   HashedId3,
   HashedId8,
+  HashedId32,
   Hostname,
   IValue,
   LinkageValue,
@@ -121,7 +122,8 @@ HeaderInfo ::= SEQUENCE  {
     encryptionKey          EncryptionKey OPTIONAL,
     ...,
     inlineP2pcdRequest     SequenceOfHashedId3 OPTIONAL,
-    requestedCertificate   Certificate OPTIONAL
+    requestedCertificate Certificate OPTIONAL,
+    pduFunctionalType PduFunctionalType OPTIONAL
 }
 
 MissingCrlIdentifier ::= SEQUENCE  {
@@ -129,6 +131,9 @@ MissingCrlIdentifier ::= SEQUENCE  {
     crlSeries       CrlSeries,
     ...
 }
+PduFunctionalType ::= INTEGER (0..255)
+    tlsHandshake PduFunctionalType ::= 1
+    iso21177ExtendedAuth PduFunctionalType ::= 2
 
 Countersignature ::= Ieee1609Dot2Data (WITH COMPONENTS {...,
   content (WITH COMPONENTS {..., 
@@ -190,11 +195,11 @@ EncryptedDataEncryptionKey ::= CHOICE  {
 }
 
 SymmetricCiphertext ::= CHOICE  {
-    aes128ccm           AesCcmCiphertext,
+    aes128ccm Aes128CcmCiphertext,
     ...
 }
 
-AesCcmCiphertext ::= SEQUENCE  {
+Aes128CcmCiphertext ::= SEQUENCE {
     nonce           OCTET STRING (SIZE (12)),
     ccmCiphertext   Opaque -- 16 bytes longer than plaintext
 }
@@ -284,7 +289,7 @@ LinkageData ::= SEQUENCE  {
     group-linkage-value   GroupLinkageValue OPTIONAL
 }
          
-EndEntityType ::= BIT STRING {app (0), enrol (1) } (SIZE (8)) (ALL EXCEPT {})
+EndEntityType ::= BIT STRING {app (0), enroll (1) } (SIZE (8)) (ALL EXCEPT {})
 
 PsidGroupPermissions ::= SEQUENCE  {
     subjectPermissions SubjectPermissions,
diff --git a/IEEE1609dot2BaseTypes.asn b/IEEE1609dot2BaseTypes.asn
index b05584d..842ff4a 100755
--- a/IEEE1609dot2BaseTypes.asn
+++ b/IEEE1609dot2BaseTypes.asn
@@ -40,9 +40,10 @@ SequenceOfUint16 ::= SEQUENCE OF Uint16
 
 Opaque ::= OCTET STRING
 
-  
+HashedId32 ::= OCTET STRING (SIZE(32))
 HashedId10 ::= OCTET STRING (SIZE(10))
 HashedId8  ::= OCTET STRING (SIZE(8))
+HashedId4 ::= OCTET STRING (SIZE(4))
 HashedId3  ::= OCTET STRING (SIZE(3))
 SequenceOfHashedId3 ::= SEQUENCE OF HashedId3
 
@@ -280,6 +281,10 @@ ServiceSpecificPermissions ::= CHOICE  {
 
 BitmapSsp ::= OCTET STRING (SIZE(0..31))
 
+SspValue ::= OCTET STRING (SIZE(0..31))
+
+SspBitmask ::= OCTET STRING (SIZE(0..31))
+
 PsidSspRange ::= SEQUENCE  {
     psid                Psid,
     sspRange            SspRange OPTIONAL
diff --git a/README.md b/README.md
index b6a083c..656b9cf 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # The IEEE 1609.2 ASN.1 module
 
-The ASN.1 module contained in the **IEEE Std 1609.2™-2016**: "IEEE Standard for Wireless Access in Vehicular Environments -- Security Services for Applications and Management Messages",
-  as amended by IEEE Std 1609.2a™-2017: "Standard for Wireless Access In Vehicular Environments -- Security Services for Applications and Management Messages Amendment 1".
+The ASN.1 module contained in the **IEEE Std 1609.2b™-2019**: "IEEE Standard for Wireless Access in Vehicular Environments -- Security Services for Applications and Management Messages",
+  as amended by IEEE Std 1609.2a™-2017: "Standard for Wireless Access In Vehicular Environments -- Security Services for Applications and Management Messages Amendment 1 and 2".
 
-This repository provides a copy of the ASN.1 modules from IEEE Std 1609.2 and its amendments, reprinted with permission from IEEE, Copyright © 2016.
+This repository provides a copy of the ASN.1 modules from IEEE Std 1609.2 and its amendments (a)-2016 and (b)-2019, reprinted with permission from IEEE, Copyright © 2016.
 
-This module was published as a part of **[ETSI TS 103 097 v1.3.1](http://www.etsi.org/deliver/etsi_ts/103000_103099/103097/01.03.01_60/ts_103097v010301p.pdf)** (2017-10).
+This module was published as a part of **[ETSI TS 103 097 v1.4.1](http://www.etsi.org/deliver/etsi_ts/103000_103099/103097/01.04.01_60/ts_103097v010401p.pdf)**.
-- 
GitLab