From 9827f9591d38e6aeaa539820bb92180ea381d514 Mon Sep 17 00:00:00 2001
From: Arctic Ice Studio <development@arcticicestudio.com>
Date: Sat, 11 Apr 2020 16:09:15 +0200
Subject: [PATCH] Loosen encryption for "Arctic Ice Studio" and "Sven Greb" Git
 auth (#243)

Before both the Git `user` authentication configurations for
"Arctic Ice Studio" [1] and "Sven Greb" [2] were encrypted although they
did not contain any sensitive data but only data that is also intended
for public like the PGP signing key ID.
Therefore both files have been removed from the `igloocrypt` filter.

[1]: https://github.com/arcticicestudio/igloo/blob/56bc0729367d53c90504d1fdefc5d41093a7a7f9/snowblocks/git/gitconfig-auth.igloocrypt
[2]: https://github.com/arcticicestudio/igloo/blob/56bc0729367d53c90504d1fdefc5d41093a7a7f9/snowblocks/git/gitconfig-auth-svengreb.igloocrypt

Closes GH-242

Co-authored-by: Sven Greb <development@svengreb.de>
---
 snowblocks/git/gitconfig-auth                     |  12 ++++++++++++
 snowblocks/git/gitconfig-auth-svengreb            |  12 ++++++++++++
 snowblocks/git/gitconfig-auth-svengreb.igloocrypt | Bin 380 -> 0 bytes
 snowblocks/git/gitconfig-auth.igloocrypt          | Bin 396 -> 0 bytes
 snowblocks/git/snowblock.json                     |   8 ++++----
 5 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 snowblocks/git/gitconfig-auth
 create mode 100644 snowblocks/git/gitconfig-auth-svengreb
 delete mode 100644 snowblocks/git/gitconfig-auth-svengreb.igloocrypt
 delete mode 100644 snowblocks/git/gitconfig-auth.igloocrypt

diff --git a/snowblocks/git/gitconfig-auth b/snowblocks/git/gitconfig-auth
new file mode 100644
index 0000000..c13482a
--- /dev/null
+++ b/snowblocks/git/gitconfig-auth
@@ -0,0 +1,12 @@
+# Copyright (C) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
+# Copyright (C) 2016-present Sven Greb <development@svengreb.de>
+
+# Project:    igloo
+# Repository: https://github.com/arcticicestudio/igloo
+# License:    MIT
+
+[user]
+  name = Arctic Ice Studio
+  email = development@arcticicestudio.com
+  signingkey = 0x60C54F1519346085
+  useconfigonly = true
diff --git a/snowblocks/git/gitconfig-auth-svengreb b/snowblocks/git/gitconfig-auth-svengreb
new file mode 100644
index 0000000..f55c6c6
--- /dev/null
+++ b/snowblocks/git/gitconfig-auth-svengreb
@@ -0,0 +1,12 @@
+# Copyright (C) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
+# Copyright (C) 2016-present Sven Greb <development@svengreb.de>
+
+# Project:    igloo
+# Repository: https://github.com/arcticicestudio/igloo
+# License:    MIT
+
+[user]
+  name = Sven Greb
+  email = development@svengreb.de
+  signingkey = 0x12637B9743D0263D
+  useconfigonly = true
diff --git a/snowblocks/git/gitconfig-auth-svengreb.igloocrypt b/snowblocks/git/gitconfig-auth-svengreb.igloocrypt
deleted file mode 100644
index f520839c279a0a8fe0a7b35c1d02dc902f566c6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 380
zcmV-?0fYVkM@dveQdv+`02~mco5@Sz)YRE=at~u-(7I};0$EFsClTgI8h@8}wda>t
z_b)w$ANTb_LzV?A2NfZtk!WO0{+5$~sAg)I!~40>gg=$U=C35M%#US|uY0&*VV|IX
zEVKhTxMV;3_+@usU6mO8W{+A<duT)|^u}rx6C)mFDalq3`-)rbXa8m>@|iUOdoABb
zhuRoV+hsv}q4ef@$u=xTQm;)t``x)`?L&p0{&!_YEZbuZVHW2E0R5w`0^or}>PZ+-
zEZ7&OmG<gSm_(`wDatyEJs$3*gp`cllp%VejhVKtiNfWlEQthGD;E~!^aK9G`Xtx~
zB6y0eY)Kxgm|$+iOQTa*`Ug6vtgvKqJ?veX#M`r6m`rqafh%oI-_a37bBkpD71O&C
z+K#hZ|N3D54h(z`BXW<_N7!j;mZv~2%azp>>>3WbtTKT~e)rquBQ5j!QMPIJh%D9S
a<PGCwVzM{Y8a)iT6zOIQdK&3vyhOPqYq@3s

diff --git a/snowblocks/git/gitconfig-auth.igloocrypt b/snowblocks/git/gitconfig-auth.igloocrypt
deleted file mode 100644
index ce9b5116b48059edd6cbdc3130ca61d45748d8ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 396
zcmV;70dxKUM@dveQdv+`0E_zb2K}_zgiN}B(_x{mX1Sl-C&`UwXFv4WZODbjL-7s-
z1p;ClBK$6NgZ@Y9d?41X)693CC?76{M1n<U7<wR)Ff6|0qT5aZAe}yhX`8}F30S`s
zfqye47NAVd)!vZF1A8lh>TP_`hG`Pw=zl))@*Q1g|6MzF)G=BfZuc?a`Pl7OTg<_O
z1|t|2{=1J17l5JPt<HzDl+rB(J&Y6&&xB|RE$6lIc(}h5tRMMXYN_`fej2{d0d|^N
zM^6a_vq1{TN){CU9(*X95)?8zvKb5ExO$m)!k=2_eGQiJdv`M&-ivUqcdv`UAFM??
zeej>rSt+ckzo?=2V9Yokv5AS3ViD^g+lhF+EZi%Z7~^NrZrbO=I@&~2?K=I)%~YLx
zi)#_!)pxlKBu#x*9R7;Fz2i0@uKw(Poy)-fG0~`J<o>wO>q5mrwBAXPbDyr#;zHS9
qL`UQfuW1UiL55pu!<df({<Hg-HjjE68sNdDXUZscgD^lw8dznLZ^Xg?

diff --git a/snowblocks/git/snowblock.json b/snowblocks/git/snowblock.json
index 12c5fc6..8ec8b1c 100644
--- a/snowblocks/git/snowblock.json
+++ b/snowblocks/git/snowblock.json
@@ -14,14 +14,14 @@
       "~/.gitconfig": null,
       "~/.gitconfig-auth": {
         "hosts": {
-          "iceowl": "gitconfig-auth.igloocrypt",
-          "igloo": "gitconfig-auth.igloocrypt"
+          "iceowl": "gitconfig-auth",
+          "igloo": "gitconfig-auth"
         }
       },
       "~/.gitconfig-auth-svengreb": {
         "hosts": {
-          "iceowl": "gitconfig-auth-svengreb.igloocrypt",
-          "igloo": "gitconfig-auth-svengreb.igloocrypt"
+          "iceowl": "gitconfig-auth-svengreb",
+          "igloo": "gitconfig-auth-svengreb"
         }
       },
       "~/.gitconfig-auth-job": {