* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include <string.h>
+#include <ctype.h>
+#include <openssl/x509v3.h>
#include "ustream-ssl.h"
#include "ustream-internal.h"
+
+/* Ciphersuite preference:
+ * - key exchange: prefer ECDHE, then DHE(client only), then RSA
+ * - prefer AEAD ciphers:
+ * chacha20-poly1305, the fastest in software, 256-bits
+ * aes128-gcm, 128-bits
+ * aes256-gcm, 256-bits
+ * - CBC ciphers
+ * aes128, aes256, 3DES(client only)
+ */
+
+#define ecdhe_ciphers \
+ "ECDHE-ECDSA-CHACHA20-POLY1305:" \
+ "ECDHE-ECDSA-AES128-GCM-SHA256:" \
+ "ECDHE-ECDSA-AES256-GCM-SHA384:" \
+ "ECDHE-ECDSA-AES128-SHA:" \
+ "ECDHE-ECDSA-AES256-SHA:" \
+ "ECDHE-RSA-CHACHA20-POLY1305:" \
+ "ECDHE-RSA-AES128-GCM-SHA256:" \
+ "ECDHE-RSA-AES256-GCM-SHA384:" \
+ "ECDHE-RSA-AES128-SHA:" \
+ "ECDHE-RSA-AES256-SHA"
+
+#define dhe_ciphers \
+ "DHE-RSA-CHACHA20-POLY1305:" \
+ "DHE-RSA-AES128-GCM-SHA256:" \
+ "DHE-RSA-AES256-GCM-SHA384:" \
+ "DHE-RSA-AES128-SHA:" \
+ "DHE-RSA-AES256-SHA:" \
+ "DHE-DES-CBC3-SHA"
+
+#define non_pfs_aes \
+ "AES128-GCM-SHA256:" \
+ "AES256-GCM-SHA384:" \
+ "AES128-SHA:" \
+ "AES256-SHA"
+
+#define server_cipher_list \
+ ecdhe_ciphers ":" \
+ non_pfs_aes
+
+#define client_cipher_list \
+ ecdhe_ciphers ":" \
+ dhe_ciphers ":" \
+ non_pfs_aes ":" \
+ "DES-CBC3-SHA"
+
__hidden struct ustream_ssl_ctx *
__ustream_ssl_context_new(bool server)
{
- static bool _init = false;
const void *m;
SSL_CTX *c;
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ static bool _init = false;
+
if (!_init) {
SSL_load_error_strings();
SSL_library_init();
_init = true;
}
-
-#ifdef CYASSL_OPENSSL_H_
- if (server)
- m = SSLv23_server_method();
- else
- m = SSLv23_client_method();
-#else
- if (server)
- m = TLSv1_server_method();
- else
- m = TLSv1_client_method();
+# define TLS_server_method TLSv1_2_server_method
+# define TLS_client_method SSLv23_client_method
#endif
+ if (server) {
+ m = TLS_server_method();
+ } else
+ m = TLS_client_method();
+
c = SSL_CTX_new((void *) m);
if (!c)
return NULL;
- if (server)
- SSL_CTX_set_verify(c, SSL_VERIFY_NONE, NULL);
+ SSL_CTX_set_verify(c, SSL_VERIFY_NONE, NULL);
+ SSL_CTX_set_options(c, SSL_OP_NO_COMPRESSION | SSL_OP_SINGLE_ECDH_USE |
+ SSL_OP_CIPHER_SERVER_PREFERENCE);
+#if defined(SSL_CTX_set_ecdh_auto) && OPENSSL_VERSION_NUMBER < 0x10100000L
+ SSL_CTX_set_ecdh_auto(c, 1);
+#endif
+ if (server) {
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ SSL_CTX_set_min_proto_version(c, TLS1_2_VERSION);
+#endif
+ SSL_CTX_set_cipher_list(c, server_cipher_list);
+ } else {
+ SSL_CTX_set_cipher_list(c, client_cipher_list);
+ }
+ SSL_CTX_set_quiet_shutdown(c, 1);
return (void *) c;
}
+__hidden int __ustream_ssl_add_ca_crt_file(struct ustream_ssl_ctx *ctx, const char *file)
+{
+ int ret;
+
+ ret = SSL_CTX_load_verify_locations((void *) ctx, file, NULL);
+ if (ret < 1)
+ return -1;
+
+ return 0;
+}
+
__hidden int __ustream_ssl_set_crt_file(struct ustream_ssl_ctx *ctx, const char *file)
{
int ret;
- ret = SSL_CTX_use_certificate_file((void *) ctx, file, SSL_FILETYPE_PEM);
+ ret = SSL_CTX_use_certificate_chain_file((void *) ctx, file);
if (ret < 1)
ret = SSL_CTX_use_certificate_file((void *) ctx, file, SSL_FILETYPE_ASN1);
SSL_CTX_free((void *) ctx);
}
+void __ustream_ssl_session_free(void *ssl)
+{
+ SSL_shutdown(ssl);
+ SSL_free(ssl);
+}
+
static void ustream_ssl_error(struct ustream_ssl *us, int ret)
{
us->error = ret;
uloop_timeout_set(&us->error_timer, 0);
}
+#ifndef CYASSL_OPENSSL_H_
+
+static bool ustream_ssl_verify_cn(struct ustream_ssl *us, X509 *cert)
+{
+ int ret;
+
+ if (!us->peer_cn)
+ return false;
+
+ ret = X509_check_host(cert, us->peer_cn, 0, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS, NULL);
+ return ret == 1;
+}
+
+
+static void ustream_ssl_verify_cert(struct ustream_ssl *us)
+{
+ void *ssl = us->ssl;
+ X509 *cert;
+ int res;
+
+ res = SSL_get_verify_result(ssl);
+ if (res != X509_V_OK) {
+ if (us->notify_verify_error)
+ us->notify_verify_error(us, res, X509_verify_cert_error_string(res));
+ return;
+ }
+
+ cert = SSL_get_peer_certificate(ssl);
+ if (!cert)
+ return;
+
+ us->valid_cert = true;
+ us->valid_cn = ustream_ssl_verify_cn(us, cert);
+ X509_free(cert);
+}
+
+#endif
+
__hidden enum ssl_conn_status __ustream_ssl_connect(struct ustream_ssl *us)
{
void *ssl = us->ssl;
else
r = SSL_connect(ssl);
- if (r == 1)
+ if (r == 1) {
+#ifndef CYASSL_OPENSSL_H_
+ ustream_ssl_verify_cert(us);
+#endif
return U_SSL_OK;
+ }
r = SSL_get_error(ssl, r);
if (r == SSL_ERROR_WANT_READ || r == SSL_ERROR_WANT_WRITE)