From 242784305b481c9aa73f51854522182348e3bb41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Thu, 21 Jun 2012 00:47:04 -0300
Subject: adding parabola-keyring database

---
 parabola-keyring | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 parabola-keyring

(limited to 'parabola-keyring/update-keys')

diff --git a/parabola-keyring b/parabola-keyring
new file mode 160000
index 0000000..d6a427b
--- /dev/null
+++ b/parabola-keyring
@@ -0,0 +1 @@
+Subproject commit d6a427ba2a32694a6c6331378e2ed3e64e0794c7
-- 
cgit v1.2.3-2-g168b


From 0ce6dcfc5cd882343bd1d5cd120e203a58d67ba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= <fauno@kiwwwi.com.ar>
Date: Thu, 21 Jun 2012 00:59:07 -0300
Subject: Revert "adding parabola-keyring database"

This reverts commit 242784305b481c9aa73f51854522182348e3bb41.
---
 parabola-keyring | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 parabola-keyring

(limited to 'parabola-keyring/update-keys')

diff --git a/parabola-keyring b/parabola-keyring
deleted file mode 160000
index d6a427b..0000000
--- a/parabola-keyring
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d6a427ba2a32694a6c6331378e2ed3e64e0794c7
-- 
cgit v1.2.3-2-g168b


From 3807767323aa0b0427448b396bab7b8f397247c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Thu, 19 Jul 2012 00:50:51 -0300
Subject: adding parabola-keyring database

---
 parabola-keyring/update-keys | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100755 parabola-keyring/update-keys

(limited to 'parabola-keyring/update-keys')

diff --git a/parabola-keyring/update-keys b/parabola-keyring/update-keys
new file mode 100755
index 0000000..aa42eac
--- /dev/null
+++ b/parabola-keyring/update-keys
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+export LANG=C
+
+TMPDIR=$(mktemp -d)
+trap "rm -rf '${TMPDIR}'" EXIT
+
+KEYSERVER='hkp://pool.sks-keyservers.net'
+GPG="gpg --quiet --batch --no-tty --no-permission-warning --keyserver "${KEYSERVER}" --homedir ${TMPDIR}"
+
+pushd "$(dirname "$0")" >/dev/null
+
+$GPG --gen-key <<EOF
+%echo Generating Parabola Keyring keychain master key...
+Key-Type: RSA
+Key-Length: 1024
+Key-Usage: sign
+Name-Real: Parabola Keyring Keychain Master Key
+Name-Email: parabola-keyring@localhost
+Expire-Date: 0
+%commit
+%echo Done
+EOF
+
+rm -rf packager
+mkdir packager
+
+while read -ra data; do
+	keyid="${data[0]}"
+	username="${data[@]:1}"
+	${GPG} --recv-keys ${keyid} &>/dev/null
+	printf 'clean\nquit\ny\n' | \
+		${GPG} --command-fd 0 --edit-key ${keyid}
+	FD=$(mktemp)
+	exec 4>"${FD}"
+	${GPG} --yes --lsign-key ${keyid} &>/dev/null
+	${GPG} --armor --output packager/${username}.asc --export ${keyid}
+done < packager-keyids
+
+cat packager/*.asc > parabola.gpg
+
+popd >/dev/null
-- 
cgit v1.2.3-2-g168b


From e48a3792be4b48789cd47f0940cacfd2119bd032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Thu, 19 Jul 2012 12:41:01 -0300
Subject: adding parabola-trusted and commands on update-keys

---
 parabola-keyring/update-keys | 1 +
 1 file changed, 1 insertion(+)

(limited to 'parabola-keyring/update-keys')

diff --git a/parabola-keyring/update-keys b/parabola-keyring/update-keys
index aa42eac..d591944 100755
--- a/parabola-keyring/update-keys
+++ b/parabola-keyring/update-keys
@@ -35,6 +35,7 @@ while read -ra data; do
 	exec 4>"${FD}"
 	${GPG} --yes --lsign-key ${keyid} &>/dev/null
 	${GPG} --armor --output packager/${username}.asc --export ${keyid}
+	echo "${keyid}:4:" >> parabola-trusted
 done < packager-keyids
 
 cat packager/*.asc > parabola.gpg
-- 
cgit v1.2.3-2-g168b


From 992b9d0f5e1f2188fad7b2bbcb5a4fe4a2b45b09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@lavabit.com>
Date: Sun, 22 Jul 2012 19:25:50 -0300
Subject: fixing some parts on update-keys

---
 parabola-keyring/update-keys | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'parabola-keyring/update-keys')

diff --git a/parabola-keyring/update-keys b/parabola-keyring/update-keys
index d591944..235e620 100755
--- a/parabola-keyring/update-keys
+++ b/parabola-keyring/update-keys
@@ -22,7 +22,7 @@ Expire-Date: 0
 %echo Done
 EOF
 
-rm -rf packager
+rm -rf packager parabola-trusted
 mkdir packager
 
 while read -ra data; do
-- 
cgit v1.2.3-2-g168b