4ae531e532
svn path=/nixpkgs/trunk/; revision=26793
122 lines
3 KiB
Diff
122 lines
3 KiB
Diff
Libgcrypt is no longer required.
|
|
|
|
diff --git a/src/certtool-common.c b/src/certtool-common.c
|
|
index f3c6658..7e7083d 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 9da4318..e5de9a3 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 0125531..4c10f59 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 2d7a9c4..fff9f8f 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 784521f..b9a66e5 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 d20df0c..a09faae 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>
|
|
|