ustream-openssl: clear error stack before SSL_read/SSL_write

[oweals/openwrt-ustream-ssl.git] / ustream-ssl.h

diff --git a/ustream-ssl.h b/ustream-ssl.h
index aa1ced5943b3228cfc1494918a7901f62d81a87f..db89297604a9c7da5581e81ca945b5eccbaf1441 100644 (file)
--- a/ustream-ssl.h
+++ b/ustream-ssl.h
@@ -28,22 +28,36 @@ struct ustream_ssl {
 
        void (*notify_connected)(struct ustream_ssl *us);
        void (*notify_error)(struct ustream_ssl *us, int error, const char *str);
+       void (*notify_verify_error)(struct ustream_ssl *us, int error, const char *str);
 
-       void *ctx;
+       struct ustream_ssl_ctx *ctx;
        void *ssl;
 
+       char *peer_cn;
+       const char *server_name;
+
        int error;
        bool connected;
        bool server;
+
+       bool valid_cert;
+       bool valid_cn;
 };
 
+struct ustream_ssl_ctx;
+
 struct ustream_ssl_ops {
-       void *(*context_new)(bool server);
-       int (*context_set_crt_file)(void *ctx, const char *file);
-       int (*context_set_key_file)(void *ctx, const char *file);
-       void (*context_free)(void *ctx);
 
-       int (*init)(struct ustream_ssl *us, struct ustream *conn, void *ctx, bool server);
+       struct ustream_ssl_ctx *(*context_new)(bool server);
+       int (*context_set_crt_file)(struct ustream_ssl_ctx *ctx, const char *file);
+       int (*context_set_key_file)(struct ustream_ssl_ctx *ctx, const char *file);
+       int (*context_add_ca_crt_file)(struct ustream_ssl_ctx *ctx, const char *file);
+       void (*context_free)(struct ustream_ssl_ctx *ctx);
+
+       int (*init)(struct ustream_ssl *us, struct ustream *conn, struct ustream_ssl_ctx *ctx, bool server);
+       int (*set_peer_cn)(struct ustream_ssl *conn, const char *name);
+
+       int (*context_set_ciphers)(struct ustream_ssl_ctx *ctx, const char *ciphers);
 };
 
 extern const struct ustream_ssl_ops ustream_ssl_ops;
@@ -51,7 +65,10 @@ extern const struct ustream_ssl_ops ustream_ssl_ops;
 #define ustream_ssl_context_new                        ustream_ssl_ops.context_new
 #define ustream_ssl_context_set_crt_file       ustream_ssl_ops.context_set_crt_file
 #define ustream_ssl_context_set_key_file       ustream_ssl_ops.context_set_key_file
+#define ustream_ssl_context_add_ca_crt_file    ustream_ssl_ops.context_add_ca_crt_file
+#define ustream_ssl_context_set_ciphers                ustream_ssl_ops.context_set_ciphers
 #define ustream_ssl_context_free               ustream_ssl_ops.context_free
 #define ustream_ssl_init                       ustream_ssl_ops.init
+#define ustream_ssl_set_peer_cn                        ustream_ssl_ops.set_peer_cn
 
 #endif