diff options
| author | Martin Willi <martin@strongswan.org> | 2006-04-10 14:19:10 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2006-04-10 14:19:10 +0000 |
| commit | b5cb0210f7b4672cd1c9e51a5ae6943fcc25331f (patch) | |
| tree | 8a18498b075917f81127416cd57659444d440476 /Source/lib/utils | |
| parent | 5113680f95e522c677cdd37072cfffbdca06831e (diff) | |
| download | strongswan-b5cb0210f7b4672cd1c9e51a5ae6943fcc25331f.tar.bz2 strongswan-b5cb0210f7b4672cd1c9e51a5ae6943fcc25331f.tar.xz | |
- startet importing pluto ASN1 stuff
- der PKCS#1 key loading works (as it did with der_decoder)
Diffstat (limited to 'Source/lib/utils')
| -rw-r--r-- | Source/lib/utils/logger.c | 8 | ||||
| -rw-r--r-- | Source/lib/utils/logger_manager.c | 2 | ||||
| -rw-r--r-- | Source/lib/utils/logger_manager.h | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/Source/lib/utils/logger.c b/Source/lib/utils/logger.c index 1ae6bd6f0..c3888f80f 100644 --- a/Source/lib/utils/logger.c +++ b/Source/lib/utils/logger.c @@ -220,11 +220,11 @@ static void log_bytes(private_logger_t *this, log_level_t loglevel, char *label, buffer_pos = buffer; if (this->output == NULL) { - syslog(LOG_INFO, "[=>] [%5d ] %s %s", line_start, buffer, ascii_buffer); + syslog(LOG_INFO, "[=>] [%5d] %s %s", line_start, buffer, ascii_buffer); } else { - fprintf(this->output, "[=>] [%5d ] %s %s\n", line_start, buffer, ascii_buffer); + fprintf(this->output, "[=>] [%5d] %s %s\n", line_start, buffer, ascii_buffer); } memset(ascii_buffer, 0, 16); line_start += 16; @@ -257,11 +257,11 @@ static void log_bytes(private_logger_t *this, log_level_t loglevel, char *label, buffer_pos = buffer; if (this->output == NULL) { - syslog(LOG_INFO, "[=>] [%5d ] %s %16s", line_start, buffer, ascii_buffer); + syslog(LOG_INFO, "[=>] [%5d] %s %16s", line_start, buffer, ascii_buffer); } else { - fprintf(this->output, "[=>] [%5d ] %s %16s\n", line_start, buffer, ascii_buffer); + fprintf(this->output, "[=>] [%5d] %s %16s\n", line_start, buffer, ascii_buffer); } } pthread_mutex_unlock(&mutex); diff --git a/Source/lib/utils/logger_manager.c b/Source/lib/utils/logger_manager.c index 18ff29906..26d8b7d87 100644 --- a/Source/lib/utils/logger_manager.c +++ b/Source/lib/utils/logger_manager.c @@ -50,6 +50,7 @@ mapping_t logger_context_t_mappings[] = { {PAYLOAD, "PAYLOAD"}, {DER_DECODER, "DER_DECODER"}, {DER_ENCODER, "DER_ENCODER"}, + {ASN1, "ASN1"}, {MAPPING_END, NULL}, }; @@ -77,6 +78,7 @@ struct { { "PAYLD", ERROR|CONTROL|AUDIT|LEVEL0, TRUE }, /* PAYLOAD */ { "DERDC", ERROR|CONTROL|AUDIT|LEVEL0, TRUE }, /* DER_DECODER */ { "DEREC", ERROR|CONTROL|AUDIT|LEVEL0, TRUE }, /* DER_ENCODER */ + { "ASN_1", ERROR|CONTROL|AUDIT|RAW|LEVEL3, TRUE }, /* ASN1 */ }; diff --git a/Source/lib/utils/logger_manager.h b/Source/lib/utils/logger_manager.h index a4daa46b6..712891fff 100644 --- a/Source/lib/utils/logger_manager.h +++ b/Source/lib/utils/logger_manager.h @@ -56,6 +56,7 @@ enum logger_context_t { PAYLOAD, DER_DECODER, DER_ENCODER, + ASN1, LOGGER_CONTEXT_ROOF, }; |