Moved the GnuTLS related TODO items from lib/TODO.gnutls to the proper

docs/TODO

2 files changed, 15 insertions, 17 deletions

diff --git a/docs/TODO b/docs/TODO
index 5678b9fc2..9f6ed77c4 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -167,6 +167,21 @@ TODO
    Awaits OpenSSL support for this, no need to support this in libcurl before
    there's an OpenSSL release that does it.
 
+ * make the configure --with-ssl option first check for OpenSSL and then for
+   GnuTLS if OpenSSL wasn't detected.
+
+ GnuTLS
+
+ * Get NTLM working using the functions provided by libgcrypt, since GnuTLS
+   already depends on that to function. Not strictly SSL/TLS related, but
+   hey... Another option is to get available DES and MD4 source code from the
+   cryptopp library. They are fine license-wise, but are C++.
+
+ * SSL engine stuff?
+
+ * Work out a common method with Peter Sylvester's OpenSSL-patch for SRP
+   on the TLS to provide name and password
+
  LDAP
 
  * Look over the implementation. The looping will have to "go away" from the
diff --git a/lib/TODO.gnutls b/lib/TODO.gnutls
deleted file mode 100644
index 1440df1d2..000000000
--- a/lib/TODO.gnutls
+++ /dev/null
@@ -1,17 +0,0 @@
-Things to fix for the GnuTLS support
-====================================
-
-* make the configure --with-ssl option first check for OpenSSL and then for
-  GnuTLS if OpenSSL wasn't detected.
-
-* Get NTLM working using the functions provided by libgcrypt, since GnuTLS
-  already depends on that to function. Not strictly SSL/TLS related, but
-  hey... Another option is to get available DES and MD4 source code from the
-  cryptopp library. They are fine license-wise, but are C++.
-
-* SSL engine stuff?
-
-  SRP for TLS
-
-* Work out a common method with Peter Sylvester's OpenSSL-patch for SRP
-  on the TLS to provide name and password