diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-05-04 18:00:15 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-05-05 22:18:59 -0400 |
| commit | 16f8d4ebf0fd4847fa83d9c61f4150273cb4f533 (patch) | |
| tree | 3c30094cad38433c24008c30efe3d93cf38d8ae9 /demos | |
| parent | 12048657a91b12e499d03ec9ff406b42aba67366 (diff) | |
memset, memcpy, sizeof consistency fixes
Just as with the OPENSSL_malloc calls, consistently use sizeof(*ptr)
for memset and memcpy. Remove needless casts for those functions.
For memset, replace alternative forms of zero with 0.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/engines/ibmca/hw_ibmca.c | 4 | ||||
| -rw-r--r-- | demos/ssl/cli.cpp | 2 | ||||
| -rw-r--r-- | demos/ssl/serv.cpp | 2 | ||||
| -rw-r--r-- | demos/state_machine/state_machine.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/demos/engines/ibmca/hw_ibmca.c b/demos/engines/ibmca/hw_ibmca.c index fb5b8dbad8..5017d6490d 100644 --- a/demos/engines/ibmca/hw_ibmca.c +++ b/demos/engines/ibmca/hw_ibmca.c @@ -506,7 +506,7 @@ static int ibmca_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, if (publKey == NULL) { goto err; } - memset(publKey, 0, sizeof(ICA_KEY_RSA_MODEXPO)); + memset(publKey, 0, sizeof(*publKey)); publKey->keyType = CORRECT_ENDIANNESS(ME_KEY_TYPE); publKey->keyLength = CORRECT_ENDIANNESS(sizeof(ICA_KEY_RSA_MODEXPO)); @@ -670,7 +670,7 @@ static int ibmca_mod_exp_crt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, /* end SAB additions */ - memset(privKey, 0, sizeof(ICA_KEY_RSA_CRT)); + memset(privKey, 0, sizeof(*privKey)); privKey->keyType = CORRECT_ENDIANNESS(CRT_KEY_TYPE); privKey->keyLength = CORRECT_ENDIANNESS(sizeof(ICA_KEY_RSA_CRT)); privKey->modulusBitLength = CORRECT_ENDIANNESS(BN_num_bytes(q) * 2 * 8); diff --git a/demos/ssl/cli.cpp b/demos/ssl/cli.cpp index a5bee1c7b9..cb5d329ea4 100644 --- a/demos/ssl/cli.cpp +++ b/demos/ssl/cli.cpp @@ -47,7 +47,7 @@ void main () sd = socket (AF_INET, SOCK_STREAM, 0); CHK_ERR(sd, "socket"); - memset (&sa, '\0', sizeof(sa)); + memset(&sa, 0, sizeof(sa)); sa.sin_family = AF_INET; sa.sin_addr.s_addr = inet_addr ("127.0.0.1"); /* Server IP */ sa.sin_port = htons (1111); /* Server Port number */ diff --git a/demos/ssl/serv.cpp b/demos/ssl/serv.cpp index b142c758d2..6d4cefd5d0 100644 --- a/demos/ssl/serv.cpp +++ b/demos/ssl/serv.cpp @@ -81,7 +81,7 @@ void main () listen_sd = socket (AF_INET, SOCK_STREAM, 0); CHK_ERR(listen_sd, "socket"); - memset (&sa_serv, '\0', sizeof(sa_serv)); + memset(&sa_serv, 0, sizeof(sa_serv)); sa_serv.sin_family = AF_INET; sa_serv.sin_addr.s_addr = INADDR_ANY; sa_serv.sin_port = htons (1111); /* Server Port number */ diff --git a/demos/state_machine/state_machine.c b/demos/state_machine/state_machine.c index cd990b23d4..1dd8c2be22 100644 --- a/demos/state_machine/state_machine.c +++ b/demos/state_machine/state_machine.c @@ -257,7 +257,7 @@ int OpenSocket(int nPort) exit(2); } - memset(&saServer, 0, sizeof saServer); + memset(&saServer, 0, sizeof(saServer)); saServer.sin_family = AF_INET; saServer.sin_port = htons(nPort); nSize = sizeof saServer; |