Mercurial > dropbear
annotate dbmalloc.h @ 1902:4a6725ac957c
Revert "Don't include sk keys at all in KEX list"
This reverts git commit f972813ecdc7bb981d25b5a63638bd158f1c8e72.
The sk algorithms need to remain in the sigalgs list so that they
are included in the server-sig-algs ext-info message sent by
the server. RFC8308 for server-sig-algs requires that all algorithms are
listed (though OpenSSH client 8.4p1 tested doesn't require that)
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Thu, 24 Mar 2022 13:42:08 +0800 |
parents | 8dc43b30c6bf |
children |
rev | line source |
---|---|
1361 | 1 #ifndef DBMALLOC_H_ |
2 #define DBMALLOC_H_ | |
3 | |
1571
d4efb7801fcd
Attempt to fix m_free for libtomcrypt/libtommath
Matt Johnston <matt@ucc.asn.au>
parents:
1569
diff
changeset
|
4 #include "options.h" |
1798
8dc43b30c6bf
Define _GNU_SOURCE properly, other header fixes
Matt Johnston <matt@ucc.asn.au>
parents:
1571
diff
changeset
|
5 #include <stdint.h> |
8dc43b30c6bf
Define _GNU_SOURCE properly, other header fixes
Matt Johnston <matt@ucc.asn.au>
parents:
1571
diff
changeset
|
6 #include <stdlib.h> |
1361 | 7 |
8 void * m_malloc(size_t size); | |
9 void * m_calloc(size_t nmemb, size_t size); | |
10 void * m_strdup(const char * str); | |
11 void * m_realloc(void* ptr, size_t size); | |
1569
c42e8ff42bd1
Only use malloc wrapper if fuzzing
Matt Johnston <matt@ucc.asn.au>
parents:
1378
diff
changeset
|
12 |
c42e8ff42bd1
Only use malloc wrapper if fuzzing
Matt Johnston <matt@ucc.asn.au>
parents:
1378
diff
changeset
|
13 #if DROPBEAR_TRACKING_MALLOC |
1361 | 14 void m_free_direct(void* ptr); |
15 void m_malloc_set_epoch(unsigned int epoch); | |
1378 | 16 void m_malloc_free_epoch(unsigned int epoch, int dofree); |
1361 | 17 |
1569
c42e8ff42bd1
Only use malloc wrapper if fuzzing
Matt Johnston <matt@ucc.asn.au>
parents:
1378
diff
changeset
|
18 #else |
c42e8ff42bd1
Only use malloc wrapper if fuzzing
Matt Johnston <matt@ucc.asn.au>
parents:
1378
diff
changeset
|
19 /* plain wrapper */ |
1571
d4efb7801fcd
Attempt to fix m_free for libtomcrypt/libtommath
Matt Johnston <matt@ucc.asn.au>
parents:
1569
diff
changeset
|
20 #define m_free_direct free |
1569
c42e8ff42bd1
Only use malloc wrapper if fuzzing
Matt Johnston <matt@ucc.asn.au>
parents:
1378
diff
changeset
|
21 |
c42e8ff42bd1
Only use malloc wrapper if fuzzing
Matt Johnston <matt@ucc.asn.au>
parents:
1378
diff
changeset
|
22 #endif |
c42e8ff42bd1
Only use malloc wrapper if fuzzing
Matt Johnston <matt@ucc.asn.au>
parents:
1378
diff
changeset
|
23 |
1571
d4efb7801fcd
Attempt to fix m_free for libtomcrypt/libtommath
Matt Johnston <matt@ucc.asn.au>
parents:
1569
diff
changeset
|
24 #define m_free(X) do {m_free_direct(X); (X) = NULL;} while (0) |
d4efb7801fcd
Attempt to fix m_free for libtomcrypt/libtommath
Matt Johnston <matt@ucc.asn.au>
parents:
1569
diff
changeset
|
25 |
1569
c42e8ff42bd1
Only use malloc wrapper if fuzzing
Matt Johnston <matt@ucc.asn.au>
parents:
1378
diff
changeset
|
26 |
1361 | 27 #endif /* DBMALLOC_H_ */ |