tests/openpgp: Reimplement 'pinentry.sh' in c.
authorJustus Winter <justus@g10code.com>
Fri, 22 Jan 2016 10:47:58 +0000 (11:47 +0100)
committerJustus Winter <justus@g10code.com>
Tue, 23 Feb 2016 10:58:52 +0000 (11:58 +0100)
* tests/openpgp/Makefile.am: Build new program.
* tests/openpgp/defs.inc: Use the new program.
* tests/openpgp/fake-pinentry.c: New file.
--
Building an executable that does not require an interpreter makes it
easier to use on Windows.

Signed-off-by: Justus Winter <justus@g10code.com>
tests/openpgp/Makefile.am
tests/openpgp/defs.inc
tests/openpgp/fake-pinentry.c [new file with mode: 0644]

index a04b62c..873ddce 100644 (file)
 required_pgms = ../../g10/gpg2 ../../agent/gpg-agent \
                 ../../tools/gpg-connect-agent ../../tools/mk-tdata
 
+AM_CPPFLAGS = -I$(top_srcdir)/common
+include $(top_srcdir)/am/cmacros.am
+
+AM_CFLAGS =
+
+noinst_PROGRAMS = fake-pinentry
+
+fake_pinentry_SOURCES = fake-pinentry.c
+
 TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO= LC_ALL=C
 
 if SQLITE3
index 941f786..8f969db 100755 (executable)
@@ -222,7 +222,7 @@ GPG_CONNECT_AGENT="../../tools/gpg-connect-agent"
 GPGCONF="../../tools/gpgconf"
 GPG_PRESET_PASSPHRASE="../../agent/gpg-preset-passphrase"
 MKTDATA="../../tools/mk-tdata"
-PINENTRY="$(cd $srcdir && /bin/pwd)/pinentry.sh"
+PINENTRY="$(/bin/pwd)/fake-pinentry${EXEEXT}"
 # Default to empty passphrase for pinentry.sh
 PINENTRY_USER_DATA=
 
diff --git a/tests/openpgp/fake-pinentry.c b/tests/openpgp/fake-pinentry.c
new file mode 100644 (file)
index 0000000..c906370
--- /dev/null
@@ -0,0 +1,50 @@
+/* Fake pinentry program for the OpenPGP test suite.
+ *
+ * Copyright (C) 2016 g10 code GmbH
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+int
+main (int argc, char **argv)
+{
+  (void) argc, (void) argv;
+
+  printf ("OK - what's up?\n");
+
+  while (! feof (stdin))
+    {
+      char buffer[128];
+
+      if (fgets (buffer, sizeof buffer, stdin) == NULL)
+       break;
+
+      if (strncmp (buffer, "GETPIN", 6) == 0)
+       printf ("D %s\nOK\n", getenv ("PINENTRY_USER_DATA") ?: "");
+      else if (strncmp (buffer, "BYE", 3) == 0)
+       {
+         printf ("OK\n");
+         break;
+       }
+      else
+       printf ("OK\n");
+    }
+  return 0;
+}