Revert "Merge remote-tracking branch 'origin/cpm_vam' into feature/se…

…curity" This reverts commit 4ffad4f, reversing changes made to 65f1f81.
khevessy · Nov 10, 2024 · 4c15f21 · 4c15f21
1 parent 18e6f88
commit 4c15f21
Show file tree

Hide file tree

Showing 2,671 changed files with 19,428 additions and 100,748 deletions.
diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
@@ -15,5 +15,5 @@ jobs:
           ${{github.workspace}}/tools/docker
       - run: >
           docker run --rm
-          -v${{github.workspace}}:/home/build-user/workspace
+          -v${{github.workspace}}:/home/build-user/workspace:ro
           vanetza/docker-ci:${{matrix.ubuntu-version}}
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,4 @@
-.vscode/
-build/
-build.asn1/
+build
 conanfile.pyc
 doxygen/html/
-www/
+www/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -75,14 +75,6 @@ if (VANETZA_WITH_OPENSSL)
   include(CompatOpenSSLTargets)
 endif()
 
-# ASN.1 select ITS version
-option(VANETZA_ASN1_WITH_ITS2 "ENABLE ITS2 ASN.1 support" OFF)
-if(VANETZA_ASN1_WITH_ITS2)
-  set(VANETZA_USE_ITS2 1)
-else()
-  set(VANETZA_USE_ITS2 0)
-endif()
-
 add_subdirectory(vanetza/access)
 add_subdirectory(vanetza/asn1)
 add_subdirectory(vanetza/btp)

diff --git a/asn1/TS102894-2v221-CDD.asn b/asn1/TS102894-2v221-CDD.asn
diff --git a/asn1/TS103300-3v221-VAM-MotorcylistSpecialContainer.asn b/asn1/TS103300-3v221-VAM-MotorcylistSpecialContainer.asn
diff --git a/asn1/TS103300-3v221-VAM.asn b/asn1/TS103300-3v221-VAM.asn
diff --git a/asn1/TS103324v211-CPM-OriginatingStationContainers.asn b/asn1/TS103324v211-CPM-OriginatingStationContainers.asn
diff --git a/asn1/TS103324v211-CPM-PerceivedObjectContainer.asn b/asn1/TS103324v211-CPM-PerceivedObjectContainer.asn