2001-10-19
2001-10-19 12:13:03 by Henrik Grubbström (Grubba) <grubba@grubba.org>
-
2839e2381da1cd696627c322790d115aa81dd6b8
(19 lines)
(+5/-14)
[
Show
| Annotate
]
Branch: 5.2
Don't destruct SSLProtocol objects in create() on failure.
Fixes [bug 2390 (#2390)] and [bug 2253 (#2253)].
Rev: server/base_server/roxen.pike:1.750
6:
// Per Hedbor, Henrik Grubbström, Pontus Hagland, David Hedbor and others.
// ABS and suicide systems contributed freely by Francesco Chemolli
- constant cvs_version="$Id: roxen.pike,v 1.749 2001/10/09 12:38:05 per Exp $";
+ constant cvs_version="$Id: roxen.pike,v 1.750 2001/10/19 12:13:03 grubba Exp $";
// The argument cache. Used by the image cache.
ArgCache argcache;
1467: Inside #if constant(SSL.sslfile)
if( catch{ f = lopen(cert_file, "r")->read(); } )
{
report_error(LOC_M(8,"SSL3: Reading cert-file failed!")+"\n");
- destruct();
+
return;
}
1475: Inside #if constant(SSL.sslfile)
catch{ f2 = lopen(query_option("ssl_key_file"),"r")->read(); } )
{
report_error(LOC_M(9, "SSL3: Reading key-file failed!")+"\n");
- destruct();
+
return;
}
1486: Inside #if constant(SSL.sslfile)
if (!part || !(cert = part->decoded_body()))
{
report_error(LOC_M(10, "SSL3: No certificate found.")+"\n");
- destruct();
+
return;
}
1504: Inside #if constant(SSL.sslfile)
if (!(key = part->decoded_body()))
{
report_error(LOC_M(11,"SSL3: Private rsa key not valid")+" (PEM).\n");
- destruct();
+
return;
}
1512: Inside #if constant(SSL.sslfile)
if (!rsa)
{
report_error(LOC_M(11, "SSL3: Private rsa key not valid")+" (DER).\n");
- destruct();
+
return;
}
1533: Inside #if constant(SSL.sslfile)
if (!tbs)
{
report_error(LOC_M(13,"SSL3: Certificate not valid (DER).")+"\n");
- destruct();
+
return;
}
if (tbs->public_key->rsa->public_key_equal (rsa))
1548: Inside #if constant(SSL.sslfile)
if (!(key = part->decoded_body()))
{
report_error(LOC_M(15,"SSL3: Private dsa key not valid")+" (PEM).\n");
- destruct();
+
return;
}
1556: Inside #if constant(SSL.sslfile)
if (!dsa)
{
report_error(LOC_M(15,"SSL3: Private dsa key not valid")+" (DER).\n");
- destruct();
+
return;
}
1574: Inside #if constant(SSL.sslfile)
else
{
report_error(LOC_M(17,"SSL3: No private key found.")+"\n");
- destruct();
+
return;
}
1585: Inside #if constant(SSL.sslfile)
{
report_error(LOC_M(14, "SSL3: Certificate and private key do not "
"match.")+"\n");
- destruct();
+
return;
}
#if EXPORT
1923:
m_delete( m[ required_host ], port );
failures++;
if (required_host) {
- report_warning(LOC_M(22, "Binding the port on IP %s "
- "failed\n for URL %s!\n"),
- url, required_host);
+ report_warning(LOC_M(22, "Binding the port on IP %s failed\n"
+ " for URL %s!\n"),
+ required_host, url);
}
continue;
}