FS-10167: Added support for SSL/TLS, specifically enforcing TLS 1.2 currently but could be more configurable later. Added support for obtaining SANS from X509 certificates within the default wss transport, SANS will be used for preapproved automatically registered identities, currently only being cached on server side for downstream connections providing the remote client upstream certificate SANS, but can also be used by a master to obtain initial master identities from it's own downstream certificate in the future (planned, but not yet implemented) as it is the exception with no upstream and MUST have downstream available. Also added the openssl executable to the projects being built in the libblade solution to provide a windows executable for certificate production when required.

This commit is contained in:
Shane Bryldt committed 2017-09-07 06:44:16 -06:00
1 parent 63eec0ee3a
commit ee8db10a5f
49 files changed
+1731 -84

No files matched your search

+1
View File
@@ -5,6 +5,7 @@
#include <openssl/ssl.h>
#include <openssl/engine.h>
#include <openssl/x509v3.h>
KS_BEGIN_EXTERN_C
+3
View File
@@ -79,6 +79,9 @@ KS_DECLARE(ks_status_t) kws_init(kws_t **kwsP, ks_socket_t sock, SSL_CTX *ssl_ct
KS_DECLARE(ks_ssize_t) kws_close(kws_t *kws, int16_t reason);
KS_DECLARE(void) kws_destroy(kws_t **kwsP);
KS_DECLARE(ks_status_t) kws_get_buffer(kws_t *kws, char **bufP, ks_size_t *buflen);
KS_DECLARE(ks_size_t) kws_sans_count(kws_t *kws);
KS_DECLARE(const char *) kws_sans_get(kws_t *kws, ks_size_t index);
+1
View File
@@ -63,6 +63,7 @@ KS_DECLARE(void) ks_ssl_init_ssl_locks(void)
is_init = 1;
SSL_library_init();
SSL_load_error_strings();
if (ssl_count == 0) {
num = CRYPTO_num_locks();
+80 -1
View File
@@ -85,6 +85,9 @@ struct kws_s {
char *req_uri;
char *req_host;
char *req_proto;
char **sans;
ks_size_t sans_count;
};
@@ -619,7 +622,8 @@ static int establish_server_logical_layer(kws_t *kws)
}
if (code < 0) {
if (code == -1 && SSL_get_error(kws->ssl, code) != SSL_ERROR_WANT_READ) {
int sslerr = SSL_get_error(kws->ssl, code);
if (code == -1 && sslerr != SSL_ERROR_WANT_READ) {
return -1;
}
}
@@ -733,6 +737,27 @@ KS_DECLARE(ks_status_t) kws_init(kws_t **kwsP, ks_socket_t sock, SSL_CTX *ssl_ct
goto err;
}
if (kws->type == KWS_SERVER)
{
X509 *cert = SSL_get_peer_certificate(kws->ssl);
if (cert && SSL_get_verify_result(kws->ssl) == X509_V_OK) {
GENERAL_NAMES *sans = X509_get_ext_d2i(cert, NID_subject_alt_name, NULL, NULL);
if (sans) {
kws->sans_count = (ks_size_t)sk_GENERAL_NAME_num(sans);
if (kws->sans_count) kws->sans = ks_pool_calloc(pool, kws->sans_count, sizeof(char *));
for (ks_size_t i = 0; i < kws->sans_count; i++) {
const GENERAL_NAME *gname = sk_GENERAL_NAME_value(sans, (int)i);
char *name = (char *)ASN1_STRING_data(gname->d.dNSName);
kws->sans[i] = ks_pstrdup(pool, name);
}
sk_GENERAL_NAME_pop_free(sans, GENERAL_NAME_free);
}
}
if (cert) X509_free(cert);
}
*kwsP = kws;
return KS_STATUS_SUCCESS;
@@ -864,6 +889,46 @@ uint64_t ntoh64(uint64_t val)
#endif
}
KS_DECLARE(ks_status_t) kws_peer_sans(kws_t *kws, char *buf, ks_size_t buflen)
{
ks_status_t ret = KS_STATUS_SUCCESS;
X509 *cert = NULL;
ks_assert(kws);
ks_assert(buf);
ks_assert(buflen);
cert = SSL_get_peer_certificate(kws->ssl);
if (!cert) {
ret = KS_STATUS_FAIL;
goto done;
}
if (SSL_get_verify_result(kws->ssl) != X509_V_OK) {
ret = KS_STATUS_FAIL;
goto done;
}
//if (X509_NAME_get_text_by_NID(X509_get_subject_name(cert), NID_commonName, buf, (int)buflen) < 0) {
// ret = KS_STATUS_FAIL;
// goto done;
//}
GENERAL_NAMES *san_names = X509_get_ext_d2i(cert, NID_subject_alt_name, NULL, NULL);
if (san_names) {
int san_names_nb = sk_GENERAL_NAME_num(san_names);
for (int i = 0; i < san_names_nb; i++) {
const GENERAL_NAME *current_name = sk_GENERAL_NAME_value(san_names, i);
char *name = (char *)ASN1_STRING_data(current_name->d.dNSName);
if (name) continue;
}
sk_GENERAL_NAME_pop_free(san_names, GENERAL_NAME_free);
}
done:
if (cert) X509_free(cert);
return ret;
}
KS_DECLARE(ks_ssize_t) kws_read_frame(kws_t *kws, kws_opcode_t *oc, uint8_t **data)
{
@@ -1182,3 +1247,17 @@ KS_DECLARE(ks_status_t) kws_get_buffer(kws_t *kws, char **bufP, ks_size_t *bufle
return KS_STATUS_SUCCESS;
}
KS_DECLARE(ks_size_t) kws_sans_count(kws_t *kws)
{
ks_assert(kws);
return kws->sans_count;
}
KS_DECLARE(const char *) kws_sans_get(kws_t *kws, ks_size_t index)
{
ks_assert(kws);
if (index >= kws->sans_count) return NULL;
return kws->sans[index];
}