Merge branch 'STABLE-BRANCH-2-4'

--
Resolved conflicts:
	NEWS
	common/exechelp-w32.c
	configure.ac

common/compliance.c

@@ -41,7 +41,7 @@ static int initialized;
 static int module;
 
 /* This value is used by DSA and RSA checks in addition to the hard
- * coded length checks.  It allows to increase the required key length
+ * coded length checks.  It allows one to increase the required key length
  * using a confue file.  */
 static unsigned int min_compliant_rsa_length;
 

common/exechelp-w32.c

@@ -437,6 +437,7 @@ check_syscall_func (void)
     }
 }
 
+
 static void
 pre_syscall (void)
 {
@@ -444,6 +445,7 @@ pre_syscall (void)
     pre_syscall_func ();
 }
 
+
 static void
 post_syscall (void)
 {
@@ -579,7 +581,7 @@ spawn_detached (const char *pgmname, char *cmdline,
                           cr_flags,      /* Creation flags.  */
                           NULL,          /* Environment.  */
                           NULL,          /* Use current drive/directory.  */
-                          (STARTUPINFOW *)&si,           /* Startup information. */
+                          (STARTUPINFOW *)&si,    /* Startup information. */
                           &pi            /* Returns process information.  */
                           );
   if (!ret)

common/status.h

@@ -54,6 +54,7 @@ enum
     STATUS_NEED_PASSPHRASE,
     STATUS_VALIDSIG,
     STATUS_ASSERT_SIGNER,
+    STATUS_ASSERT_PUBKEY_ALGO,
     STATUS_SIG_ID,
     STATUS_ENC_TO,
     STATUS_NODATA,

common/t-support.h

@@ -31,6 +31,8 @@
 #ifndef GNUPG_COMMON_T_SUPPORT_H
 #define GNUPG_COMMON_T_SUPPORT_H 1
 
+#ifndef LEAN_T_SUPPORT
+
 #ifdef GCRYPT_VERSION
 #error The regression tests should not include with gcrypt.h
 #endif
@@ -45,11 +47,6 @@
 # define getenv(a)  (NULL)
 #endif
 
-#ifndef DIM
-# define DIM(v)		     (sizeof(v)/sizeof((v)[0]))
-# define DIMof(type,member)   DIM(((type *)0)->member)
-#endif
-
 
 /* Replacement prototypes. */
 void *gcry_xmalloc (size_t n);
@@ -65,6 +62,12 @@ void  gcry_free (void *a);
 #define xstrdup(a)    gcry_xstrdup ( (a) )
 #define xfree(a)      gcry_free ( (a) )
 
+#endif /* LEAN_T_SUPPORT */
+
+#ifndef DIM
+# define DIM(v)		     (sizeof(v)/sizeof((v)[0]))
+# define DIMof(type,member)   DIM(((type *)0)->member)
+#endif
 
 /* Macros to print the result of a test.  */
 #define pass()  do { ; } while(0)

common/tlv.c

@@ -152,7 +152,7 @@ find_tlv_unchecked (const unsigned char *buffer, size_t length,
 /* ASN.1 BER parser: Parse BUFFER of length SIZE and return the tag
  * and the length part from the TLV triplet.  Update BUFFER and SIZE
  * on success.  Note that this function does not check that the value
- * fits into the provided buffer; this allows to work on the TL part
+ * fits into the provided buffer; this allows one to work on the TL part
  * of a TLV. */
 gpg_error_t
 parse_ber_header (unsigned char const **buffer, size_t *size,