From da7563294b63d006a15c8bdcbb3d6d4d87b72558 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 12 Apr 2011 23:36:09 +0200
Subject: Don't include <gcrypt.h> when it's not needed.

---
 NEWS                   | 2 ++
 src/certtool-common.c  | 5 ++---
 src/certtool.c         | 5 ++---
 src/p11tool.c          | 4 +---
 tests/crq_key_id.c     | 3 +--
 tests/cve-2009-1416.c  | 3 +--
 tests/pkcs12_s2k_pem.c | 3 +--
 7 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/NEWS b/NEWS
index 936e2f7f39..8f316c5344 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,8 @@ Reported by Herbert J. Skuhra.
 ** API and ABI modifications:
 gnutls_transport_set_global_errno: DEPRECATED
 
+** 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 f3c6658167..7e7083dcad 100644
--- 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 9da4318121..e5de9a3fd3 100644
--- 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 01255314bf..4c10f59ffc 100644
--- 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 2d7a9c455f..fff9f8f4ad 100644
--- 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 784521fcd7..b9a66e5232 100644
--- 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 d20df0cdc5..a09faae586 100644
--- 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>
 
-- 
cgit v1.2.1