summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2011-04-12 23:36:09 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2011-04-13 17:28:18 +0200
commit9ebe9b34e4ed31611680ab9d63fa9a4e88d52d78 (patch)
tree8eeaf045b4fea0720a2cb7e7519f183a4f721acc
parenteea634092861a794e866325fad3735380d14ca7c (diff)
downloadgnutls-9ebe9b34e4ed31611680ab9d63fa9a4e88d52d78.tar.gz
Don't include <gcrypt.h> when it's not needed.
-rw-r--r--NEWS2
-rw-r--r--src/certtool-common.c5
-rw-r--r--src/certtool.c5
-rw-r--r--src/p11tool.c4
-rw-r--r--tests/crq_key_id.c3
-rw-r--r--tests/cve-2009-1416.c3
-rw-r--r--tests/pkcs12_s2k_pem.c3
7 files changed, 10 insertions, 15 deletions
diff --git a/NEWS b/NEWS
index a3c43cc9d2..db71fa72d3 100644
--- 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 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 b456bf66ff..9800bfb259 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>