Don't include <gcrypt.h> when it's not needed.

diff --git a/NEWS b/NEWS
index a3c43cc9d20a4619b129118847ae34c255bde664..db71fa72d304d01beaba9c0cc11de52e417380e8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -115,6 +115,8 @@ gnutls_ia_set_server_avp_function: REMOVED
 gnutls_ia_set_server_avp_ptr: REMOVED
 gnutls_ia_verify_endphase: REMOVED
 
+** Several files unnecessarily included <gcrypt.h>; this has been fixed.
+
 
 * Version 2.12.2 (released 2011-04-08)
 

diff --git a/src/certtool-common.c b/src/certtool-common.c
index f3c6658167c8de916ef5b06eb61b1b34356d5e3d..7e7083dcadba3588422c199caf700ef6025e00c1 100644 (file)
--- a/src/certtool-common.c
+++ b/src/certtool-common.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+ *   2011 Free Software Foundation, Inc.
  *
  * This file is part of GnuTLS.
  *
@@ -28,8 +29,6 @@
 #include <gnutls/pkcs11.h>
 #include <gnutls/abstract.h>
 
-#include <gcrypt.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/certtool.c b/src/certtool.c
index b456bf66ffc33736b643f00aee7cce7a3c263cef..9800bfb2595458f06f1588779a1aa4f62074bb58 100644 (file)
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+ *   2011 Free Software Foundation, Inc.
  *
  * This file is part of GnuTLS.
  *
@@ -28,8 +29,6 @@
 #include <gnutls/pkcs11.h>
 #include <gnutls/abstract.h>
 
-#include <gcrypt.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/p11tool.c b/src/p11tool.c
index 01255314bfdf220c1d42d337feaf2af3ffeb75d7..4c10f59ffc4f94fe1ef566c2d633158c46b8f8c9 100644 (file)
--- a/src/p11tool.c
+++ b/src/p11tool.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Free Software Foundation, Inc.
+ * Copyright (C) 2010, 2011 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -30,8 +30,6 @@
 #include <gnutls/pkcs11.h>
 #include <gnutls/abstract.h>
 
-#include <gcrypt.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/tests/crq_key_id.c b/tests/crq_key_id.c
index 2d7a9c455f7070c91d345e5a92f97dfe69f7990d..fff9f8f4adf83482e918fc0c52bcbdf2cf964cad 100644 (file)
--- a/tests/crq_key_id.c
+++ b/tests/crq_key_id.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+ * Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
  *
  * Author: David Marín Carreño
  *
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <gcrypt.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 #include <gnutls/abstract.h>

diff --git a/tests/cve-2009-1416.c b/tests/cve-2009-1416.c
index 784521fcd7558ff18c6d204071c21164e3ae2650..b9a66e52328543a908966765c31c716793c8190f 100644 (file)
--- a/tests/cve-2009-1416.c
+++ b/tests/cve-2009-1416.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+ * Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
@@ -41,7 +41,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 
-#include <gcrypt.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 

diff --git a/tests/pkcs12_s2k_pem.c b/tests/pkcs12_s2k_pem.c
index d20df0cdc5c67f3f0846c40db7c228a2f2ed9dc8..a09faae5861e8146fb04ae2da2de4d486ec35797 100644 (file)
--- a/tests/pkcs12_s2k_pem.c
+++ b/tests/pkcs12_s2k_pem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+ * Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
  *
  * Author: Simon Josefsson
  *
@@ -34,7 +34,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 
-#include <gcrypt.h>
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>