aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2003-10-19 01:15:36 +0000
committerRoger Dingledine <arma@torproject.org>2003-10-19 01:15:36 +0000
commitdc85b7af3c5a089b6a5f38d55a0392ea091a979b (patch)
treec6e4fbbb4cacfd57c9a698441bbaab2e381642af
parentefce1b8b3e9654fd83f8c43614f42c96552f2408 (diff)
downloadtor-dc85b7af3c5a089b6a5f38d55a0392ea091a979b.tar.gz
tor-dc85b7af3c5a089b6a5f38d55a0392ea091a979b.zip
warn, not err
svn:r630
-rw-r--r--src/common/tortls.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 6b32c46d5b..dafbbee6da 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -88,7 +88,6 @@ tor_tls_get_error(tor_tls *tls, int r, int extra,
case SSL_ERROR_SYSCALL:
if (extra&CATCH_SYSCALL)
return _TOR_TLS_SYSCALL;
- assert(severity != LOG_ERR); /* XXX remove me when the bug is found */
log(severity, "TLS error: <syscall error> (errno=%d)",errno);
tls_log_errors(severity, doing);
return TOR_TLS_ERROR;
@@ -471,11 +470,11 @@ tor_tls_get_peer_cert_nickname(tor_tls *tls, char *buf, int buflen)
int i;
if (!(cert = SSL_get_peer_certificate(tls->ssl))) {
- log_fn(LOG_ERR, "Peer has no certificate");
+ log_fn(LOG_WARN, "Peer has no certificate");
return -1;
}
if (!(name = X509_get_subject_name(cert))) {
- log_fn(LOG_ERR, "Peer certificate has no subject name");
+ log_fn(LOG_WARN, "Peer certificate has no subject name");
return -1;
}
if ((nid = OBJ_txt2nid("commonName")) == NID_undef)
@@ -485,7 +484,7 @@ tor_tls_get_peer_cert_nickname(tor_tls *tls, char *buf, int buflen)
if (lenout == -1)
return -1;
if (strspn(buf, LEGAL_NICKNAME_CHARACTERS) != lenout) {
- log_fn(LOG_ERR, "Peer certificate nickname has illegal characters.");
+ log_fn(LOG_WARN, "Peer certificate nickname has illegal characters.");
return -1;
}
return 0;