* preset-passphrase.c (preset_passphrase): Handle --passphrase.

* Makefile.am (gpg_preset_passphrase_LDADD): Reorder libs so that
pwquery may use stuff from jnlib.  Conditionally add -lwsock2
(gpg_protect_tool_LDADD): Ditto.

* preset-passphrase.c (main): Use default_homedir().
(main) [W32]: Initialize sockets.

* simple-pwquery.c (agent_open) [W32]: Implement for W32.
(readline) [W32]: Use recv instead of read.
(writen) [W32]: Use send instead of write.
(my_stpcpy): Define a stpcpy replacement so that this file
continues to be self-contained.
(agent_send_all_options) [W32]: Don't call ttyname.

* gnupg-badge-openpgp.eps, gnupg-badge-openpgp.jpg: New
* gnupg.texi: Add a logo.
* sysnotes.texi: New.

* gpgsm.c (main): Use default_homedir().
(main) [W32]: Default to disabled CRL checks.

* gpgconf-comp.c (get_config_pathname) [DOSISH]: Detect absolute
pathnames with a drive letter.

Author: dd9jn

agent/ChangeLog

@@ -1,8 +1,33 @@
+2004-12-21  Werner Koch  <[email protected]>
+
+	* preset-passphrase.c (preset_passphrase): Handle --passphrase.
+
+	* Makefile.am (gpg_preset_passphrase_LDADD): Reorder libs so that
+	pwquery may use stuff from jnlib.  Conditionally add -lwsock2
+	(gpg_protect_tool_LDADD): Ditto.
+
+	* preset-passphrase.c (main): Use default_homedir().
+	(main) [W32]: Initialize sockets.
+
+2004-12-21  Marcus Brinkmann  <[email protected]>
+
+	* Makefile.am (libexec_PROGRAMS): Add gpg-preset-passphrase.
+	(gpg_preset_passphrase_SOURCES, gpg_preset_passphrase_LDADD): New
+	targets.
+	* agent.h (opt): New member allow_cache_passphrase.
+	* cache.c (housekeeping): Check if R->ttl is not negative.
+	(agent_put_cache): Allow ttl to be negative.
+	* command.c (parse_hexstring): Allow something to follow the
+	hexstring.
+	(cmd_cache_passphrase): New function.
+	(register_commands): Add it.
+	* gpg-agent.c: Handle --allow-preset-passphrase.
+	* preset-passphrase.c: New file.
+
 2004-12-21  Werner Koch  <[email protected]>
 
 	* gpg-agent.c (main): Use default_homedir().
-	* protect-tool.c (main): Ditto.
-	
+	* protect-tool.c (main): Ditto.	
 
 2004-12-20  Werner Koch  <[email protected]>
 

agent/Makefile.am

@@ -19,7 +19,7 @@
 ## Process this file with automake to produce Makefile.in
 
 bin_PROGRAMS = gpg-agent
-libexec_PROGRAMS = gpg-protect-tool
+libexec_PROGRAMS = gpg-protect-tool gpg-preset-passphrase
 
 AM_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/intl
 
@@ -53,8 +53,20 @@ gpg_protect_tool_SOURCES = \
 	protect.c \
 	minip12.c minip12.h 
 
-gpg_protect_tool_LDADD = ../jnlib/libjnlib.a \
-        ../common/libcommon.a ../common/libsimple-pwquery.a \
+gpg_protect_tool_LDADD = ../common/libsimple-pwquery.a \
+	../jnlib/libjnlib.a  ../common/libcommon.a  \
 	 $(LIBGCRYPT_LIBS) -lgpg-error @LIBINTL@
+if HAVE_W32_SYSTEM
+gpg_protect_tool_LDADD += -lwsock32
+endif
 
+gpg_preset_passphrase_SOURCES = \
+	preset-passphrase.c
+
+gpg_preset_passphrase_LDADD = ../common/libsimple-pwquery.a \
+	../jnlib/libjnlib.a ../common/libcommon.a \
+	 $(LIBGCRYPT_LIBS) -lgpg-error @LIBINTL@
+if HAVE_W32_SYSTEM
+gpg_preset_passphrase_LDADD += -lwsock32
+endif
 

agent/agent.h

@@ -63,6 +63,7 @@ struct {
 
   int ignore_cache_for_signing;
   int allow_mark_trusted;
+  int allow_preset_passphrase;
   int keep_tty;  /* don't switch the TTY (for pinentry) on request */
   int keep_display;  /* don't switch the DISPLAY (for pinentry) on request */
 } opt;

agent/cache.c

@@ -39,7 +39,7 @@ struct cache_item_s {
   ITEM next;
   time_t created;
   time_t accessed;
-  int  ttl;  /* max. lifetime given in seonds */
+  int ttl;  /* max. lifetime given in seonds, -1 one means infinite */
   int lockcount;
   struct secret_data_s *pw;
   char key[1];
@@ -88,7 +88,8 @@ housekeeping (void)
   /* first expire the actual data */
   for (r=thecache; r; r = r->next)
     {
-      if (!r->lockcount && r->pw && r->accessed + r->ttl < current)
+      if (!r->lockcount && r->pw
+	  && r->ttl >= 0 && r->accessed + r->ttl < current)
         {
           if (DBG_CACHE)
             log_debug ("  expired `%s' (%ds after last access)\n",
@@ -118,7 +119,7 @@ housekeeping (void)
      Expire old and unused entries after 30 minutes */
   for (rprev=NULL, r=thecache; r; )
     {
-      if (!r->pw && r->accessed + 60*30 < current)
+      if (!r->pw && r->ttl >= 0 && r->accessed + 60*30 < current)
         {
           if (r->lockcount)
             {
@@ -194,7 +195,7 @@ agent_put_cache (const char *key, const char *data, int ttl)
     log_debug ("agent_put_cache `%s'\n", key);
   housekeeping ();
 
-  if (ttl < 1)
+  if (ttl == 1)
     ttl = opt.def_cache_ttl;
   if (!ttl)
     return 0;

agent/command.c

@@ -141,7 +141,7 @@ parse_hexstring (ASSUAN_CONTEXT ctx, const char *string, size_t *len)
   /* parse the hash value */
   for (p=string, n=0; hexdigitp (p); p++, n++)
     ;
-  if (*p)
+  if (*p != ' ' && *p != '\t' && *p)
     return set_error (Parameter_Error, "invalid hexstring");
   if ((n&1))
     return set_error (Parameter_Error, "odd number of digits");
@@ -741,6 +741,64 @@ cmd_passwd (ASSUAN_CONTEXT ctx, char *line)
   return map_to_assuan_status (rc);
 }
 
+/* PRESET_PASSPHRASE <hexstring_with_keygrip> <timeout> <passwd>
+  
+   Set the cached passphrase/PIN for the key identified by the keygrip
+   to passwd for the given time, where -1 means infinite and 0 means
+   the default (currently only a timeout of -1 is allowed, which means
+   to never expire it).  If passwd is not provided, ask for it via the
+   pinentry module.  */
+static int
+cmd_preset_passphrase (ASSUAN_CONTEXT ctx, char *line)
+{
+  int rc;
+  unsigned char grip[20];
+  char *grip_clear = NULL;
+  char *passphrase = NULL;
+  int ttl;
+
+  if (!opt.allow_preset_passphrase)
+    return gpg_error (GPG_ERR_NOT_SUPPORTED);
+
+  rc = parse_keygrip (ctx, line, grip);
+  if (rc)
+    return rc;
+
+  /* FIXME: parse_keygrip should return a tail pointer.  */
+  grip_clear = line;
+  while (*line && (*line != ' ' && *line != '\t'))
+    line++;
+  if (!*line)
+    return map_to_assuan_status (gpg_error (GPG_ERR_MISSING_VALUE));
+  *line = '\0';
+  line++;
+  while (*line && (*line == ' ' || *line == '\t'))
+    line++;
+  
+  /* Currently, only infinite timeouts are allowed.  */
+  ttl = -1;
+  if (line[0] != '-' || line[1] != '1')
+    return map_to_assuan_status (gpg_error (GPG_ERR_NOT_IMPLEMENTED));
+  line++;
+  line++;
+  while (!(*line != ' ' && *line != '\t'))
+    line++;
+
+  /* If there is a passphrase, use it.  Currently, a passphrase is
+     required.  */
+  if (*line)
+    passphrase = line;
+  else
+    return map_to_assuan_status (gpg_error (GPG_ERR_NOT_IMPLEMENTED));
+
+  rc = agent_put_cache (grip_clear, passphrase, ttl);
+
+  if (rc)
+    log_error ("command preset_passwd failed: %s\n", gpg_strerror (rc));
+
+  return map_to_assuan_status (rc);
+}
+
 
 /* SCD <commands to pass to the scdaemon>
   
@@ -837,6 +895,7 @@ register_commands (ASSUAN_CONTEXT ctx)
     { "PKDECRYPT",      cmd_pkdecrypt },
     { "GENKEY",         cmd_genkey },
     { "GET_PASSPHRASE", cmd_get_passphrase },
+    { "PRESET_PASSPHRASE", cmd_preset_passphrase },
     { "CLEAR_PASSPHRASE", cmd_clear_passphrase },
     { "GET_CONFIRMATION", cmd_get_confirmation },
     { "LISTTRUSTED",    cmd_listtrusted },

agent/gpg-agent.c

@@ -89,6 +89,7 @@ enum cmd_and_opt_values
 
   oIgnoreCacheForSigning,
   oAllowMarkTrusted,
+  oAllowPresetPassphrase,
   oKeepTTY,
   oKeepDISPLAY
 };
@@ -141,6 +142,8 @@ static ARGPARSE_OPTS opts[] = {
                                N_("do not use the PIN cache when signing")},
   { oAllowMarkTrusted, "allow-mark-trusted", 0,
                              N_("allow clients to mark keys as \"trusted\"")},
+  { oAllowPresetPassphrase, "allow-preset-passphrase", 0,
+                             N_("allow presetting passphrase")},
   {0}
 };
 
@@ -392,6 +395,8 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
 
     case oAllowMarkTrusted: opt.allow_mark_trusted = 1; break;
 
+    case oAllowPresetPassphrase: opt.allow_preset_passphrase = 1; break;
+
     default:
       return 0; /* not handled */
     }