mirror of
https://github.com/brunoos/luasec.git
synced 2024-12-27 12:58:21 +01:00
Allow passing luaossl objects to meth_create()
This commit is contained in:
parent
5299803bef
commit
e90a264c93
45
src/ssl.c
45
src/ssl.c
@ -34,6 +34,7 @@
|
||||
|
||||
#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER<0x10100000L
|
||||
#define SSL_is_server(s) (s->server)
|
||||
#define SSL_up_ref(ssl) CRYPTO_add(&(ssl)->references, 1, CRYPTO_LOCK_SSL)
|
||||
#define X509_up_ref(c) CRYPTO_add(&c->references, 1, CRYPTO_LOCK_X509)
|
||||
#endif
|
||||
|
||||
@ -236,26 +237,39 @@ static int ssl_recv(void *ctx, char *data, size_t count, size_t *got,
|
||||
return IO_UNKNOWN;
|
||||
}
|
||||
|
||||
static SSL_CTX* luaossl_testcontext(lua_State *L, int arg) {
|
||||
SSL_CTX **ctx = luaL_testudata(L, arg, "SSL_CTX*");
|
||||
if (ctx)
|
||||
return *ctx;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static SSL* luaossl_testssl(lua_State *L, int arg) {
|
||||
SSL **ssl = luaL_testudata(L, arg, "SSL*");
|
||||
if (ssl)
|
||||
return *ssl;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new TLS/SSL object and mark it as new.
|
||||
*/
|
||||
static int meth_create(lua_State *L)
|
||||
{
|
||||
p_ssl ssl;
|
||||
int mode = lsec_getmode(L, 1);
|
||||
SSL_CTX *ctx = lsec_checkcontext(L, 1);
|
||||
int mode;
|
||||
SSL_CTX *ctx;
|
||||
|
||||
lua_settop(L, 1);
|
||||
ssl = (p_ssl)lua_newuserdata(L, sizeof(t_ssl));
|
||||
|
||||
if ((ctx = lsec_testcontext(L, 1))) {
|
||||
mode = lsec_getmode(L, 1);
|
||||
if (mode == LSEC_MODE_INVALID) {
|
||||
lua_pushnil(L);
|
||||
lua_pushstring(L, "invalid mode");
|
||||
return 2;
|
||||
}
|
||||
ssl = (p_ssl)lua_newuserdata(L, sizeof(t_ssl));
|
||||
if (!ssl) {
|
||||
lua_pushnil(L);
|
||||
lua_pushstring(L, "error creating SSL object");
|
||||
return 2;
|
||||
}
|
||||
ssl->ssl = SSL_new(ctx);
|
||||
if (!ssl->ssl) {
|
||||
lua_pushnil(L);
|
||||
@ -263,6 +277,21 @@ static int meth_create(lua_State *L)
|
||||
ERR_reason_error_string(ERR_get_error()));
|
||||
return 2;
|
||||
}
|
||||
} else if ((ctx = luaossl_testcontext(L, 1))) {
|
||||
ssl->ssl = SSL_new(ctx);
|
||||
if (!ssl->ssl) {
|
||||
lua_pushnil(L);
|
||||
lua_pushfstring(L, "error creating SSL object (%s)",
|
||||
ERR_reason_error_string(ERR_get_error()));
|
||||
return 2;
|
||||
}
|
||||
mode = SSL_is_server(ssl->ssl) ? LSEC_MODE_SERVER : LSEC_MODE_CLIENT;
|
||||
} else if ((ssl->ssl = luaossl_testssl(L, 1))) {
|
||||
SSL_up_ref(ssl->ssl);
|
||||
mode = SSL_is_server(ssl->ssl) ? LSEC_MODE_SERVER : LSEC_MODE_CLIENT;
|
||||
} else {
|
||||
return luaL_argerror(L, 1, "expected SSL_CTX* or SSL*");
|
||||
}
|
||||
ssl->state = LSEC_STATE_NEW;
|
||||
SSL_set_fd(ssl->ssl, (int)SOCKET_INVALID);
|
||||
SSL_set_mode(ssl->ssl, SSL_MODE_ENABLE_PARTIAL_WRITE |
|
||||
|
Loading…
Reference in New Issue
Block a user