cleanup: provide helpful FILLZERO macro (for certain memset calls)

[secnet] / transform.c

diff --git a/transform.c b/transform.c
index 5497711c228b7b4b0e2395739c5b00a0b97886e2..8fdf9fd80a350b254bb4e2d7380a31a9babc77f9 100644 (file)
--- a/transform.c
+++ b/transform.c
@@ -19,7 +19,6 @@
 
 struct transform {
     closure_t cl;
 
 struct transform {
     closure_t cl;

-    uint32_t line;

     struct transform_if ops;
     uint32_t max_seq_skew;
 };
     struct transform_if ops;
     uint32_t max_seq_skew;
 };


@@ -73,8 +72,8 @@ static void transform_delkey(void *sst)
 {
     struct transform_inst *ti=sst;
 
 {
     struct transform_inst *ti=sst;
 

-    memset(&ti->cryptkey,0,sizeof(ti->cryptkey));
-    memset(&ti->mackey,0,sizeof(ti->mackey));
+    FILLZERO(ti->cryptkey);
+    FILLZERO(ti->mackey);

     ti->keyed=False;
 }
 
     ti->keyed=False;
 }
 


@@ -253,7 +252,7 @@ static void transform_destroy(void *sst)
 {
     struct transform_inst *st=sst;
 
 {
     struct transform_inst *st=sst;
 

-    memset(st,0,sizeof(*st)); /* Destroy key material */
+    FILLZERO(*st); /* Destroy key material */

     free(st);
 }
 
     free(st);
 }