eliminated wipemem().

4 files changed, 4 insertions, 15 deletions

diff --git a/lib/opencdk/hash.c b/lib/opencdk/hash.c
index 349845d653..2e71c7d9d1 100644
--- a/lib/opencdk/hash.c
+++ b/lib/opencdk/hash.c
@@ -68,7 +68,7 @@ hash_encode (void *data, FILE * in, FILE * out)
       _gnutls_hash (&mfx->md, buf, nread);
     }
 
-  wipemem (buf, sizeof (buf));
+  memset (buf, 0, sizeof (buf));
   return 0;
 }
 
diff --git a/lib/opencdk/main.h b/lib/opencdk/main.h
index 8b785f90a2..37cc64de48 100644
--- a/lib/opencdk/main.h
+++ b/lib/opencdk/main.h
@@ -77,17 +77,6 @@ cdk_error_t map_gnutls_error (int err);
 #define KEY_CAN_SIGN(a)    ((_cdk_pk_algo_usage ((a))) & CDK_KEY_USG_SIGN)
 #define KEY_CAN_AUTH(a)    ((_cdk_pk_algo_usage ((a))) & CDK_KEY_USG_AUTH)
 
-/* Helper macro to make sure the buffer is overwritten. */
-#define wipemem(_ptr,_len) do { \
-  volatile char *_vptr = (volatile char *)(_ptr); \
-  size_t _vlen = (_len); \
-  while (_vlen) \
-    { \
-      *_vptr = 0; \
-      _vptr++; \
-      _vlen--; \
-    } } while (0)
-
 /*-- armor.c --*/
 const char *_cdk_armor_get_lineend (void);
 
diff --git a/lib/opencdk/stream.c b/lib/opencdk/stream.c
index a9e0af3a4e..7e8d51e2ad 100644
--- a/lib/opencdk/stream.c
+++ b/lib/opencdk/stream.c
@@ -1376,7 +1376,7 @@ stream_cache_flush (cdk_stream_t s, FILE * fp)
         }
       s->cache.size = 0;
       s->cache.on = 0;
-      wipemem (s->cache.buf, s->cache.alloced);
+      memset (s->cache.buf, 0, s->cache.alloced);
     }
   return 0;
 }
@@ -1416,7 +1416,7 @@ cdk_stream_kick_off (cdk_stream_t inp, cdk_stream_t out)
         }
     }
 
-  wipemem (buf, sizeof (buf));
+  memset (buf, 0, sizeof (buf));
   return rc;
 }
 
diff --git a/lib/opencdk/write-packet.c b/lib/opencdk/write-packet.c
index 12f432eb05..e8ef87bd00 100644
--- a/lib/opencdk/write-packet.c
+++ b/lib/opencdk/write-packet.c
@@ -683,7 +683,7 @@ write_literal (cdk_stream_t out, cdk_pkt_literal_t pt, int old_ctb)
         rc = stream_write (out, buf, size);
     }
 
-  wipemem (buf, sizeof (buf));
+  memset (buf, 0, sizeof (buf));
   return rc;
 }