projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various SASL fixes.
[exim.git]
/
src
/
src
/
tls-gnu.c
diff --git
a/src/src/tls-gnu.c
b/src/src/tls-gnu.c
index 6b80637e910973bff232222ac3c0400e97027f53..dc09d4720d9df0962feee5357e4723a315010f5d 100644
(file)
--- a/
src/src/tls-gnu.c
+++ b/
src/src/tls-gnu.c
@@
-235,7
+235,7
@@
Returns: TRUE/FALSE
static BOOL
verify_certificate(gnutls_session session, const char **error)
{
static BOOL
verify_certificate(gnutls_session session, const char **error)
{
-int rc;
+int rc
= -1
;
uschar *dn_string = US"";
const gnutls_datum *cert;
unsigned int verify, cert_size = 0;
uschar *dn_string = US"";
const gnutls_datum *cert;
unsigned int verify, cert_size = 0;
@@
-854,20
+854,21
@@
construct_cipher_name(gnutls_session session)
{
static uschar cipherbuf[256];
uschar *ver;
{
static uschar cipherbuf[256];
uschar *ver;
-int
bits,
c, kx, mac;
+int c, kx, mac;
ver = string_copy(
US gnutls_protocol_get_name(gnutls_protocol_get_version(session)));
if (Ustrncmp(ver, "TLS ", 4) == 0) ver[3] = '-'; /* Don't want space */
c = gnutls_cipher_get(session);
ver = string_copy(
US gnutls_protocol_get_name(gnutls_protocol_get_version(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);