use zeromem in stream-cipher done() functions

sjaeckel · sjaeckel · commit a68b703e228a · 2019-10-17T10:29:27.000+02:00
diff --git a/src/stream/chacha/chacha_done.c b/src/stream/chacha/chacha_done.c
@@ -19,7 +19,7 @@
 int chacha_done(chacha_state *st)
 {
    LTC_ARGCHK(st != NULL);
-   XMEMSET(st, 0, sizeof(chacha_state));
+   zeromem(st, sizeof(chacha_state));
    return CRYPT_OK;
 }
 
diff --git a/src/stream/rc4/rc4_stream.c b/src/stream/rc4/rc4_stream.c
@@ -100,7 +100,7 @@ int rc4_stream_keystream(rc4_state *st, unsigned char *out, unsigned long outlen
 int rc4_stream_done(rc4_state *st)
 {
    LTC_ARGCHK(st != NULL);
-   XMEMSET(st, 0, sizeof(rc4_state));
+   zeromem(st, sizeof(rc4_state));
    return CRYPT_OK;
 }
 
diff --git a/src/stream/salsa20/salsa20_done.c b/src/stream/salsa20/salsa20_done.c
@@ -19,7 +19,7 @@
 int salsa20_done(salsa20_state *st)
 {
    LTC_ARGCHK(st != NULL);
-   XMEMSET(st, 0, sizeof(salsa20_state));
+   zeromem(st, sizeof(salsa20_state));
    return CRYPT_OK;
 }
 
diff --git a/src/stream/sober128/sober128_stream.c b/src/stream/sober128/sober128_stream.c
@@ -332,7 +332,7 @@ int sober128_stream_keystream(sober128_state *st, unsigned char *out, unsigned l
 int sober128_stream_done(sober128_state *st)
 {
    LTC_ARGCHK(st != NULL);
-   XMEMSET(st, 0, sizeof(sober128_state));
+   zeromem(st, sizeof(sober128_state));
    return CRYPT_OK;
 }
 
diff --git a/src/stream/sosemanuk/sosemanuk.c b/src/stream/sosemanuk/sosemanuk.c
@@ -805,7 +805,7 @@ int sosemanuk_keystream(sosemanuk_state *st, unsigned char *out, unsigned long o
 int sosemanuk_done(sosemanuk_state *st)
 {
    LTC_ARGCHK(st != NULL);
-   XMEMSET(st, 0, sizeof(sosemanuk_state));
+   zeromem(st, sizeof(sosemanuk_state));
    return CRYPT_OK;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`int chacha_done(chacha_state *st)`
`20`	`20`	`{`
`21`	`21`	`LTC_ARGCHK(st != NULL);`
`22`		`- XMEMSET(st, 0, sizeof(chacha_state));`
	`22`	`+ zeromem(st, sizeof(chacha_state));`
`23`	`23`	`return CRYPT_OK;`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ int rc4_stream_keystream(rc4_state st, unsigned char out, unsigned long outlen`
`100`	`100`	`int rc4_stream_done(rc4_state *st)`
`101`	`101`	`{`
`102`	`102`	`LTC_ARGCHK(st != NULL);`
`103`		`- XMEMSET(st, 0, sizeof(rc4_state));`
	`103`	`+ zeromem(st, sizeof(rc4_state));`
`104`	`104`	`return CRYPT_OK;`
`105`	`105`	`}`
`106`	`106`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ int sober128_stream_keystream(sober128_state st, unsigned char out, unsigned l`
`332`	`332`	`int sober128_stream_done(sober128_state *st)`
`333`	`333`	`{`
`334`	`334`	`LTC_ARGCHK(st != NULL);`
`335`		`- XMEMSET(st, 0, sizeof(sober128_state));`
	`335`	`+ zeromem(st, sizeof(sober128_state));`
`336`	`336`	`return CRYPT_OK;`
`337`	`337`	`}`
`338`	`338`
Original file line number	Diff line number	Diff line change
`@@ -805,7 +805,7 @@ int sosemanuk_keystream(sosemanuk_state st, unsigned char out, unsigned long o`
`805`	`805`	`int sosemanuk_done(sosemanuk_state *st)`
`806`	`806`	`{`
`807`	`807`	`LTC_ARGCHK(st != NULL);`
`808`		`- XMEMSET(st, 0, sizeof(sosemanuk_state));`
	`808`	`+ zeromem(st, sizeof(sosemanuk_state));`
`809`	`809`	`return CRYPT_OK;`
`810`	`810`	`}`
`811`	`811`