Commit 9e4c9fdf authored by rswindell's avatar rswindell
Browse files

Added "TLS" (or "/TLS") to the cryptlib-related log messages.

parent 69cdeb69
......@@ -297,7 +297,7 @@ static int ftp_close_socket(SOCKET* sock, CRYPT_SESSION *sess, int line)
int GCES_level; \
get_crypt_error_string(status, session, &estr, action, &GCES_level);\
if (estr) { \
lprintf(GCES_level, "%04d %s", sock, estr); \
lprintf(GCES_level, "%04d TLS %s", sock, estr); \
free_crypt_attrstr(estr); \
} \
} while (0)
......
......@@ -67,7 +67,7 @@ static int do_cryptAttribute(const CRYPT_CONTEXT session, CRYPT_ATTRIBUTE_TYPE a
if(ret != CRYPT_OK) {
get_crypt_error_string(ret, session, &estr, "setting attribute", &level);
if (estr) {
lprintf(level, "%s", estr);
lprintf(level, "TLS %s", estr);
free_crypt_attrstr(estr);
}
}
......@@ -83,7 +83,7 @@ static int do_cryptAttributeString(const CRYPT_CONTEXT session, CRYPT_ATTRIBUTE_
if(ret != CRYPT_OK) {
get_crypt_error_string(ret, session, &estr, "setting attribute string", &level);
if (estr) {
lprintf(level, "%s", estr);
lprintf(level, "TLS %s", estr);
free_crypt_attrstr(estr);
}
}
......@@ -94,7 +94,7 @@ static int do_cryptAttributeString(const CRYPT_CONTEXT session, CRYPT_ATTRIBUTE_
int GCES_level; \
get_crypt_error_string(status, pdata->session, &estr, action, &GCES_level); \
if (estr) { \
lprintf(GCES_level, "%04d %s", p->sock, estr); \
lprintf(GCES_level, "%04d TLS %s", p->sock, estr); \
free_crypt_attrstr(estr); \
} \
} while(0)
......@@ -103,7 +103,7 @@ static int do_cryptAttributeString(const CRYPT_CONTEXT session, CRYPT_ATTRIBUTE_
int GCESH_level; \
get_crypt_error_string(status, handle, &estr, action, &GCESH_level); \
if (estr) { \
lprintf(GCESH_level, "%04d %s", socket, estr); \
lprintf(GCESH_level, "%04d TLS %s", socket, estr); \
free_crypt_attrstr(estr); \
} \
} while(0)
......
......@@ -149,7 +149,7 @@ typedef struct {
int GCES_level; \
get_crypt_error_string(status, sess, &GCES_estr, action, &GCES_level); \
if (GCES_estr) { \
lprintf(GCES_level, "%04d %s%s", sock, server, GCES_estr); \
lprintf(GCES_level, "%04d %s/TLS %s", sock, server, GCES_estr); \
free_crypt_attrstr(GCES_estr); \
} \
} while(0)
......@@ -159,7 +159,7 @@ typedef struct {
int GCES_level; \
get_crypt_error_string(status, sess, &GCES_estr, action, &GCES_level); \
if (GCES_estr) { \
lprintf(GCES_level, "%04d %s [%s] %s", sock, server, host, GCES_estr); \
lprintf(GCES_level, "%04d %s/TLS [%s] %s", sock, server, host, GCES_estr); \
free_crypt_attrstr(GCES_estr); \
} \
} while(0)
......
......@@ -943,7 +943,7 @@ static BOOL handle_crypt_call(int status, service_client_t *service_client, cons
sess = CRYPT_UNUSED;
get_crypt_error_string(status, sess, &estr, action, &level);
if (estr) {
lprintf(level, "%04d %s", sock, estr);
lprintf(level, "%04d %s/TLS %s", sock, service_client->service->protocol, estr);
free_crypt_attrstr(estr);
}
}
......
......@@ -394,13 +394,13 @@ enum {
,MOVED_STAT
};
#define GCES(status, sess, action) do { \
#define GCES(status, sess, action) do { \
char *GCES_estr; \
int GCES_level; \
get_crypt_error_string(status, sess->tls_sess, &GCES_estr, action, &GCES_level);\
if (GCES_estr) { \
lprintf(GCES_level, "%04d %s", sess->socket, GCES_estr); \
free_crypt_attrstr(GCES_estr); \
lprintf(GCES_level, "%04d TLS %s", sess->socket, GCES_estr); \
free_crypt_attrstr(GCES_estr); \
} \
} while (0)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment