ustream-openssl: clear error stack before SSL_read/SSL_write

[project/ustream-ssl.git] / ustream-openssl.c

diff --git a/ustream-openssl.c b/ustream-openssl.c
index 3810d6acbb5498c65be563ae31f7cfc444767136..fa99e67b7fca9194afb9ceb1b96f07710f4de4f5 100644 (file)
--- a/ustream-openssl.c
+++ b/ustream-openssl.c
@@ -18,18 +18,20 @@
 
 #include <string.h>
 #include <ctype.h>
-#include <openssl/x509v3.h>
 #include "ustream-ssl.h"
 #include "ustream-internal.h"
-
+#include <openssl/x509v3.h>
 
 /* Ciphersuite preference:
- * - key exchange: prefer ECDHE, then DHE(client only), then RSA
- * - prefer AEAD ciphers:
+ * - for server, no weak ciphers are used if you use an ECDSA key.
+ * - forward-secret (pfs), authenticated (AEAD) ciphers are at the top:
  *     chacha20-poly1305, the fastest in software, 256-bits
  *     aes128-gcm, 128-bits
  *     aes256-gcm, 256-bits
- * - CBC ciphers
+ * - key exchange: prefer ECDHE, then DHE (client only)
+ * - forward-secret ECDSA CBC ciphers (client-only)
+ * - forward-secret RSA CBC ciphers
+ * - non-pfs ciphers
  *     aes128, aes256, 3DES(client only)
  */
 
@@ -38,32 +40,38 @@
                                "TLS13-CHACHA20-POLY1305-SHA256:"       \
                                "TLS13-AES128-GCM-SHA256:"              \
                                "TLS13-AES256-GCM-SHA384:"              \
-                               ecdhe_ciphers
+                               ecdhe_aead_ciphers
 #else
 # define tls13_ciphersuites    "TLS_CHACHA20_POLY1305_SHA256:"         \
                                "TLS_AES_128_GCM_SHA256:"               \
                                "TLS_AES_256_GCM_SHA384"
 
 # define top_ciphers                                                   \
-                               ecdhe_ciphers
+                               ecdhe_aead_ciphers
 #endif
 
-#define ecdhe_ciphers                                                  \
+#define ecdhe_aead_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"
+                               "ECDHE-RSA-AES256-GCM-SHA384"
 
-#define dhe_ciphers                                                    \
+#define dhe_aead_ciphers                                               \
                                "DHE-RSA-CHACHA20-POLY1305:"            \
                                "DHE-RSA-AES128-GCM-SHA256:"            \
-                               "DHE-RSA-AES256-GCM-SHA384:"            \
+                               "DHE-RSA-AES256-GCM-SHA384"
+
+#define ecdhe_ecdsa_cbc_ciphers                                                \
+                               "ECDHE-ECDSA-AES128-SHA:"               \
+                               "ECDHE-ECDSA-AES256-SHA"
+
+#define ecdhe_rsa_cbc_ciphers                                          \
+                               "ECDHE-RSA-AES128-SHA:"                 \
+                               "ECDHE-RSA-AES256-SHA"
+
+#define dhe_cbc_ciphers                                                        \
                                "DHE-RSA-AES128-SHA:"                   \
                                "DHE-RSA-AES256-SHA:"                   \
                                "DHE-DES-CBC3-SHA"
@@ -76,11 +84,15 @@
 
 #define server_cipher_list                                             \
                                top_ciphers ":"                         \
+                               ecdhe_rsa_cbc_ciphers ":"               \
                                non_pfs_aes
 
 #define client_cipher_list                                             \
                                top_ciphers ":"                         \
-                               dhe_ciphers ":"                         \
+                               dhe_aead_ciphers ":"                    \
+                               ecdhe_ecdsa_cbc_ciphers ":"             \
+                               ecdhe_rsa_cbc_ciphers ":"               \
+                               dhe_cbc_ciphers ":"                     \
                                non_pfs_aes ":"                         \
                                "DES-CBC3-SHA"
 
@@ -98,8 +110,12 @@ __ustream_ssl_context_new(bool server)
                SSL_library_init();
                _init = true;
        }
-# define TLS_server_method SSLv23_server_method
-# define TLS_client_method SSLv23_client_method
+# ifndef TLS_server_method
+#  define TLS_server_method SSLv23_server_method
+# endif
+# ifndef TLS_client_method
+#  define TLS_client_method SSLv23_client_method
+# endif
 #endif
 
        if (server) {
@@ -191,7 +207,7 @@ static void ustream_ssl_error(struct ustream_ssl *us, int ret)
        uloop_timeout_set(&us->error_timer, 0);
 }
 
-#ifndef CYASSL_OPENSSL_H_
+#ifndef NO_X509_CHECK_HOST
 
 static bool ustream_ssl_verify_cn(struct ustream_ssl *us, X509 *cert)
 {
@@ -200,10 +216,15 @@ static bool ustream_ssl_verify_cn(struct ustream_ssl *us, X509 *cert)
        if (!us->peer_cn)
                return false;
 
+# ifndef WOLFSSL_OPENSSL_H_
        ret = X509_check_host(cert, us->peer_cn, 0, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS, NULL);
+# else
+       ret = wolfSSL_X509_check_host(cert, us->peer_cn, 0, 0, NULL);
+# endif
        return ret == 1;
 }
 
+#endif
 
 static void ustream_ssl_verify_cert(struct ustream_ssl *us)
 {
@@ -223,26 +244,27 @@ static void ustream_ssl_verify_cert(struct ustream_ssl *us)
                return;
 
        us->valid_cert = true;
+#ifndef NO_X509_CHECK_HOST
        us->valid_cn = ustream_ssl_verify_cn(us, cert);
+#endif
        X509_free(cert);
 }
 
-#endif
 
 __hidden enum ssl_conn_status __ustream_ssl_connect(struct ustream_ssl *us)
 {
        void *ssl = us->ssl;
        int r;
 
+       ERR_clear_error();
+
        if (us->server)
                r = SSL_accept(ssl);
        else
                r = SSL_connect(ssl);
 
        if (r == 1) {
-#ifndef CYASSL_OPENSSL_H_
                ustream_ssl_verify_cert(us);
-#endif
                return U_SSL_OK;
        }
 
@@ -257,7 +279,11 @@ __hidden enum ssl_conn_status __ustream_ssl_connect(struct ustream_ssl *us)
 __hidden int __ustream_ssl_write(struct ustream_ssl *us, const char *buf, int len)
 {
        void *ssl = us->ssl;
-       int ret = SSL_write(ssl, buf, len);
+       int ret;
+
+       ERR_clear_error();
+
+       ret = SSL_write(ssl, buf, len);
 
        if (ret < 0) {
                int err = SSL_get_error(ssl, ret);
@@ -273,7 +299,11 @@ __hidden int __ustream_ssl_write(struct ustream_ssl *us, const char *buf, int le
 
 __hidden int __ustream_ssl_read(struct ustream_ssl *us, char *buf, int len)
 {
-       int ret = SSL_read(us->ssl, buf, len);
+       int ret;
+
+       ERR_clear_error();
+
+       ret = SSL_read(us->ssl, buf, len);
 
        if (ret < 0) {
                ret = SSL_get_error(us->ssl, ret);