improve documentation in verifying downloaded releases

docs/04-Getting-Started.md

@@ -4,18 +4,64 @@
 - PHP-enabled web-server (must be PHP 7+)
 - PHP session support (for logging in, see [here](https://php.net/manual/en/session.installation.php) for more information)
 - The following PHP extensions:
-    - `mbstring` (for utf8 string handling - currently **required**)
+	- `mbstring` (for utf8 string handling - currently **required**)
-    - `imagick` (for preview generation)
+	- `imagick` (for preview generation)
-    - `fileinfo` (for proper mime type checking of uploaded files)
+	- `fileinfo` (for proper mime type checking of uploaded files)
-    - `zip` (for compressing exports)
+	- `zip` (for compressing exports)
-    - `intl` (for Unicode text normalization when searching and in the id index, and when sending emails when utf-8 mode is disabled)
+	- `intl` (for Unicode text normalization when searching and in the id index, and when sending emails when utf-8 mode is disabled)
-    - `sqlite` (for search index storage; uses [PDO](https://www.php.net/manual/en/ref.pdo-sqlite.php))
+	- `sqlite` (for search index storage; uses [PDO](https://www.php.net/manual/en/ref.pdo-sqlite.php))
 - Write access to Pepperminty Wiki's own folder (only for editing)
 - Recommended: Block access to `peppermint.json`, where it stores it's settings
 
+
 ## Setup Instructions
 1. Once you've ensured your web server meets the requirements, obtain a copy of Pepperminty Wiki (see _[Getting a copy](05-Getting-A-Copy.html)_).
 2. Put the `index.php` file on your web server.
 3. Navigate to Pepperminty Wiki in your web browser. If you uploaded the `index.php` to `wiki/` on your web server `bobsrockets.com`, then you should navigate to `bobsrockets.com/wiki/`.
 4. See the [Configuring](06-Configuration.html) section for information on how to customise your installation, including the default login credentials.
 5. Ensure you configure your web server to block access to `peppermint.json`, as this contains all your account details (including your hashed password!)
+
+
+## Verifying Your Download
+Advanced and privacy-conscious users may want to verify the authenticity of their downloaded release. Since [v0.21.1-hotfix1](https://github.com/sbrl/Pepperminty-Wiki/releases/tag/v0.21.1-hotfix1), Pepperminty Wiki releases are now signed. This is done in the following fashion:
+
+ - The release `index.php` is hashed with SHA256 and saved to `HASHES.SHA256`
+ - `HASHES.SHA256` is then signed via GPG, generating `HASHES.SHA256.asc` as the signature file
+
+Thus, verifying the authenticity of a downloaded release is a 2-step process. It is assumed in this section that the user is familiar with a Linux terminal, and has one opened in which they have `cd`ed to the directory containing the files downloaded from a release.
+
+3 files should be present:
+
+Filename			| Purpose
+--------------------|----------------------
+`index.php`			| Pepperminty Wiki itself
+`HASHES.SHA256`		| The SHA256 hash(es)
+`HASHES.SHA256.asc`	| The GPG signatue
+
+First, the SHA256 hashes must be verified:
+
+```bash
+sha256sum -c HASHES.SHA256
+```
+
+This should output something like `OK` if verification successful, or an error message if not.
+
+Next, the GPG signature can be verified. To do this, we need to download the public key with which the release was signed. At the current time, this is my personal GPG key with the id `C2F7843F9ADF9FEE264ACB9CC1C6C0BB001E1725`, but check the release notes too. Download it like so:
+
+```bash
+gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys C2F7843F9ADF9FEE264ACB9CC1C6C0BB001E1725
+```
+
+Then, verify the GPG signature:
+
+```bash
+gpg --verify HASHES.SHA256.asc
+```
+
+It might complain that the key is untrusted, but it should also tell you which key signed the release, and whether the signature itself is valid or not - which is what you're looking for. If you'd like to mark the key you downloaded as trusted, you can do so like this:
+
+```bash
+echo -e "4\nsave\n" | gpg --batch --expert --command-fd 0 --edit-key "C2F7843F9ADF9FEE264ACB9CC1C6C0BB001E1725" trust >/dev/null 2>&1;
+```
+
+Then, simply re-run the GPG verification command above to see the difference.

docs/99-Making-A-Release.md

@@ -31,7 +31,7 @@ Note that this is a maintenance release that backports some urgent bugfixes to L
 
 Have you updated to this release? [Click this link to say hi](https://starbeamrainbowlabs.com/blog/viewtracker.php?action=record&format=text&post-id=pepperminty-wiki/PEPPERMINTY_WIKI_VERSION)!
 
-This release also has an experimental GPG and SHA256 hashes file attached. My GPG key is `AEBDEBC37E56742E9DFF782A1BE5172E637709C2` - please [open an issue](https://github.com/sbrl/Pepperminty-Wiki/issues/) if you encounter any issues :slightly_smiling_face:
+This release also has an experimental GPG and SHA256 hashes file attached. My GPG key is `C2F7843F9ADF9FEE264ACB9CC1C6C0BB001E1725` - please [open an issue](https://github.com/sbrl/Pepperminty-Wiki/issues/) if you encounter any issues :slightly_smiling_face:
 
 ## Updating
 You can update to this release simply by grabbing an updated copy of `index.php` and replacing the version in your current wiki (don't forget to take backups! I make every effort to squash as many bugs as possible, but you can never be too certain). You can get an updated copy of `index.php` in a number of ways: