~yerinalexey/hare-openssl

cb3de867516fe41d27cbe921593fc4a669ef456c — Alexey Yerin 1 year, 3 months ago 11cf19a
Fix compilation with latest harec and stdlib
4 files changed, 7 insertions(+), 7 deletions(-)

M openssl/bio.ha
M openssl/bio_stream.ha
M openssl/ssl.ha
M openssl/ssl_ctx.ha
M openssl/bio.ha => openssl/bio.ha +2 -2
@@ 58,6 58,6 @@ export fn bio_get_ssl(bio: *BIO) *SSL = {

@symbol("BIO_free_all") fn c_BIO_free_all(bio: *BIO) void;
@symbol("BIO_write") fn c_BIO_write(bio: *BIO, data: *const void, dlen: int) int;
@symbol("BIO_read") fn c_BIO_read(bio: *BIO, data: *void, dlen: int) int;
@symbol("BIO_read") fn c_BIO_read(bio: *BIO, data: *opaque, dlen: int) int;
@symbol("BIO_ctrl") fn c_BIO_ctrl(bio: *BIO, cmd: int, larg: i64,
	parg: nullable *void) i64;
	parg: nullable *opaque) i64;

M openssl/bio_stream.ha => openssl/bio_stream.ha +2 -2
@@ 19,9 19,9 @@ let biostream_vtable: io::vtable = io::vtable {
	...
};

fn wrap_ioerr(err: error) errors::opaque = {
fn wrap_ioerr(err: error) errors::opaque_ = {
	static assert(size(error) <= size(errors::opaque_data));
	let wrapped = errors::opaque { strerror = &opaque_strerror, ... };
	let wrapped = errors::opaque_ { strerror = &opaque_strerror, ... };
	*(&wrapped.data: *error) = err;
	return wrapped;
};

M openssl/ssl.ha => openssl/ssl.ha +1 -1
@@ 1,7 1,7 @@
use io;

// An SSL connection (opaque).
export type SSL = void;
export type SSL = opaque;

// Retrieves an [[io::file]] that backs the connection. Void is returned if the
// connection was not yet initialized using [[bio_do_handshake]] or similar.

M openssl/ssl_ctx.ha => openssl/ssl_ctx.ha +2 -2
@@ 1,10 1,10 @@
use types::c;

// An SSL context (opaque).
export type SSL_CTX = void;
export type SSL_CTX = opaque;

// An SSL method (opaque).
export type SSL_METHOD = void;
export type SSL_METHOD = opaque;

// Initializes an SSL context with the given method.
export fn ctx_new(meth: *const SSL_METHOD) (*SSL_CTX | error) = {