From 4c6faa670e55b56c927252fb0ac045a10ccac4d2 Mon Sep 17 00:00:00 2001
From: Paolo Palmieri
Date: Thu, 1 Feb 2024 13:52:55 +0000
Subject: [PATCH 1/2] Update conferences.yml
Added Mal-IoT 2024
---
_data/conferences.yml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/_data/conferences.yml b/_data/conferences.yml
index 98ff6b06..a6e38c69 100644
--- a/_data/conferences.yml
+++ b/_data/conferences.yml
@@ -844,3 +844,13 @@
date: Jul 30
place: Vienna, Austria
tags: [SEC, SHOP]
+
+- name: MAL-IoT
+ description: Malicious Software and Hardware in Internet of Things
+ year: 2024
+ link: http://mal-iot2024.alari.ch/
+ deadline: ["2024-02-21 23:59"]
+ comment: Co-located with ACM Computing Frontiers 2024
+ date: May 7
+ place: Ischia, Italy
+ tags: [SEC, PRIV, CRYPTO, SHOP]
From 677ffc213763440ec36451c76909778b8ef2f434 Mon Sep 17 00:00:00 2001
From: Clement Fung
Date: Fri, 2 Feb 2024 09:22:31 -0500
Subject: [PATCH 2/2] Remove prior years version
---
_data/conferences.yml | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/_data/conferences.yml b/_data/conferences.yml
index a6e38c69..a5ba028d 100644
--- a/_data/conferences.yml
+++ b/_data/conferences.yml
@@ -733,12 +733,12 @@
- name: MAL-IoT
description: Malicious Software and Hardware in Internet of Things
- year: 2023
- link: http://mal-iot2023.alari.ch/
- deadline: ["2023-03-08 23:59"]
- comment: Co-located with ACM Computing Frontiers 2023
- date: May 9
- place: Bologna, Italy
+ year: 2024
+ link: http://mal-iot2024.alari.ch/
+ deadline: ["2024-02-21 23:59"]
+ comment: Co-located with ACM Computing Frontiers 2024
+ date: May 7
+ place: Ischia, Italy
tags: [SEC, PRIV, CRYPTO, SHOP]
- name: DevSecOpsRO
@@ -845,12 +845,3 @@
place: Vienna, Austria
tags: [SEC, SHOP]
-- name: MAL-IoT
- description: Malicious Software and Hardware in Internet of Things
- year: 2024
- link: http://mal-iot2024.alari.ch/
- deadline: ["2024-02-21 23:59"]
- comment: Co-located with ACM Computing Frontiers 2024
- date: May 7
- place: Ischia, Italy
- tags: [SEC, PRIV, CRYPTO, SHOP]