From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id F004C1A813; Fri, 07 Nov 2025 19:24:29 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id C23A71A808; Fri, 07 Nov 2025 19:24:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_PASS,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=4.0.1 Received: from mail-yw1-x112c.google.com (mail-yw1-x112c.google.com [IPv6:2607:f8b0:4864:20::112c]) by atuin.qyliss.net (Postfix) with ESMTPS id 3A7D71A806 for ; Fri, 07 Nov 2025 19:24:20 +0000 (UTC) Received: by mail-yw1-x112c.google.com with SMTP id 00721157ae682-78682bab930so15845517b3.1 for ; Fri, 07 Nov 2025 11:24:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762543458; x=1763148258; darn=spectrum-os.org; h=in-reply-to:autocrypt:from:content-language:references:cc:to :subject:user-agent:mime-version:date:message-id:from:to:cc:subject :date:message-id:reply-to; bh=TqpLzUPio3nAGIMYvOJobwGJGKN6Mv1Bje8zwEs8kqQ=; b=EWbATXeMY/UBu/0w785XY0/8FEgBKm/AQQm02XHAbRxXWTGQwPb5Dzl97WL4NyCKoc wrx6IKmt7mlq+MHnSP9uHlMjLp8gqXA1tystQfjYzOAMIloU7WAYULGsRiI2PAuCxkzK HW9SgPdvlQWBwm4fcssdB2gB+46q/1idYT5qbvXZMVHil4m8os8wlkA095VaucrByP6S 9dygv0sIh/io0SrBXOvNuYdd8A2Db/vq3DWzpvBzYEchKE6DGp04jbrQBVJyW7CElYzf TevGk7AOa7sQGi3sXnbcfvVaI745ie9Vfglu5NbdtUBeBxskBqU6lEGwhMFBX3nu2/jI 8NDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762543458; x=1763148258; h=in-reply-to:autocrypt:from:content-language:references:cc:to :subject:user-agent:mime-version:date:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=TqpLzUPio3nAGIMYvOJobwGJGKN6Mv1Bje8zwEs8kqQ=; b=BMOxiM6ddFz7dQNTBNZSTtBqk2YgT8QxU6Z5Alzzz0AejuVeEgm0Qf1D4xXLoyhAxs mL+sCUxIG92UwcwV+IcouvFByAfNDeAHMskcH2n3zHj4DjbxdSFFchw8PE8U3IZuMi/b kvBVoJxph73HKsWkmdilRKU5G21tLST6IkAkfNjAP5lohj9pu/YwF8SdxTDS6bb2DCHG cpqo9Egw0GN82gbYNvHXQfF1AGAX2U0cILe9ucxUv8H13BWnUfKE38CXH8G8jmsSv0XV mWAQ4JBfmUL3pTpeP9Rzbq3zyGd63eV0JdtaVKB+L2rYDpB8aKSy7NFLjpOEZhz77kZw akdg== X-Gm-Message-State: AOJu0YzWu0KHXZ56NTQuCgQ97mp5fPIrIgo2Y6/Z+UkSyIDvHe9dA5g8 VfpXufatvBViL6Jp5DNgB2iMw759T/feDDnS8UZPtszNqaokYY3G10I72BNPmw== X-Gm-Gg: ASbGncvchohv3IS04Fk68qfPhMYXQskuCvzoIU2xUsO7m+K6oECxqsSk7ELSwM6b0fH 8q3iHey5FHXrMesJDp5HUuMC/L4UAcNq9GoR5hIuFBbbSMZNnsbgTbLM3NIMHGtpQge9ktzWxqS DJ49Hw7yMfABAaD5dCwMsdl5xEvL4wnZMMJ0I0L/hU/Ub0uR4Xu2h7jbF/qozFoR4B3yAwPEpQE BkOIkYyK67YgWSulfNDGOg2Q9WAvPxiWFsOK2GrhAPlj7klc+saf1VnS5bGusWGpbGlwwr1JZYd 9TjAQdTxFT04xYiOKedgg6ZZml9At576p+ucEZq6miMS2j2/k2DbXKT+u8jLQ0tdJeS7R3T7XAE 1MGi+7aEyx3/j+oglJxZ9vFrjhZMAiFKYIsxp0pGVw2GjXJiH2JnQKXkZJr0typ8XWWRx5Up7Ec +qLCBxuzDJ9DroSTExPnOU/+ysX649f1SeHIDDTrGA/TAw9xcCQryuIWxPha0+QxMVexlTA7vRj BQ36MvvC2rhe5RS X-Google-Smtp-Source: AGHT+IFjHdd94AlSIt3xABXliF4uV/hpvoRcXZTg/8wDSKfV5vNJ1XZtDEmTfKuolnscetG9D7+e3A== X-Received: by 2002:a05:690c:f8f:b0:787:ca9f:461b with SMTP id 00721157ae682-787d4ee3060mr6008147b3.20.1762543457678; Fri, 07 Nov 2025 11:24:17 -0800 (PST) Received: from [10.138.34.110] (h96-60-249-169.cncrtn.broadband.dynamic.tds.net. [96.60.249.169]) by smtp.gmail.com with ESMTPSA id 00721157ae682-787d69c30b2sm177237b3.29.2025.11.07.11.24.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 07 Nov 2025 11:24:17 -0800 (PST) Message-ID: Date: Fri, 7 Nov 2025 14:24:03 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/2] Create Nix derivation for building verity images To: Alyssa Ross References: <20251105-refactor-verity-v1-0-b8ba27dfdf06@gmail.com> <20251105-refactor-verity-v1-1-b8ba27dfdf06@gmail.com> <87jz03xy0t.fsf@alyssa.is> <778d0d12-ba7c-40b3-8c34-8335ee963813@gmail.com> <875xbnxu5c.fsf@alyssa.is> Content-Language: en-US From: Demi Marie Obenour Autocrypt: addr=demiobenour@gmail.com; keydata= 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 +MYSfkEjBz0E8CLOcAw7JIwAaeBT In-Reply-To: <875xbnxu5c.fsf@alyssa.is> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------Or4ff8lN8HYczs2jYoQh4OE0" Message-ID-Hash: I6GCGYMKGU2IGZBDVFELEDP3NOCZYKID X-Message-ID-Hash: I6GCGYMKGU2IGZBDVFELEDP3NOCZYKID X-MailFrom: demiobenour@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Spectrum OS Development X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------Or4ff8lN8HYczs2jYoQh4OE0 Content-Type: multipart/mixed; boundary="------------Kfh4JjMCuRlhTHg7W40sewaM"; protected-headers="v1" From: Demi Marie Obenour To: Alyssa Ross Cc: Spectrum OS Development Message-ID: Subject: Re: [PATCH 1/2] Create Nix derivation for building verity images References: <20251105-refactor-verity-v1-0-b8ba27dfdf06@gmail.com> <20251105-refactor-verity-v1-1-b8ba27dfdf06@gmail.com> <87jz03xy0t.fsf@alyssa.is> <778d0d12-ba7c-40b3-8c34-8335ee963813@gmail.com> <875xbnxu5c.fsf@alyssa.is> In-Reply-To: <875xbnxu5c.fsf@alyssa.is> Autocrypt-Gossip: addr=hi@alyssa.is; keydata= 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 wGxvGU7TX5ou --------------Kfh4JjMCuRlhTHg7W40sewaM Content-Type: multipart/mixed; boundary="------------HikuYcWJOLDDicpw1yj0GTpf" --------------HikuYcWJOLDDicpw1yj0GTpf Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 11/6/25 06:44, Alyssa Ross wrote: > Demi Marie Obenour writes: >=20 >> On 11/6/25 05:20, Alyssa Ross wrote: >>> Demi Marie Obenour writes: >>> >>>> This gets rid of a lot of duplicated code and allows building the ve= rity >>>> roothash and superblock only when needed. It also removes a hack us= ed >>>> to work around make limitations. Furthermore, >>>> 'veritysetup --root-hash-file' is used to avoid an awk script. >>>> >>>> Signed-off-by: Demi Marie Obenour >>>> --- >>>> nix-shell --pure --run 'make run' in host/initramfs fails. This is = a >>>> preexisting bug and I will send a separate patch for it. >>>> --- >>>> host/initramfs/Makefile | 25 +++++-------------------- >>>> host/initramfs/shell.nix | 4 +++- >>>> host/rootfs/Makefile | 24 +++++------------------- >>>> host/rootfs/shell.nix | 3 +++ >>>> host/verity.nix | 19 +++++++++++++++++++ >>>> lib/common.mk | 1 - >>>> pkgs/default.nix | 1 + >>>> release/live/Makefile | 26 +++++--------------------- >>>> release/live/default.nix | 4 +++- >>>> 9 files changed, 44 insertions(+), 63 deletions(-) >>> >>>> diff --git a/host/rootfs/Makefile b/host/rootfs/Makefile >>>> index 00d125774bb7b98736d0928c69cb307740cee034..bb602e2745fb5873204f= 453b35fc529c5c96f64a 100644 >>>> --- a/host/rootfs/Makefile >>>> +++ b/host/rootfs/Makefile >>>> @@ -82,25 +82,11 @@ clean: >>>> rm -rf build >>>> .PHONY: clean >>>> =20 >>>> -# veritysetup format produces two files, but Make only (portably) >>>> -# supports one output per rule, so we combine the two outputs then >>>> -# define two more rules to separate them again. >>>> -build/rootfs.verity: $(dest) >>>> - $(VERITYSETUP) format $(dest) build/rootfs.verity.superblock.tmp \= >>>> - | awk -F ':[[:blank:]]*' '$$1 =3D=3D "Root hash" {print $$2; e= xit}' \ >>>> - > build/rootfs.verity.roothash.tmp >>>> - cat build/rootfs.verity.roothash.tmp build/rootfs.verity.superbloc= k.tmp \ >>>> - > $@ >>>> - rm build/rootfs.verity.roothash.tmp build/rootfs.verity.superblock= =2Etmp >>>> -build/rootfs.verity.roothash: build/rootfs.verity >>>> - head -n 1 build/rootfs.verity > $@ >>>> -build/rootfs.verity.superblock: build/rootfs.verity >>>> - tail -n +2 build/rootfs.verity > $@ >>>> =20 >>>> -build/live.img: ../../scripts/format-uuid.sh ../../scripts/make-gpt= =2Esh ../../scripts/sfdisk-field.awk build/rootfs.verity.superblock build= /rootfs.verity.roothash $(dest) >>>> +build/live.img: ../../scripts/format-uuid.sh ../../scripts/make-gpt= =2Esh ../../scripts/sfdisk-field.awk $(ROOT_FS_VERITY) $(ROOT_FS_VERITY_R= OOTHASH) $(dest) >>>> ../../scripts/make-gpt.sh $@.tmp \ >>>> - build/rootfs.verity.superblock:verity:$$(../../scripts/format-= uuid.sh "$$(dd if=3Dbuild/rootfs.verity.roothash bs=3D32 skip=3D1 count=3D= 1 status=3Dnone)") \ >>>> - $(dest):root:$$(../../scripts/format-uuid.sh "$$(head -c 32 bu= ild/rootfs.verity.roothash)") >>>> + "$$ROOT_FS_VERITY:verity:$$(../../scripts/format-uuid.sh "$$(dd "i= f=3D$$ROOT_FS_VERITY_ROOTHASH" bs=3D32 skip=3D1 count=3D1 status=3Dnone)"= )" \ >>>> + $(dest):root:$$(../../scripts/format-uuid.sh "$$(head -c 32 "$= $ROOT_FS_VERITY_ROOTHASH")") >>>> mv $@.tmp $@ >>>> =20 >>>> debug: >>>> @@ -110,7 +96,7 @@ debug: >>>> $(VMLINUX) >>>> .PHONY: debug >>>> =20 >>>> -run: build/live.img $(EXT_FS) build/rootfs.verity.roothash >>>> +run: build/live.img $(EXT_FS) $(ROOT_FS_VERITY_ROOTHASH) >>>> @set -x && \ >>>> ext=3D"$$(mktemp build/spectrum-rootfs-extfs.XXXXXXXXXX.img)" && \= >>>> truncate -s 10G "$$ext" && \ >>>> @@ -131,7 +117,7 @@ run: build/live.img $(EXT_FS) build/rootfs.verit= y.roothash >>>> -device virtconsole,chardev=3Dvirtiocon0 \ >>>> -drive file=3Dbuild/live.img,if=3Dvirtio,format=3Draw,readonly= =3Don \ >>>> -drive file=3D/proc/self/fd/3,if=3Dvirtio,format=3Draw \ >>>> - -append "earlycon console=3Dhvc0 roothash=3D$$(< build/rootfs.= verity.roothash) intel_iommu=3Don nokaslr" \ >>>> + -append "earlycon console=3Dhvc0 roothash=3D$$(< "$$ROOT_FS_VE= RITY_ROOTHASH") intel_iommu=3Don nokaslr" \ >>>> -device virtio-keyboard \ >>>> -device virtio-mouse \ >>>> -device virtio-gpu \ >>>> diff --git a/host/rootfs/shell.nix b/host/rootfs/shell.nix >>>> index 1bf61bebf418333624e799cc8ca231f5783206f4..f16e4905adfbc8faebde= 19d0a1364ad9df90219b 100644 >>>> --- a/host/rootfs/shell.nix >>>> +++ b/host/rootfs/shell.nix >>>> @@ -5,6 +5,7 @@ >>>> import ../../lib/call-package.nix ( >>>> { callSpectrumPackage, rootfs, pkgsStatic, srcOnly, stdenv >>>> , btrfs-progs, cryptsetup, jq, netcat, qemu_kvm, reuse, util-linux >>>> +, verity >>>> }: >>>> =20 >>>> rootfs.overrideAttrs ( >>>> @@ -20,5 +21,7 @@ rootfs.overrideAttrs ( >>>> KERNEL =3D "${passthru.kernel}/${stdenv.hostPlatform.linux-kern= el.target}"; >>>> LINUX_SRC =3D srcOnly passthru.kernel.configfile; >>>> VMLINUX =3D "${passthru.kernel.dev}/vmlinux"; >>>> + ROOT_FS_VERITY =3D "${verity}/rootfs.verity.superblock"; >>>> + ROOT_FS_VERITY_ROOTHASH =3D "${verity}/rootfs.verity.roothash";= >>>> }; >>>> })) (_: {}) >>> >>> Surely this would break interactive development of the rootfs? >>> If I'm in a Nix shell, and make a change to any part of the rootfs, t= he >>> verity data in the environment will be out of date. I'd have to leav= e >>> and re-enter the Nix shell after /any/ change, waiting for an evaluat= ion >>> each time, as opposed to the current situation where that's only >>> necessary when modifying Nix code or other Spectrum components. >> >> It would. Are there alternatives you can recommend? I don't want the= >> updater and the installer to have to use two different copies. >=20 > Have the host/rootfs derivation install the verity files alongside the > rootfs image. Then host/rootfs/Makefile is the single place we generat= e > the verity images, and it will still be regenerated by make when in a > Nix shell. Is it okay to instead remove dm-verity protection for the verity images? Given that we discussed using virtiofs for live development, I don't thin= k the verity protection is necessary. It also slows down live development.= --=20 Sincerely, Demi Marie Obenour (she/her/hers) --------------HikuYcWJOLDDicpw1yj0GTpf Content-Type: application/pgp-keys; name="OpenPGP_0xB288B55FFF9C22C1.asc" Content-Disposition: attachment; filename="OpenPGP_0xB288B55FFF9C22C1.asc" Content-Description: OpenPGP public key Content-Transfer-Encoding: quoted-printable -----BEGIN PGP PUBLIC KEY BLOCK----- xsFNBFp+A0oBEADffj6anl9/BHhUSxGTICeVl2tob7hPDdhHNgPR4C8xlYt5q49y B+l2nipdaq+4Gk6FZfqC825TKl7eRpUjMriwle4r3R0ydSIGcy4M6eb0IcxmuPYf bWpr/si88QKgyGSVZ7GeNW1UnzTdhYHuFlk8dBSmB1fzhEYEk0RcJqg4AKoq6/3/ UorR+FaSuVwT7rqzGrTlscnTDlPWgRzrQ3jssesI7sZLm82E3pJSgaUoCdCOlL7M MPCJwI8JpPlBedRpe9tfVyfu3euTPLPxwcV3L/cfWPGSL4PofBtB8NUU6QwYiQ9H zx4xOyn67zW73/G0Q2vPPRst8LBDqlxLjbtx/WLR6h3nBc3eyuZ+q62HS1pJ5EvU T1vjyJ1ySrqtUXWQ4XlZyoEFUfpJxJoN0A9HCxmHGVckzTRl5FMWo8TCniHynNXs BtDQbabt7aNEOaAJdE7to0AH3T/Bvwzcp0ZJtBk0EM6YeMLtotUut7h2Bkg1b//r 6bTBswMBXVJ5H44Qf0+eKeUg7whSC9qpYOzzrm7+0r9F5u3qF8ZTx55TJc2g656C 9a1P1MYVysLvkLvS4H+crmxA/i08Tc1h+x9RRvqba4lSzZ6/Tmt60DPM5Sc4R0nS m9BBff0Nm0bSNRS8InXdO1Aq3362QKX2NOwcL5YaStwODNyZUqF7izjK4QARAQAB zTxEZW1pIE9iZW5vdXIgKElUTCBFbWFpbCBLZXkpIDxhdGhlbmFAaW52aXNpYmxl dGhpbmdzbGFiLmNvbT7CwY4EEwEIADgWIQR2h02fEza6IlkHHHGyiLVf/5wiwQUC X6YJvQIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCyiLVf/5wiwWRhD/0Y R+YYC5Kduv/2LBgQJIygMsFiRHbR4+tWXuTFqgrxxFSlMktZ6gQrQCWe38WnOXkB oY6n/5lSJdfnuGd2UagZ/9dkaGMUkqt+5WshLFly4BnP7pSsWReKgMP7etRTwn3S zk1OwFx2lzY1EnnconPLfPBc6rWG2moA6l0WX+3WNR1B1ndqpl2hPSjT2jUCBWDV rGOUSX7r5f1WgtBeNYnEXPBCUUM51pFGESmfHIXQrqFDA7nBNiIVFDJTmQzuEqIy Jl67pKNgooij5mKzRhFKHfjLRAH4mmWZlB9UjDStAfFBAoDFHwd1HL5VQCNQdqEc /9lZDApqWuCPadZN+pGouqLysesIYsNxUhJ7dtWOWHl0vs7/3qkWmWun/2uOJMQh ra2u8nA9g91FbOobWqjrDd6x3ZJoGQf4zLqjmn/P514gb697788e573WN/MpQ5XI Fl7aM2d6/GJiq6LC9T2gSUW4rbPBiqOCeiUx7Kd/sVm41p9TOA7fEG4bYddCfDsN xaQJH6VRK3NOuBUGeL+iQEVF5Xs6Yp+U+jwvv2M5Lel3EqAYo5xXTx4ls0xaxDCu fudcAh8CMMqx3fguSb7Mi31WlnZpk0fDuWQVNKyDP7lYpwc4nCCGNKCj622ZSocH AcQmX28L8pJdLYacv9pU3jPy4fHcQYvmTavTqowGnM08RGVtaSBNYXJpZSBPYmVu b3VyIChsb3ZlciBvZiBjb2RpbmcpIDxkZW1pb2Jlbm91ckBnbWFpbC5jb20+wsF4 BBMBAgAiBQJafgNKAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCyiLVf /5wiwYa/EACv8a2+MMou9cSCNoZBQaU+fTmyzft9hUE+0d5W2UY1RY3OsjFIzm9R /4SVccfsqOYLEo+S0vQMIIIqFEq3FCpXXwPzyimotps05VA8U3Bd7yseojFygOgK sAMOAee2RCaDDOnoJue01dfZMzzHPO/TVdp3OvnpWipfv5G1Xg96rwbhMLE3tg6N xwAHa31Bv4/Xq8CJOoIWvx6fcmZQpz01/lSvsYn0KrfEbTKkuUf0vM9JrCTCP2oz VNN5BYzqaq2M4r+jmSyeXLim922VOWqGkUEQ85BSEemqrRS06IU6NtEMsF8EWt/b hWjk/9GDKTcnpdJHTrMxTspExBiNrvpI2t+YPU5B/dJJAUxvmhFrbSIbdB8umBZs I3AMYrEmpAbh5x7jEjoskUC7uN3o9vpg1oCLS2ePDLtAtyBtbHnkA4xGD7ar8mem xpH9lY/i+sC6CyyIUWcUDnnagKyJP0m9ks0GLsTeOCA0bft2XA6rD6aaCnMUsndT ctrab42CV5XypjmC4U1rPJ8JQJUh1/3P48/8sMH+3krxpJ06KNWNFaUbaMTGiltZ 7x9DngklSYrX0T+2G4kVXNmjaljwkoLahwLla2gUWwBSyofXdqyhQdwZsp01KXNQ UCyT/Pg+aDcm/E7OMV3d4lf7g/CSxiX2GSEe6BlhSz+Lmd7ZJ3g32M1ARGVtaSBN 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 EtJuZYM5blWncBOJCoWMnBEcTEo/viU3GgcVRw=3D=3D =3Dx94R -----END PGP PUBLIC KEY BLOCK----- --------------HikuYcWJOLDDicpw1yj0GTpf-- --------------Kfh4JjMCuRlhTHg7W40sewaM-- --------------Or4ff8lN8HYczs2jYoQh4OE0 Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEopQtqVJW1aeuo9/sszaHOrMp8lMFAmkOR1wACgkQszaHOrMp 8lO/XA/7BDHaAXAVbHZKSYvJa3lbvOxy0RZodAGAEz0mtvRgiSIzr756Urb54+9n TMjX7hsPXhGgDaGiI9J5FJbaqfgc24APrudT9EcHQPtnGrqSvkp6YfCwuZxfVzJB OLTgNJS6nBqvweUffzU6ciFtAKdwrnwkidZ5/O3YjYLXT7Gxe5bjON0BX5IUNIBL XPzd2bALKycAOjVoSu3vyP09I+LM0eHi0xIpCTqqmzE/iXP94KvQo0h+h4Ovoqa3 2gbwOXFprK8Oa5+s/7/hJHzDPwpwufA6ZzPjvwDLsanR1D2JAVLFbczyivssXmM9 6Bh9QAQZren50PG4UzKmy3AYOm0tb2xTY7QHB0VIcT6g4mRm0nUZfqVbMM6+JFGJ D8JZ20at3lvxqUyfl/NGQUr+OMWtmn2wf48Qe63VE8cSMx2ImPU3HImjRrBJ5KFb GWG+qB91F+A7IXJ9xVhPgtGk7RLRfypOzgl5hU85AWnG0EbyfvP0Fq7P3szosRrG Rxc/OHAU7zkCaa2rdeAu0lBqvM4ni6ZcrlKZgTufKwcr282PyGYVXAK+L09NCHnl wy330uhe4gesJjHjNqtQCDt3ulh341WREDZaScYQS9C0lsN6OWHJHLj656gQDcXF HPAqgwr2vEkFD69hDz/nrZvY0CSz6V/VbLMqR0gzsOYsoEh5WkA= =kY3N -----END PGP SIGNATURE----- --------------Or4ff8lN8HYczs2jYoQh4OE0--