summaryrefslogtreecommitdiffstats
path: root/src/net/tls.c
diff options
context:
space:
mode:
authorMichael Brown2007-08-23 22:51:57 +0200
committerMichael Brown2007-08-23 22:51:57 +0200
commit746d0f8febe166a3d5bad03a84ca4e33d1bcfe34 (patch)
tree8fb0d6d2d7066bdbc54f3540fa9564c0ad290127 /src/net/tls.c
parentAuto-assign drive number only if set to 0xff; almost all applications (diff)
parentuse malloc attribute (diff)
downloadipxe-746d0f8febe166a3d5bad03a84ca4e33d1bcfe34.tar.gz
ipxe-746d0f8febe166a3d5bad03a84ca4e33d1bcfe34.tar.xz
ipxe-746d0f8febe166a3d5bad03a84ca4e33d1bcfe34.zip
Merge commit 'holger/strings'
Diffstat (limited to 'src/net/tls.c')
-rw-r--r--src/net/tls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net/tls.c b/src/net/tls.c
index 64e44b55d..5c201b32f 100644
--- a/src/net/tls.c
+++ b/src/net/tls.c
@@ -1044,7 +1044,7 @@ static void tls_hmac ( struct tls_session *tls __unused,
* @ret plaintext_len Length of plaintext record
* @ret plaintext Allocated plaintext record
*/
-static void * tls_assemble_stream ( struct tls_session *tls,
+static void * __malloc tls_assemble_stream ( struct tls_session *tls,
const void *data, size_t len,
void *digest, size_t *plaintext_len ) {
size_t mac_len = tls->tx_cipherspec.digest->digestsize;