From 432f1ae2ff184e07fa78bd3797073094069e521d Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 19 Jan 2017 16:32:38 +0100 Subject: [PATCH] tls: tested PSTM_X86_64, not enabling it - too large Signed-off-by: Denys Vlasenko --- networking/tls.c | 4 ++-- networking/tls.h | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/networking/tls.c b/networking/tls.c index f3d0bde90..092735884 100644 --- a/networking/tls.c +++ b/networking/tls.c @@ -582,7 +582,7 @@ static void xwrite_and_hash(tls_state_t *tls, /*const*/ void *buf, unsigned size tls_get_random(tls->outbuf, AES_BLOCKSIZE); /* IV */ p = tls->outbuf + AES_BLOCKSIZE; size -= sizeof(*xhdr); - dbg("before crypt: 5 hdr + %u data + %u hash bytes\n", size, sizeof(mac_hash)); + dbg("before crypt: 5 hdr + %u data + %u hash bytes\n", size, (int)sizeof(mac_hash)); p = mempcpy(p, buf + sizeof(*xhdr), size); /* content */ p = mempcpy(p, mac_hash, sizeof(mac_hash)); /* MAC */ size += sizeof(mac_hash); @@ -625,7 +625,7 @@ static void xwrite_and_hash(tls_state_t *tls, /*const*/ void *buf, unsigned size xhdr->len16_lo = size & 0xff; xwrite(tls->fd, xhdr, sizeof(*xhdr)); xwrite(tls->fd, tls->outbuf, size); - dbg("wrote %u bytes\n", sizeof(*xhdr) + size); + dbg("wrote %u bytes\n", (int)sizeof(*xhdr) + size); //restore xhdr->len16_hi = ; //restore xhdr->len16_lo = ; } diff --git a/networking/tls.h b/networking/tls.h index 5e6b346e2..d487f3810 100644 --- a/networking/tls.h +++ b/networking/tls.h @@ -27,11 +27,13 @@ /* pstm: multiprecision numbers */ #undef DISABLE_PSTM #if defined(__GNUC__) && defined(__i386__) + /* PSTM_X86 works correctly. +25 bytes. */ # define PSTM_32BIT # define PSTM_X86 #endif -//test this before enabling: //#if defined(__GNUC__) && defined(__x86_64__) +// /* PSTM_X86_64 works correctly, but +782 bytes. */ +// /* Looks like most of the growth is because of PSTM_64BIT. */ //# define PSTM_64BIT //# define PSTM_X86_64 //#endif -- 2.25.1