Merge branch 'gpg2-clean-working_atop-osresearch_gpg2' of https://github.com/tlaurion/heads into gpg2

initrd/.gnupg/gpg-agent.conf

@@ -1 +1,3 @@
 scdaemon-program /bin/scdaemon
+pinentry-program /bin/pinentry-tty
+daemon

initrd/.gnupg/gpg.conf

@@ -0,0 +1 @@
+use-agent

initrd/bin/flash-gui.sh

@@ -139,10 +139,10 @@ while true; do
 
           cat $PUBKEY | gpg --import
           cp $ROM /tmp/gpg-gui.rom
-          if (cbfs -o /tmp/gpg-gui.rom -l | grep -q "heads/initrd/.gnupg/pubring.gpg") then
-            cbfs -o /tmp/gpg-gui.rom -d "heads/initrd/.gnupg/pubring.gpg"
+          if (cbfs -o /tmp/gpg-gui.rom -l | grep -q "heads/initrd/.gnupg/pubring.kbx") then
+            cbfs -o /tmp/gpg-gui.rom -d "heads/initrd/.gnupg/pubring.kbx"
           fi
-          cbfs -o /tmp/gpg-gui.rom -a "heads/initrd/.gnupg/pubring.gpg" -f /.gnupg/pubring.gpg
+          cbfs -o /tmp/gpg-gui.rom -a "heads/initrd/.gnupg/pubring.kbx" -f /.gnupg/pubring.kbx
 
           if (cbfs -o /tmp/gpg-gui.rom -l | grep -q "heads/initrd/.gnupg/trustdb.gpg") then
             cbfs -o /tmp/gpg-gui.rom -d "heads/initrd/.gnupg/trustdb.gpg"
@@ -180,10 +180,10 @@ while true; do
           fi
 
           cat $PUBKEY | gpg --import
-          if (cbfs -o /tmp/gpg-gui.rom -l | grep -q "heads/initrd/.gnupg/pubring.gpg") then
-            cbfs -o /tmp/gpg-gui.rom -d "heads/initrd/.gnupg/pubring.gpg"
+          if (cbfs -o /tmp/gpg-gui.rom -l | grep -q "heads/initrd/.gnupg/pubring.kbx") then
+            cbfs -o /tmp/gpg-gui.rom -d "heads/initrd/.gnupg/pubring.kbx"
           fi
-          cbfs -o /tmp/gpg-gui.rom -a "heads/initrd/.gnupg/pubring.gpg" -f /.gnupg/pubring.gpg
+          cbfs -o /tmp/gpg-gui.rom -a "heads/initrd/.gnupg/pubring.kbx" -f /.gnupg/pubring.kbx
 
           if (cbfs -o /tmp/gpg-gui.rom -l | grep -q "heads/initrd/.gnupg/trustdb.gpg") then
             cbfs -o /tmp/gpg-gui.rom -d "heads/initrd/.gnupg/trustdb.gpg"

initrd/bin/kexec-sign-config

@@ -49,7 +49,7 @@ if [ -z "$param_files" ]; then
 fi
 
 for tries in 1 2 3; do
-	if sha256sum $param_files | gpg \
+	if sha256sum $param_files | gpg --no-tty\
 		--digest-algo SHA256 \
 		--detach-sign \
 		-a \

initrd/init

@@ -5,6 +5,9 @@ echo "hello world" > /dev/ttyprintk
 # Setup our path
 export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin
 
+#export GPG_TTY STATICALLY (NEED TO FIX)
+export GPG_TTY=/dev/console
+
 # This is the very first script invoked by the Linux kernel and is
 # running out of the ram disk.  There are no fileysstems mounted.
 # It is important to have a way to invoke a recovery shell in case

modules/pinentry

@@ -36,6 +36,6 @@ pinentry_target := $(MAKE_JOBS) \
 		install \
 	&& cp $(build)/$(pinentry_dir)/tty/pinentry-tty $(build)/$(pinentry_dir)/tty/pinentry
 
-pinentry_output := tty/pinentry
+pinentry_output := tty/pinentry-tty
 
 pinentry_depends := libgpg-error libassuan $(musl_dep)

patches/gpg2-2.2.10.patch

@@ -0,0 +1,27 @@
+diff -u --recursive /home/tlaurion/build/clean/gnupg-2.2.10/configure gnupg-2.2.10/configure
+--- /home/tlaurion/build/clean/gnupg-2.2.10/configure	2016-08-17 09:20:25.000000000 -0400
++++ gnupg-2.2.10/configure	2018-01-20 16:55:14.502067084 -0500
+@@ -572,7 +572,7 @@
+ ac_clean_files=
+ ac_config_libobj_dir=.
+ LIBOBJS=
+-cross_compiling=no
++cross_compiling=yes
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+diff -u --recursive gnupg-2.2.10/common/ttyio.c gnupg-2.2.10/common/ttyio.c.mod 
+--- gnupg-2.2.10/common/ttyio.c	2017-08-28 06:22:54.000000000 -0400
++++ gnupg-2.2.10/common/ttyio.c.mod	2018-09-18 23:00:07.386250017 -0400
+@@ -190,7 +190,9 @@
+ #elif defined (HAVE_W32CE_SYSTEM)
+     ttyfp = stderr;
+ #else
+-    ttyfp = batchmode? stderr : fopen (tty_get_ttyname (), "r+");
++    //ttyfp = batchmode? stderr : fopen( tty_get_ttyname (), "r+");
++    ttyfp = stderr;
++
+     if( !ttyfp ) {
+ 	log_error("cannot open '%s': %s\n", tty_get_ttyname (),
+                   strerror(errno) );
+