From 752bff8eb0ac3b9b4c4cdb1c639b32ebbcd281b0 Mon Sep 17 00:00:00 2001
From: Jernej Kos <jernej@kos.mx>
Date: Tue, 6 Jun 2023 09:51:53 +0200
Subject: [PATCH] docker/aesmd: Update Intel SGX package signing key

---
 .changelog/5279.trivial.md     |   1 +
 docker/aesmd/Dockerfile        |   2 +-
 docker/aesmd/intel-sgx-deb.asc |  16 ++++++++++++++++
 docker/aesmd/intel-sgx-deb.gpg | Bin 362 -> 0 bytes
 4 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 .changelog/5279.trivial.md
 create mode 100644 docker/aesmd/intel-sgx-deb.asc
 delete mode 100644 docker/aesmd/intel-sgx-deb.gpg

diff --git a/.changelog/5279.trivial.md b/.changelog/5279.trivial.md
new file mode 100644
index 00000000000..e137408c9fd
--- /dev/null
+++ b/.changelog/5279.trivial.md
@@ -0,0 +1 @@
+docker/aesmd: Update Intel SGX package signing key
diff --git a/docker/aesmd/Dockerfile b/docker/aesmd/Dockerfile
index 65bfd8762da..b67c9b6b231 100644
--- a/docker/aesmd/Dockerfile
+++ b/docker/aesmd/Dockerfile
@@ -4,7 +4,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update -qq && apt-get install -qq curl lsb-release gpg
 
-ADD intel-sgx-deb.gpg /etc/apt/trusted.gpg.d
+ADD intel-sgx-deb.asc /etc/apt/trusted.gpg.d
 
 RUN echo "deb https://download.01.org/intel-sgx/sgx_repo/ubuntu $(lsb_release -cs) main" > /etc/apt/sources.list.d/intel-sgx.list && \
     apt-get update -qq && apt-get install -qq sgx-aesm-service libsgx-aesm-launch-plugin libsgx-aesm-epid-plugin
diff --git a/docker/aesmd/intel-sgx-deb.asc b/docker/aesmd/intel-sgx-deb.asc
new file mode 100644
index 00000000000..2f1096dab16
--- /dev/null
+++ b/docker/aesmd/intel-sgx-deb.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBGQX9NQBCAC5r7FjjZ8p6nTy2GGyKltSGY6qXxAgZiVV4/kf3/mtcBiboGm6hAaBozNBFnch
+Yw2x585L9/cgKzSbaryI02/KF7Hqgqda/szBQDbDXWL0m8kAGrZdMqOZagR3qiguzG07hs8gvKvL
+pF4qSrGCLalAZ6ZirpyPaGAH8OtzjYKJEx+zvg2k0f0fNyn3qfoKGOQCTO56AQ6OeUU7I9eqn4mR
+9ZmiqW7jDzb5cD9YdaLK0bnloBvB5Cgb6jJSco+JvTAMAGFBEIvPYMCaAoc9adDLglBsxB60Knk6
+XzxKY2dulMSkSvObRpmFWesO+BBueYzNpX6ulciCyTuJMYRt8qmVABEBAAG1AClDTj1JbnRlbChS
+KSBTb2Z0d2FyZSBEZXZlbG9wbWVudCBQcm9kdWN0c4kBPgQTAQgAKAUCZBf01AIbAwUJB4YfgAYL
+CQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ5cfw+hxsbDwDmgf+MjkAdCZAZeGUlxJ5fOqOSGQ4
+xot/eGsHEBTkd0IYNzY0yCcigul6RWAingJQh1e5oIl+5S9OB6l64F4mmcKIDld7B9rmO1yt2brN
+gzt7Hvf3nLnf7oTT7WNleDvgY2tW48PsEZiuRwnlanjjO4o3wLknBHD7lb1u2rI0978EAvDluWu9
+W1W9laRZcsVOgNjtatzcFHjLOt4UYoXOhKlqm0XE6p5NYR1u16DhjHcb8FjpxavOCtq927qgtDvg
+GVkM2m7D6hYXCZFnYaINrhbSxSpcyNbHomGEzYTvk0d8q/bS72LgvErP5amQFMileKE14aeZPgm2
+zao8yeGaVLHhvA==
+=8t8o
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/docker/aesmd/intel-sgx-deb.gpg b/docker/aesmd/intel-sgx-deb.gpg
deleted file mode 100644
index 7af2429d7bca8dd79ec8b667006e7c9ed1f65813..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 362
zcmV-w0hRul0F4A(=Tz(g1OVo9JKTJ~Oh%S;oSDROMS+d2T7<ItB)eZQAO2zs8>-%)
z`W+K829zc<)OxA5B-kCY(W))P32W32u`Vi&ybRb*yghHhmb_z2GRNWh9a0(?(;W8|
zx=?!%_k<ZU0AftA8XI;O1JL6Z;wrfhtRGmi*6;K?M<A&MNDL2!;eP-T0RRED02Wh6
zSYJd#K~P_EWpHm_b7^O8Uu$J~i2%L?69EVSC<Ovs=Tz(h8v_Li2ZkSj1`7!Y2Ll2I
z6$k<e3JU}l0s{d89svRufB*^!5UORZCMFv)3p_mp0F|b0BL2qwW6cfC6~%V)mugA`
zR)(sHed!FMUBFb;t7CHrd0Rm%rz%cqE*_|K?e}lVus(1fPmu2lo!Xh<Y@~0&BQ`gD
zIjYFqj7xwDOlxk2K^)mMbIN3TmarBS1(N>GUXFyL0bpH<>{5ma<nipmsG+sk%>-F)
IQ;KS=$;xDqmjD0&