/* SSL_VERIFY_NONE instructs OpenSSL not to abort SSL_connect if the
certificate is invalid. We verify the certificate separately in
- ssl_check_server_identity, which provides much better diagnostics
+ ssl_check_certificate, which provides much better diagnostics
than examining the error stack after a failed SSL_connect. */
SSL_CTX_set_verify (ssl_ctx, SSL_VERIFY_NONE, NULL);
{
SSL *ssl;
+ DEBUGP (("Initiating SSL handshake.\n"));
+
assert (ssl_ctx != NULL);
ssl = SSL_new (ssl_ctx);
if (!ssl)
functions are used for reading, writing, and polling. */
fd_register_transport (fd, openssl_read, openssl_write, openssl_poll,
openssl_peek, openssl_close, ssl);
- DEBUGP (("Connected %d to SSL 0x%0*lx\n", fd, 2 * sizeof (void *),
- (unsigned long) ssl));
+ DEBUGP (("Handshake successful; connected socket %d to SSL handle 0x%0*lx\n",
+ fd, PTR_FORMAT (ssl)));
return 1;
error:
+ DEBUGP (("SSL handshake failed.\n"));
print_errors ();
if (ssl)
SSL_free (ssl);
return 0;
}
+#define ASTERISK_EXCLUDES_DOT /* mandated by rfc2818 */
+
/* Return 1 is STRING (case-insensitively) matches PATTERN, 0
otherwise. The recognized wildcard character is "*", which matches
any character in STRING except ".". Any number of the "*" wildcard
contain the wildcard character * which is considered to match any
single domain name component or component fragment. E.g., *.a.com
matches foo.a.com but not bar.foo.a.com. f*.com matches foo.com but
- not bar.com." */
+ not bar.com [or foo.bar.com]."
+
+ If the pattern contain no wildcards, pattern_match(a, b) is
+ equivalent to !strcasecmp(a, b). */
static int
pattern_match (const char *pattern, const char *string)
for (; *n != '\0'; n++)
if (TOLOWER (*n) == c && pattern_match (p, n))
return 1;
+#ifdef ASTERISK_EXCLUDES_DOT
else if (*n == '.')
return 0;
+#endif
return c == '\0';
}
else
return *n == '\0';
}
-/* Check that the identity of the remote host, as presented by its
- server certificate, corresponds to HOST, which is the host name the
- user thinks he's connecting to. This assumes that FD has been
- connected to an SSL context using ssl_connect. Return 1 if the
- identity checks out, 0 otherwise.
+/* Verify the validity of the certificate presented by the server.
+ Also check that the "common name" of the server, as presented by
+ its certificate, corresponds to HOST. (HOST typically comes from
+ the URL and is what the user thinks he's connecting to.)
- If opt.check_cert is 0, this always returns 1, but still warns the
- user about the mismatches, if any. */
+ This assumes that ssl_connect has successfully finished, i.e. that
+ the SSL handshake has been performed and that FD is connected to an
+ SSL handle.
+
+ If opt.check_cert is non-zero (the default), this returns 1 if the
+ certificate is valid, 0 otherwise. If opt.check_cert is 0, the
+ function always returns 1, but should still be called because it
+ warns the user about any problems with the certificate. */
int
-ssl_check_server_identity (int fd, const char *host)
+ssl_check_certificate (int fd, const char *host)
{
- X509 *peer_cert;
- char peer_CN[256];
+ X509 *cert;
+ char common_name[256];
long vresult;
- int retval;
+ int success;
/* If the user has specified --no-check-cert, we still want to warn
him about problems with the server's certificate. */
SSL *ssl = (SSL *) fd_transport_context (fd);
assert (ssl != NULL);
- peer_cert = SSL_get_peer_certificate (ssl);
- if (!peer_cert)
+ cert = SSL_get_peer_certificate (ssl);
+ if (!cert)
{
logprintf (LOG_NOTQUIET, _("%s: No certificate presented by %s.\n"),
severity, escnonprint (host));
- retval = 0;
+ success = 0;
goto out;
}
#ifdef ENABLE_DEBUG
if (opt.debug)
{
- char *subject = X509_NAME_oneline (X509_get_subject_name (peer_cert), 0, 0);
- char *issuer = X509_NAME_oneline (X509_get_issuer_name (peer_cert), 0, 0);
+ char *subject = X509_NAME_oneline (X509_get_subject_name (cert), 0, 0);
+ char *issuer = X509_NAME_oneline (X509_get_issuer_name (cert), 0, 0);
DEBUGP (("certificate:\n subject: %s\n issuer: %s\n",
escnonprint (subject), escnonprint (issuer)));
OPENSSL_free (subject);
_("%s: Certificate verification error for %s: %s\n"),
severity, escnonprint (host),
X509_verify_cert_error_string (vresult));
- retval = 0;
+ success = 0;
goto out;
}
- /* Check that the common name in the presented certificate matches
- HOST. This should be improved in the following ways:
+ /* Check that HOST matches the common name in the certificate.
+ #### The following remains to be done:
- It should use dNSName/ipAddress subjectAltName extensions if
available; according to rfc2818: "If a subjectAltName extension
- When matching against common names, it should loop over all
common names and choose the most specific one, i.e. the last
- one, not the first one, which the current code picks. */
+ one, not the first one, which the current code picks.
+
+ - Make sure that the names are encoded as UTF-8 which, being
+ ASCII-compatible, can be easily compared against HOST. */
- peer_CN[0] = '\0';
- X509_NAME_get_text_by_NID (X509_get_subject_name (peer_cert),
- NID_commonName, peer_CN, sizeof (peer_CN));
- if (!pattern_match (peer_CN, host))
+ common_name[0] = '\0';
+ X509_NAME_get_text_by_NID (X509_get_subject_name (cert),
+ NID_commonName, common_name, sizeof (common_name));
+ if (!pattern_match (common_name, host))
{
logprintf (LOG_NOTQUIET, _("\
%s: certificate common name `%s' doesn't match requested host name `%s'.\n"),
- severity, escnonprint (peer_CN), escnonprint (host));
- retval = 0;
+ severity, escnonprint (common_name), escnonprint (host));
+ success = 0;
goto out;
}
/* The certificate was found, verified, and matched HOST. */
- retval = 1;
+ success = 1;
+ DEBUGP (("X509 certificate successfully verified and matches host %s\n",
+ escnonprint (host)));
out:
- if (peer_cert)
- X509_free (peer_cert);
+ if (cert)
+ X509_free (cert);
+
+ if (opt.check_cert && !success)
+ logprintf (LOG_NOTQUIET, _("\
+To connect to %s insecurely, use `--no-check-certificate'.\n"),
+ escnonprint (host));
/* Allow --no-check-cert to disable certificate checking. */
- return opt.check_cert ? retval : 1;
+ return opt.check_cert ? success : 1;
}
projects / wget / blobdiff