Removed deprecated debug macros.

4 files changed, 11 insertions, 43 deletions

diff --git a/NEWS b/NEWS
index 495738ae..85117d4b 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,9 @@ Noteworthy changes in version 1.6.0 (unreleased)
 
  * Removed the module register subsystem.
 
+ * The deprecated message digest debug macros have been removed.  Use
+   gcry_md_debug instead.
+
  * Interface changes relative to the 1.5.0 release:
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  gcry_ac_*              REMOVED.
@@ -20,6 +23,8 @@ Noteworthy changes in version 1.6.0 (unreleased)
  gcry_md_register       REMOVED.
  gcry_md_unregister     REMOVED.
  gcry_md_list           REMOVED.
+ gcry_md_start_debug    REMOVED (macro).
+ gcry_md_stop_debug     REMOVED (macro).
 
 
 Noteworthy changes in version 1.5.0 (2011-06-29)
diff --git a/doc/gcrypt.texi b/doc/gcrypt.texi
index 14f6fd1b..b7817d92 100644
--- a/doc/gcrypt.texi
+++ b/doc/gcrypt.texi
@@ -3071,28 +3071,6 @@ because @code{gcry_md_close} implicitly stops debugging.
 @end deftypefun
 
 
-The following two deprecated macros are used for debugging by old code.
-They shopuld be replaced by @code{gcry_md_debug}.
-
-@deftypefun void gcry_md_start_debug (gcry_md_hd_t @var{h}, const char *@var{suffix})
-
-Enable debugging for the digest object with handle @var{h}.  This
-creates create files named @file{dbgmd-<n>.<string>} while doing the
-actual hashing.  @var{suffix} is the string part in the filename.  The
-number is a counter incremented for each new hashing.  The data in the
-file is the raw data as passed to @code{gcry_md_write} or
-@code{gcry_md_putc}.
-@end deftypefun
-
-
-@deftypefun void gcry_md_stop_debug (gcry_md_hd_t @var{h}, int @var{reserved})
-
-Stop debugging on handle @var{h}.  @var{reserved} should be specified as
-0.  This function is usually not required because @code{gcry_md_close}
-does implicitly stop debugging.
-@end deftypefun
-
-
 @c *******************************************************
 @c *******************  KDF  *****************************
 @c *******************************************************
diff --git a/src/ChangeLog b/src/ChangeLog
index 630aa4e7..94525ef1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2011-09-15  Werner Koch  <wk@g10code.com>
 
+	* gcrypt.h.in (enum gcry_thread_option): Remove deprecated enum.
+	(gcry_md_start_debug, gcry_md_stop_debug): Remove deprecated these
+	macros.
+
+2011-09-15  Werner Koch  <wk@g10code.com>
+
 	Removal of the gcry_ac and the module register interfaces.
 
 	* Makefile.am (include_HEADERS): Remove gcrypt-module.h.
diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in
index f66642b1..b34ff08c 100644
--- a/src/gcrypt.h.in
+++ b/src/gcrypt.h.in
@@ -174,14 +174,6 @@ gcry_error_t gcry_err_make_from_errno (gcry_err_source_t source, int err);
 gcry_err_code_t gcry_error_from_errno (int err);
 
 
-/* This enum is deprecated; it is only declared for the sake of
-   complete API compatibility.  */
-enum gcry_thread_option
-  {
-    _GCRY_THREAD_OPTION_DUMMY
-  } _GCRY_GCC_ATTR_DEPRECATED;
-
-
 /* Constants defining the thread model to use.  Used with the OPTION
    field of the struct gcry_thread_cbs.  */
 #define GCRY_THREAD_OPTION_DEFAULT  0
@@ -1211,19 +1203,6 @@ void gcry_md_debug (gcry_md_hd_t hd, const char *suffix);
 #define gcry_md_get_asnoid(a,b,n) \
             gcry_md_algo_info((a), GCRYCTL_GET_ASNOID, (b), (n))
 
-/* Enable debugging for digest object A; i.e. create files named
-   dbgmd-<n>.<string> while hashing.  B is a string used as the suffix
-   for the filename.  This macro is deprecated, use gcry_md_debug. */
-#ifndef GCRYPT_NO_DEPRECATED
-#define gcry_md_start_debug(a,b) \
-            gcry_md_ctl( (a), GCRYCTL_START_DUMP, (b), 0 )
-
-/* Disable the debugging of A.  This macro is deprecated, use
-   gcry_md_debug.  */
-#define gcry_md_stop_debug(a,b) \
-            gcry_md_ctl( (a), GCRYCTL_STOP_DUMP, (b), 0 )
-#endif
-
 
 
 /******************************