8 Commits

Author SHA1 Message Date
James Booth
160a124619 OpenSSL: Debug certificate chain 2015-09-14 00:57:44 +01:00
James Booth
450bbca8e7 OpenSSL: Added debug logging to certificate verification 2015-09-13 22:44:12 +01:00
James Booth
20380157ba OpenSSL: debug name string on cert verify fail 2015-09-11 01:18:48 +01:00
James Booth
3e12f33cce OpenSSL: Use simpler cert callback 2015-09-11 00:46:49 +01:00
James Booth
f05529b09a Added open SSL dummy certificate check callback 2015-09-10 23:14:08 +01:00
James Booth
cc486b2ebf Continue open SSL connect loop on recoverable errors 2015-09-10 23:06:05 +01:00
James Booth
165d2487bb Change openssl connect err check for < 0 instead of == -1 2015-09-10 22:54:14 +01:00
James Booth
32591e3e77 Reformat tls_openssl.c 2015-09-10 22:51:15 +01:00

View File

@@ -22,7 +22,6 @@
#endif #endif
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include "common.h" #include "common.h"
#include "tls.h" #include "tls.h"
#include "sock.h" #include "sock.h"
@@ -51,31 +50,136 @@ int tls_error(tls_t *tls)
return tls->lasterror; return tls->lasterror;
} }
int
convert_ASN1TIME(ASN1_TIME *ansi_time, char* buf, size_t len)
{
BIO *bio = BIO_new(BIO_s_mem());
int rc = ASN1_TIME_print(bio, ansi_time);
if (rc <= 0) {
BIO_free(bio);
return 0;
}
rc = BIO_gets(bio, buf, len);
if (rc <= 0) {
BIO_free(bio);
return 0;
}
BIO_free(bio);
return 1;
}
void
hex_encode(unsigned char* readbuf, void *writebuf, size_t len)
{
size_t i;
for(i=0; i < len; i++) {
char *l = (char*) (2*i + ((intptr_t) writebuf));
sprintf(l, "%02x", readbuf[i]);
}
}
static xmpp_ctx_t *xmppctx;
static void
print_certificate(X509* cert) {
char subj[1024+1];
char issuer[1024+1];
X509_NAME_oneline(X509_get_subject_name(cert), subj, 1024);
X509_NAME_oneline(X509_get_issuer_name(cert), issuer, 1024);
xmpp_debug(xmppctx, "TLS", "SUBJECT : %s", subj);
xmpp_debug(xmppctx, "TLS", "ISSUER : %s", issuer);
}
static int
verify_callback(int preverify_ok, X509_STORE_CTX *x509_ctx)
{
X509 *cert = X509_STORE_CTX_get_current_cert(x509_ctx);
const STACK_OF(X509) *sk = X509_STORE_CTX_get1_chain(x509_ctx);
int slen = sk_num((const _STACK *)sk);
unsigned i;
X509 *certsk;
xmpp_debug(xmppctx, "TLS", "STACK");
for(i=0; i<slen; i++) {
certsk = (X509*) sk_value((const _STACK *)sk, i);
print_certificate(certsk);
}
xmpp_debug(xmppctx, "TLS", "ENDSTACK");
X509_NAME *subject = X509_get_subject_name(cert);
char *nameline = X509_NAME_oneline(subject, NULL, 0);
xmpp_debug(xmppctx, "TLS", "SUBJECT : %s", nameline);
OPENSSL_free(nameline);
X509_NAME *issuer = X509_get_issuer_name(cert);
nameline = X509_NAME_oneline(issuer, NULL, 0);
xmpp_debug(xmppctx, "TLS", "ISSUER : %s", nameline);
OPENSSL_free(nameline);
ASN1_TIME *not_before = X509_get_notBefore(cert);
char not_before_str[128];
int not_before_res = convert_ASN1TIME(not_before, not_before_str, 128);
if (not_before_res) {
xmpp_debug(xmppctx, "TLS", "NOT BEFORE : %s", not_before_str);
}
ASN1_TIME *not_after = X509_get_notAfter(cert);
char not_after_str[128];
int not_after_res = convert_ASN1TIME(not_after, not_after_str, 128);
if (not_after_res) {
xmpp_debug(xmppctx, "TLS", "NOT AFTER : %s", not_after_str);
}
char buf[20];
const EVP_MD *digest = EVP_sha1();
unsigned len;
int rc = X509_digest(cert, digest, (unsigned char*) buf, &len);
if (rc != 0 && len == 20) {
char strbuf[2*20+1];
hex_encode(buf, strbuf, 20);
xmpp_debug(xmppctx, "TLS", "FINGERPRINT : %s", strbuf);
}
if (preverify_ok) {
xmpp_debug(xmppctx, "TLS", "VERIFY SUCCESS");
return 1;
} else {
xmpp_debug(xmppctx, "TLS", "VERIFY FAILED");
int err = X509_STORE_CTX_get_error(x509_ctx);
const char *errstr = X509_verify_cert_error_string(err);
xmpp_debug(xmppctx, "TLS", "ERROR: %s", errstr);
return 1;
}
}
tls_t *tls_new(xmpp_ctx_t *ctx, sock_t sock) tls_t *tls_new(xmpp_ctx_t *ctx, sock_t sock)
{ {
xmppctx = ctx;
tls_t *tls = xmpp_alloc(ctx, sizeof(*tls)); tls_t *tls = xmpp_alloc(ctx, sizeof(*tls));
if (tls) { if (tls) {
int ret; int ret;
memset(tls, 0, sizeof(*tls)); memset(tls, 0, sizeof(*tls));
tls->ctx = ctx; tls->ctx = ctx;
tls->sock = sock; tls->sock = sock;
tls->ssl_ctx = SSL_CTX_new(SSLv23_client_method()); tls->ssl_ctx = SSL_CTX_new(SSLv23_client_method());
SSL_CTX_set_client_cert_cb(tls->ssl_ctx, NULL); SSL_CTX_set_client_cert_cb(tls->ssl_ctx, NULL);
SSL_CTX_set_mode (tls->ssl_ctx, SSL_MODE_ENABLE_PARTIAL_WRITE); SSL_CTX_set_mode (tls->ssl_ctx, SSL_MODE_ENABLE_PARTIAL_WRITE);
SSL_CTX_set_verify (tls->ssl_ctx, SSL_VERIFY_NONE, NULL); SSL_CTX_set_verify (tls->ssl_ctx, SSL_VERIFY_PEER, verify_callback);
tls->ssl = SSL_new(tls->ssl_ctx);
tls->ssl = SSL_new(tls->ssl_ctx); ret = SSL_set_fd(tls->ssl, sock);
if (ret <= 0) {
ret = SSL_set_fd(tls->ssl, sock); tls->lasterror = SSL_get_error(tls->ssl, ret);
if (ret <= 0) { tls_error(tls);
tls->lasterror = SSL_get_error(tls->ssl, ret); tls_free(tls);
tls_error(tls); tls = NULL;
tls_free(tls); }
tls = NULL;
}
} }
return tls; return tls;
@@ -99,32 +203,35 @@ int tls_start(tls_t *tls)
int ret = -1; int ret = -1;
/* Since we're non-blocking, loop the connect call until it /* Since we're non-blocking, loop the connect call until it
succeeds or fails */ succeeds or fails */
while (ret == -1) { while (ret < 0) {
ret = SSL_connect(tls->ssl); ret = SSL_connect(tls->ssl);
int err = SSL_get_error(tls->ssl, ret);
int recoverable = tls_is_recoverable(err);
/* wait for something to happen on the sock before looping back */ // continue if recoverable
if (ret == -1) { if (recoverable) {
fd_set fds; fd_set fds;
struct timeval tv; struct timeval tv;
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = 1000; tv.tv_usec = 1000;
FD_ZERO(&fds); FD_ZERO(&fds);
FD_SET(tls->sock, &fds); FD_SET(tls->sock, &fds);
select(tls->sock + 1, &fds, &fds, NULL, &tv); select(tls->sock + 1, &fds, &fds, NULL, &tv);
} } else {
ret = 1;
}
} }
if (ret <= 0) { if (ret <= 0) {
tls->lasterror = SSL_get_error(tls->ssl, ret); tls->lasterror = SSL_get_error(tls->ssl, ret);
return 0; return 0;
} }
return 1; return 1;
} }
int tls_stop(tls_t *tls) int tls_stop(tls_t *tls)
@@ -134,8 +241,8 @@ int tls_stop(tls_t *tls)
ret = SSL_shutdown(tls->ssl); ret = SSL_shutdown(tls->ssl);
if (ret <= 0) { if (ret <= 0) {
tls->lasterror = SSL_get_error(tls->ssl, ret); tls->lasterror = SSL_get_error(tls->ssl, ret);
return 0; return 0;
} }
return 1; return 1;
@@ -144,9 +251,9 @@ int tls_stop(tls_t *tls)
int tls_is_recoverable(int error) int tls_is_recoverable(int error)
{ {
return (error == SSL_ERROR_NONE || error == SSL_ERROR_WANT_READ return (error == SSL_ERROR_NONE || error == SSL_ERROR_WANT_READ
|| error == SSL_ERROR_WANT_WRITE || error == SSL_ERROR_WANT_WRITE
|| error == SSL_ERROR_WANT_CONNECT || error == SSL_ERROR_WANT_CONNECT
|| error == SSL_ERROR_WANT_ACCEPT); || error == SSL_ERROR_WANT_ACCEPT);
} }
int tls_pending(tls_t *tls) int tls_pending(tls_t *tls)
@@ -159,7 +266,7 @@ int tls_read(tls_t *tls, void * const buff, const size_t len)
int ret = SSL_read(tls->ssl, buff, len); int ret = SSL_read(tls->ssl, buff, len);
if (ret <= 0) { if (ret <= 0) {
tls->lasterror = SSL_get_error(tls->ssl, ret); tls->lasterror = SSL_get_error(tls->ssl, ret);
} }
return ret; return ret;
@@ -170,7 +277,7 @@ int tls_write(tls_t *tls, const void * const buff, const size_t len)
int ret = SSL_write(tls->ssl, buff, len); int ret = SSL_write(tls->ssl, buff, len);
if (ret <= 0) { if (ret <= 0) {
tls->lasterror = SSL_get_error(tls->ssl, ret); tls->lasterror = SSL_get_error(tls->ssl, ret);
} }
return ret; return ret;