summary refs log tree commit diff stats
path: root/index.html
diff options
context:
space:
mode:
authorAndrew Yu <andrew@andrewyu.org>2022-02-19 19:07:20 +0800
committerAndrew Yu <andrew@andrewyu.org>2022-02-19 19:07:20 +0800
commit6231e896f93d9775a16eb5df9005494904100ffc (patch)
tree3b801424e7ea7159b4deaabb825d594b5e494fb1 /index.html
parentee55805d39309c42e5cf0188a7a7dedb38ac7949 (diff)
downloadwww-6231e896f93d9775a16eb5df9005494904100ffc.tar.gz
update all keys
Diffstat (limited to 'index.html')
-rw-r--r--index.html90
1 files changed, 22 insertions, 68 deletions
diff --git a/index.html b/index.html
index 450192f..c695b3f 100644
--- a/index.html
+++ b/index.html
@@ -8,71 +8,19 @@
 	<body>
 		<h1>Andrew Yu's Website</h1>
 		<div id="main">
-		<div id="nav">
-			<h2>Navigate around</h2>
-			<ul>
-				<li class="alarm" style="font-size: 150%; ">I've been up to some GPG Issues with trust signatures.  Key revocation is involved.  See below.</li>
-				<li><a href="https://www.andrewyu.org">Personal site</a></li>
-				<!--li><a href="https://blog.andrewyu.org">Blog (WIP)</a></li-->
-				<li><a href="https://git.andrewyu.org" class="alert">Projects</a></li>
-				<li><a href="https://pub.andrewyu.org">Users</a></li>
-				<li><a href="https://lib.andrewyu.org">File library</a></li>
-				<li><a href="https://fcm.andrewyu.org" class="alert">Free Computing Movement</a></li>
-				<li><a href="https://libre.andrewyu.org" class="alert">Libre Society</a></li>
-				<li><a href="https://host.andrewyu.org" class="alert">Server guides</a></li>
-			</ul>
-		</div>
-			<div class="critical" id="gpgissue">
-			<p>
-			Recently, thanks to labrador, I understand that I'm using the wrong
-			command (tsign) to sign keys.  I should be using `sign' instead.
-			At the early stage where I misunderstood the trust levels, I've given a
-			high trust level (3) to people, giving them the ability to sign keys on
-			my behalf, which was unintended.
-			</p>
-
-			<p>
-			I revoked all the keys, then found that I could not trust them again.
-			At this point I consider my GPG identity to be broken.  I'll publish a
-			new key on my website soon.
-			</p>
-
-			<p>
-			The new key is located at
-			<a href="https://www.andrewyu.org/andrew.asc">https://www.andrewyu.org/andrew.asc</a>.
-			It has the key ID <code>C906A7F774D14C5CCF89090E01500B118A378124</code>.
-			</p>
-
-			<p>
-			If you trust me, you should trust and then sign this key.  Don't tsign
-			it, that's not a combination of trust and sign, don't nrsign it, don't
-			do anything out of the ordinary.  Read the manual if you have any
-			concerns.
-			</p>
-
-			<p>
-			Please import
-			<a href="https://www.andrewyu.org/revocation.rev">https://www.andrewyu.org/revocation.rev</a>.
-			That is the revocation certificate for my first key.  Please, spread
-			this around.  The revoked key is at
-			<a href="https://www.andrewyu.org/revoked_key.asc">https://www.andrewyu.org/revoked_key.asc</a>.
-			The key ID is <code>58BD798121871B71870C27D9978B5891AD3F5986</code>.
-			</p>
-
-			<p>
-			I've resigned my recent contacts.  My keyring is at
-			<a href="https://www.andrewyu.org/allkeys.asc">https://www.andrewyu.org/allkeys.asc</a>.
-			</p>
-
-			<p>
-			The moral of the lesson is, be sure to read the manuals and
-			documentation especially when you're dealing with trust, validity, and
-			anything important in general.  Don't make the same mistake as me.
-			</p>
-
-			<p>
-			Good luck.
-			</p>
+			<div id="nav">
+				<h2>Navigate around</h2>
+				<ul>
+					<li class="alarm" style="font-size: 150%; ">I've been up to some GPG Issues with trust signatures.  Key revocation is involved.  See below.</li>
+					<li><a href="https://www.andrewyu.org">Personal site</a></li>
+					<!--li><a href="https://blog.andrewyu.org">Blog (WIP)</a></li-->
+					<li><a href="https://git.andrewyu.org" class="alert">Projects</a></li>
+					<li><a href="https://pub.andrewyu.org">Users</a></li>
+					<li><a href="https://lib.andrewyu.org">File library</a></li>
+					<li><a href="https://fcm.andrewyu.org" class="alert">Free Computing Movement</a></li>
+					<li><a href="https://libre.andrewyu.org" class="alert">Libre Society</a></li>
+					<li><a href="https://host.andrewyu.org" class="alert">Server guides</a></li>
+				</ul>
 			</div>
 			<div id="campaign">
 				<p>Poll: epony argued in #gnu that licenses are e-waste.  Do you agree?  I would love an answer.  Please include [POLL] in your answer on IRC, or alternatively, send an email to <a href="mailto:poll@andrewyu.org">poll@andrewyu.org</a>.</p>
@@ -132,9 +80,15 @@
 					<li>WeChat is deprecated and unsupported.  I only keep an account for school and use Mojo-Weixin to relay it to IRC.  If you're also bothered by the mandatory usage of these software at school, sign <a href="https://my.fsf.org/give-students-userfreedom">the give students user freedom petition by the FSF</a>;</li>
 					<li><a href="https://www.fsf.org/fb"><img src="https://static.fsf.org/nosvn/not-fd.svg" height="26pt" alt="not f'd&mdash;you won't find me on Facebook" /></a>.</li>
 				</ul>
-				<p>My OpenPGP fingerprint is <code>C906A7F774D14C5CCF89090E01500B118A378124</code>.  My public key is available at <a href="https://www.andrewyu.org/andrew.asc">https://www.andrewyu.org/andrew.asc</a>.  My key is on <a href="https://keys.openpgp.org">https://keys.openpgp.org</a>, but I don't trust key servers, you should just grab my key from my website.  Please don't send binary data to my IRC.</p>
-				<p class="alarm">There have been recent issues with my gpg.  See the notice above.</p>
-				<p>Contact me if you would like to sell an ThinkPad x200, x220 or x230 in good shape.</p>
+				<h3>OpenPGP</h3>
+				<ul>
+					<li><a href="https://www.andrewyu.org/andrew-ecc.asc">My ECC key</a> is recommended;</li>
+					<li><a href="https://www.andrewyu.org/andrew.asc">My RSA key</a> is a fallback;</li>
+					<li><a href="https://www.andrewyu.org/allkeys.asc">My keyring for friends</a> ;</li>
+					<li><a href="https://www.andrewyu.org/revocation.rev">The revocation of my old key</a>;</li>
+					<li><a href="https://www.andrewyu.org/revoked_key.asc">Old revoked key</a>.</li>
+				</ul>
+				<p class="alert">Check if you've actually downloaded these keys from <code>andrewyu.org</code>.  Check the fingerprints with me elsewhere (email, IRC, in real life, etc) before trusting or signing it.</p>
 			</div>
 			<div id="randlinks">
 				<h2>Random Links</h2>