aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2022-02-10 09:53:45 +0900
committerNIIBE Yutaka <[email protected]>2022-02-10 09:53:45 +0900
commit738723a1cd20b24fc667a457163a4aa6617dc182 (patch)
treec6795defc2b6823a93f1cb43c6027db4e26d021d
parentf98ca6aa34ccdbbaf94f93ae30beafe400303c97 (diff)
downloadlibgcrypt-738723a1cd20b24fc667a457163a4aa6617dc182.tar.gz
libgcrypt-738723a1cd20b24fc667a457163a4aa6617dc182.tar.bz2
libgcrypt-738723a1cd20b24fc667a457163a4aa6617dc182.zip
Clean up for removal of memory guard support.
* mpi/mpiutil.c (_gcry_mpi_m_check): Remove. * src/g10lib.h (_gcry_check_heap): Remove. * src/global.c (_gcry_check_heap): Remove. * src/mpi.h (mpi_m_check): Remove. -- GnuPG-bug-id: 5822 Signed-off-by: NIIBE Yutaka <[email protected]>
-rw-r--r--mpi/mpiutil.c7
-rw-r--r--src/g10lib.h1
-rw-r--r--src/global.c12
-rw-r--r--src/mpi.h2
4 files changed, 0 insertions, 22 deletions
diff --git a/mpi/mpiutil.c b/mpi/mpiutil.c
index 74fbac37..d5a1b8a8 100644
--- a/mpi/mpiutil.c
+++ b/mpi/mpiutil.c
@@ -110,13 +110,6 @@ _gcry_mpi_alloc( unsigned nlimbs )
return a;
}
-void
-_gcry_mpi_m_check( gcry_mpi_t a )
-{
- _gcry_check_heap(a);
- _gcry_check_heap(a->d);
-}
-
gcry_mpi_t
_gcry_mpi_alloc_secure( unsigned nlimbs )
{
diff --git a/src/g10lib.h b/src/g10lib.h
index bfaf509f..22c0f0c2 100644
--- a/src/g10lib.h
+++ b/src/g10lib.h
@@ -113,7 +113,6 @@
extern int _gcry_global_any_init_done;
int _gcry_global_is_operational (void);
gcry_err_code_t _gcry_vcontrol (enum gcry_ctl_cmds cmd, va_list arg_ptr);
-void _gcry_check_heap (const void *a);
void _gcry_pre_syscall (void);
void _gcry_post_syscall (void);
int _gcry_get_debug_flag (unsigned int mask);
diff --git a/src/global.c b/src/global.c
index 956043c4..258ea4d1 100644
--- a/src/global.c
+++ b/src/global.c
@@ -1034,18 +1034,6 @@ _gcry_is_secure (const void *a)
return _gcry_private_is_secure (a);
}
-void
-_gcry_check_heap( const void *a )
-{
- (void)a;
-
- /* FIXME: implement this*/
-#if 0
- if( some_handler )
- some_handler(a)
-#endif
-}
-
static void *
_gcry_realloc_core (void *a, size_t n, int xhint)
{
diff --git a/src/mpi.h b/src/mpi.h
index 9e234eff..c2ebd0da 100644
--- a/src/mpi.h
+++ b/src/mpi.h
@@ -117,7 +117,6 @@ void _gcry_mpi_immutable_failed (void);
#define mpi_alloc_like(a) _gcry_mpi_alloc_like((a))
#define mpi_alloc_set_ui(a) _gcry_mpi_alloc_set_ui ((a))
-#define mpi_m_check(a) _gcry_mpi_m_check ((a))
#define mpi_const(n) _gcry_mpi_const ((n))
#define mpi_swap_cond(a,b,sw) _gcry_mpi_swap_cond ((a),(b),(sw))
#define mpi_set_cond(w,u,set) _gcry_mpi_set_cond ((w),(u),(set))
@@ -128,7 +127,6 @@ gcry_mpi_t _gcry_mpi_set_cond (gcry_mpi_t w, const gcry_mpi_t u,
unsigned long swap);
gcry_mpi_t _gcry_mpi_alloc_like( gcry_mpi_t a );
gcry_mpi_t _gcry_mpi_alloc_set_ui( unsigned long u);
-void _gcry_mpi_m_check( gcry_mpi_t a );
void _gcry_mpi_swap( gcry_mpi_t a, gcry_mpi_t b);
void _gcry_mpi_swap_cond (gcry_mpi_t a, gcry_mpi_t b, unsigned long swap);
void _gcry_mpi_set_bit_cond (gcry_mpi_t a, unsigned int n, unsigned long set);