projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename xmalloc_and_zero() to xzalloc().
[tinc]
/
src
/
openssl
/
cipher.c
diff --git
a/src/openssl/cipher.c
b/src/openssl/cipher.c
index
32cb5ce
..
7f73cb1
100644
(file)
--- a/
src/openssl/cipher.c
+++ b/
src/openssl/cipher.c
@@
-40,7
+40,7
@@
typedef struct cipher_counter {
} cipher_counter_t;
static cipher_t *cipher_open(const EVP_CIPHER *evp_cipher) {
} cipher_counter_t;
static cipher_t *cipher_open(const EVP_CIPHER *evp_cipher) {
- cipher_t *cipher = x
malloc_and_zero
(sizeof *cipher);
+ cipher_t *cipher = x
zalloc
(sizeof *cipher);
cipher->cipher = evp_cipher;
EVP_CIPHER_CTX_init(&cipher->ctx);
cipher->cipher = evp_cipher;
EVP_CIPHER_CTX_init(&cipher->ctx);
@@
-135,7
+135,7
@@
bool cipher_set_counter_key(cipher_t *cipher, void *key) {
}
if(!cipher->counter)
}
if(!cipher->counter)
- cipher->counter = x
malloc_and_zero
(sizeof *cipher->counter);
+ cipher->counter = x
zalloc
(sizeof *cipher->counter);
else
cipher->counter->n = 0;
else
cipher->counter->n = 0;