Skip to content

Commit b7544e0

Browse files
committed
remove zmq revocation actions feature
Revocation through zmq is scheduled to be removed for the next major release and is already marked as deprecated. Signed-off-by: Vikram Narayanan <[email protected]>
1 parent a4c3846 commit b7544e0

File tree

10 files changed

+5
-450
lines changed

10 files changed

+5
-450
lines changed

Cargo.lock

Lines changed: 1 addition & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,10 @@ The following packages are required for building:
3636
* `libarchive-devel`
3737
* `openssl-devel`
3838
* `tpm2-tss-devel`
39-
* (optional for the `with-zmq` feature): `zeromq-devel`
4039

4140
To install, use the following command:
4241
```
43-
$ dnf install clang libarchive-devel openssl-devel tpm2-tss-devel zeromq-devel
42+
$ dnf install clang libarchive-devel openssl-devel tpm2-tss-devel
4443
```
4544

4645
For runtime, the following packages are required:
@@ -50,7 +49,6 @@ For runtime, the following packages are required:
5049
* `tpm2-tss`
5150
* `systemd` (to run as systemd service)
5251
* `util-linux-core` (for the `mount` command)
53-
* (optional for the `with-zmq` feature): `zeromq`
5452

5553
#### Debian and Ubuntu
5654

@@ -61,12 +59,11 @@ For Debian and Ubuntu, use the following packages are required:
6159
* `libssl-dev`
6260
* `libtss2-dev`
6361
* `pkg-config`
64-
* (optional for the `with-zmq` feature): `libzmq3-dev`
6562

6663
To install, use the following command:
6764

6865
```
69-
$ apt-get install libarchive-dev libclang-dev libssl-dev libtss2-dev libzmq3-dev pkg-config
66+
$ apt-get install libarchive-dev libclang-dev libssl-dev libtss2-dev pkg-config
7067
```
7168

7269
For runtime, the following packages are required:
@@ -75,7 +72,6 @@ For runtime, the following packages are required:
7572
* `libarchive`
7673
* `libssl`
7774
* `libtss2-esys-3.0.2-0`
78-
* (optional for the `with-zmq` feature): `libzmq3`
7975
* `systemd` (to run as systemd service)
8076

8177
### Rust

docker/fedora/keylime_rust.Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ tpm2-abrmd \
5050
tpm2-tools \
5151
tpm2-tss \
5252
tpm2-tss-devel \
53-
uthash-devel \
54-
czmq-devel"
53+
uthash-devel"
5554

5655
RUN dnf makecache && \
5756
dnf -y install $PKGS_DEPS && \

keylime-agent.conf

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,6 @@ secure_size = "1m"
127127
# environment variable.
128128
extract_payload_zip = true
129129

130-
# Whether to listen for revocation notifications from the verifier via zeromq.
131-
# Note: The agent supports receiving revocation notifications via REST API
132-
# regardless of the value set here.
133-
#
134-
# To override enable_revocation_notifications, set
135-
# KEYLIME_AGENT_ENABLE_REVOCATION_NOTIFICATIONS environment variable.
136-
enable_revocation_notifications = false
137-
138130
# The path to the directory containing the pre-installed revocation action
139131
# scripts. Ideally should point to an fixed/immutable location subject to
140132
# attestation. The default is /usr/libexec/keylime.
@@ -143,17 +135,6 @@ enable_revocation_notifications = false
143135
# environment variable.
144136
revocation_actions_dir = "/usr/libexec/keylime"
145137

146-
# Revocation IP & Port used by the agent to receive revocation
147-
# notifications from the verifier via zeromq.
148-
# This is optional and used only when 'enable_revocation_notifications' is 'true'.
149-
#
150-
# To override revocation_notification_ip, set
151-
# KEYLIME_AGENT_REVOCATION_NOTIFICATION_IP environment variable.
152-
# To override revocation_notification_port, set
153-
# KEYLIME_AGENT_REVOCATION_NOTIFICATION_PORT environment variable.
154-
revocation_notification_ip = "127.0.0.1"
155-
revocation_notification_port = 8992
156-
157138
# The path to the certificate to verify revocation messages received from the
158139
# verifier. The path is relative to keylime_dir unless an absolute path is
159140
# provided (i.e. starts with '/').

keylime-agent/Cargo.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ tokio = {version = "1.24", features = ["rt", "sync", "macros"]}
3434
tss-esapi = {version = "7.2.0", features = ["generate-bindings"]}
3535
thiserror = "1.0"
3636
uuid = {version = "1.3", features = ["v4"]}
37-
zmq = {version = "0.9.2", optional = true}
3837
# wiremock was moved to be a regular dependency because optional
3938
# dev-dependencies are not supported
4039
# see: https://github.com/rust-lang/cargo/issues/1596
@@ -48,11 +47,6 @@ actix-rt = "2"
4847
default = []
4948
# this should change to dev-dependencies when we have integration testing
5049
testing = ["wiremock"]
51-
# Whether the agent should be compiled with support to listen for notification
52-
# messages on ZeroMQ
53-
#
54-
# This feature is deprecated and will be removed on next major release
55-
with-zmq = ["zmq"]
5650
# Whether the agent should be compiled with support for python revocation
5751
# actions loaded as modules, which is the only kind supported by the python
5852
# agent (unless the enhancement-55 is implemented). See:

0 commit comments

Comments
 (0)