git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sasl_fixes'
[users/jgh/exim.git]
/
src
/
src
/
tls-gnu.c
diff --git
a/src/src/tls-gnu.c
b/src/src/tls-gnu.c
index 2d1a327dea80307939e2fc23b0c9d5714fa2ae5c..2f952e47b3aeef121f294ae8e6d521f46fa57841 100644
(file)
--- a/
src/src/tls-gnu.c
+++ b/
src/src/tls-gnu.c
@@
-854,8
+854,9
@@
construct_cipher_name(gnutls_session session)
{
static uschar cipherbuf[256];
uschar *ver;
{
static uschar cipherbuf[256];
uschar *ver;
-int
bits, c, kx, mac, r
c;
+int
c, kx, ma
c;
#ifdef GNUTLS_CB_TLS_UNIQUE
#ifdef GNUTLS_CB_TLS_UNIQUE
+int rc;
gnutls_datum_t channel;
#endif
gnutls_datum_t channel;
#endif
@@
-864,13
+865,14
@@
ver = string_copy(
if (Ustrncmp(ver, "TLS ", 4) == 0) ver[3] = '-'; /* Don't want space */
c = gnutls_cipher_get(session);
if (Ustrncmp(ver, "TLS ", 4) == 0) ver[3] = '-'; /* Don't want space */
c = gnutls_cipher_get(session);
-bits = gnutls_cipher_get_key_size(c);
+/* returns size in "bytes" */
+tls_bits = gnutls_cipher_get_key_size(c) * 8;
mac = gnutls_mac_get(session);
kx = gnutls_kx_get(session);
string_format(cipherbuf, sizeof(cipherbuf), "%s:%s:%u", ver,
mac = gnutls_mac_get(session);
kx = gnutls_kx_get(session);
string_format(cipherbuf, sizeof(cipherbuf), "%s:%s:%u", ver,
- gnutls_cipher_suite_get_name(kx, c, mac), bits);
+ gnutls_cipher_suite_get_name(kx, c, mac),
tls_
bits);
tls_cipher = cipherbuf;
DEBUG(D_tls) debug_printf("cipher: %s\n", cipherbuf);
tls_cipher = cipherbuf;
DEBUG(D_tls) debug_printf("cipher: %s\n", cipherbuf);